]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.0.5-201506082251.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-3.1-4.0.5-201506082251.patch
CommitLineData
eeed91c5
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index 9de9813..1462492 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -3,9 +3,11 @@
6 *.bc
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -15,6 +17,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -51,14 +54,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38-.*
39+.[^g]*
40+.gen*
41 .*.d
42 .mm
43 53c700_d.h
44@@ -72,9 +78,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48+PERF*
49 SCCS
50 System.map*
51 TAGS
52+TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56@@ -83,6 +91,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60+ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64@@ -95,32 +104,40 @@ bounds.h
65 bsetup
66 btfixupprep
67 build
68+builtin-policy.h
69 bvmlinux
70 bzImage*
71 capability_names.h
72 capflags.c
73 classlist.h*
74+clut_vga16.c
75+common-cmds.h
76 comp*.log
77 compile.h*
78 conf
79 config
80 config-*
81 config_data.h*
82+config.c
83 config.mak
84 config.mak.autogen
85+config.tmp
86 conmakehash
87 consolemap_deftbl.c*
88 cpustr.h
89 crc32table.h*
90 cscope.*
91 defkeymap.c
92+devicetable-offsets.h
93 devlist.h*
94 dnotify_test
95 docproc
96 dslm
97+dtc-lexer.lex.c
98 elf2ecoff
99 elfconfig.h*
100 evergreen_reg_safe.h
101+exception_policy.conf
102 fixdep
103 flask.h
104 fore200e_mkfirm
105@@ -128,12 +145,15 @@ fore200e_pca_fw.c*
106 gconf
107 gconf.glade.h
108 gen-devlist
109+gen-kdb_cmds.c
110 gen_crc32table
111 gen_init_cpio
112 generated
113 genheaders
114 genksyms
115 *_gray256.c
116+hash
117+hid-example
118 hpet_example
119 hugepage-mmap
120 hugepage-shm
121@@ -148,14 +168,14 @@ int32.c
122 int4.c
123 int8.c
124 kallsyms
125-kconfig
126+kern_constants.h
127 keywords.c
128 ksym.c*
129 ksym.h*
130 kxgettext
131 lex.c
132 lex.*.c
133-linux
134+lib1funcs.S
135 logo_*.c
136 logo_*_clut224.c
137 logo_*_mono.c
138@@ -165,14 +185,15 @@ mach-types.h
139 machtypes.h
140 map
141 map_hugetlb
142-media
143 mconf
144+mdp
145 miboot*
146 mk_elfconfig
147 mkboot
148 mkbugboot
149 mkcpustr
150 mkdep
151+mkpiggy
152 mkprep
153 mkregtable
154 mktables
155@@ -188,6 +209,8 @@ oui.c*
156 page-types
157 parse.c
158 parse.h
159+parse-events*
160+pasyms.h
161 patches*
162 pca200e.bin
163 pca200e_ecd.bin2
164@@ -197,6 +220,7 @@ perf-archive
165 piggyback
166 piggy.gzip
167 piggy.S
168+pmu-*
169 pnmtologo
170 ppc_defs.h*
171 pss_boot.h
172@@ -206,7 +230,12 @@ r200_reg_safe.h
173 r300_reg_safe.h
174 r420_reg_safe.h
175 r600_reg_safe.h
176+randomize_layout_hash.h
177+randomize_layout_seed.h
178+realmode.lds
179+realmode.relocs
180 recordmcount
181+regdb.c
182 relocs
183 rlim_names.h
184 rn50_reg_safe.h
185@@ -216,8 +245,12 @@ series
186 setup
187 setup.bin
188 setup.elf
189+signing_key*
190+size_overflow_hash.h
191 sImage
192+slabinfo
193 sm_tbl*
194+sortextable
195 split-include
196 syscalltab.h
197 tables.c
198@@ -227,6 +260,7 @@ tftpboot.img
199 timeconst.h
200 times.h*
201 trix_boot.h
202+user_constants.h
203 utsrelease.h*
204 vdso-syms.lds
205 vdso.lds
206@@ -238,13 +272,17 @@ vdso32.lds
207 vdso32.so.dbg
208 vdso64.lds
209 vdso64.so.dbg
210+vdsox32.lds
211+vdsox32-syms.lds
212 version.h*
213 vmImage
214 vmlinux
215 vmlinux-*
216 vmlinux.aout
217 vmlinux.bin.all
218+vmlinux.bin.bz2
219 vmlinux.lds
220+vmlinux.relocs
221 vmlinuz
222 voffset.h
223 vsyscall.lds
224@@ -252,9 +290,12 @@ vsyscall_32.lds
225 wanxlfw.inc
226 uImage
227 unifdef
228+utsrelease.h
229 wakeup.bin
230 wakeup.elf
231 wakeup.lds
232+x509*
233 zImage*
234 zconf.hash.c
235+zconf.lex.c
236 zoffset.h
237diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
238index 74b6c6d..eac0e77 100644
239--- a/Documentation/kbuild/makefiles.txt
240+++ b/Documentation/kbuild/makefiles.txt
241@@ -23,10 +23,11 @@ This document describes the Linux kernel Makefiles.
242 === 4 Host Program support
243 --- 4.1 Simple Host Program
244 --- 4.2 Composite Host Programs
245- --- 4.3 Using C++ for host programs
246- --- 4.4 Controlling compiler options for host programs
247- --- 4.5 When host programs are actually built
248- --- 4.6 Using hostprogs-$(CONFIG_FOO)
249+ --- 4.3 Defining shared libraries
250+ --- 4.4 Using C++ for host programs
251+ --- 4.5 Controlling compiler options for host programs
252+ --- 4.6 When host programs are actually built
253+ --- 4.7 Using hostprogs-$(CONFIG_FOO)
254
255 === 5 Kbuild clean infrastructure
256
257@@ -643,7 +644,29 @@ Both possibilities are described in the following.
258 Finally, the two .o files are linked to the executable, lxdialog.
259 Note: The syntax <executable>-y is not permitted for host-programs.
260
261---- 4.3 Using C++ for host programs
262+--- 4.3 Defining shared libraries
263+
264+ Objects with extension .so are considered shared libraries, and
265+ will be compiled as position independent objects.
266+ Kbuild provides support for shared libraries, but the usage
267+ shall be restricted.
268+ In the following example the libkconfig.so shared library is used
269+ to link the executable conf.
270+
271+ Example:
272+ #scripts/kconfig/Makefile
273+ hostprogs-y := conf
274+ conf-objs := conf.o libkconfig.so
275+ libkconfig-objs := expr.o type.o
276+
277+ Shared libraries always require a corresponding -objs line, and
278+ in the example above the shared library libkconfig is composed by
279+ the two objects expr.o and type.o.
280+ expr.o and type.o will be built as position independent code and
281+ linked as a shared library libkconfig.so. C++ is not supported for
282+ shared libraries.
283+
284+--- 4.4 Using C++ for host programs
285
286 kbuild offers support for host programs written in C++. This was
287 introduced solely to support kconfig, and is not recommended
288@@ -666,7 +689,7 @@ Both possibilities are described in the following.
289 qconf-cxxobjs := qconf.o
290 qconf-objs := check.o
291
292---- 4.4 Controlling compiler options for host programs
293+--- 4.5 Controlling compiler options for host programs
294
295 When compiling host programs, it is possible to set specific flags.
296 The programs will always be compiled utilising $(HOSTCC) passed
297@@ -694,7 +717,7 @@ Both possibilities are described in the following.
298 When linking qconf, it will be passed the extra option
299 "-L$(QTDIR)/lib".
300
301---- 4.5 When host programs are actually built
302+--- 4.6 When host programs are actually built
303
304 Kbuild will only build host-programs when they are referenced
305 as a prerequisite.
306@@ -725,7 +748,7 @@ Both possibilities are described in the following.
307 This will tell kbuild to build lxdialog even if not referenced in
308 any rule.
309
310---- 4.6 Using hostprogs-$(CONFIG_FOO)
311+--- 4.7 Using hostprogs-$(CONFIG_FOO)
312
313 A typical pattern in a Kbuild file looks like this:
314
315diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
316index 4d68ec8..9546b75 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1203,6 +1203,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
320 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
321 Default: 1024
322
323+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
324+ ignore grsecurity's /proc restrictions
325+
326+ grsec_sysfs_restrict= Format: 0 | 1
327+ Default: 1
328+ Disables GRKERNSEC_SYSFS_RESTRICT if enabled in config
329+
330 hashdist= [KNL,NUMA] Large hashes allocated during boot
331 are distributed across NUMA nodes. Defaults on
332 for 64-bit NUMA, off otherwise.
333@@ -2300,6 +2307,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
334 noexec=on: enable non-executable mappings (default)
335 noexec=off: disable non-executable mappings
336
337+ nopcid [X86-64]
338+ Disable PCID (Process-Context IDentifier) even if it
339+ is supported by the processor.
340+
341 nosmap [X86]
342 Disable SMAP (Supervisor Mode Access Prevention)
343 even if it is supported by processor.
344@@ -2601,6 +2612,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
345 the specified number of seconds. This is to be used if
346 your oopses keep scrolling off the screen.
347
348+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
349+ virtualization environments that don't cope well with the
350+ expand down segment used by UDEREF on X86-32 or the frequent
351+ page table updates on X86-64.
352+
353+ pax_sanitize_slab=
354+ Format: { 0 | 1 | off | fast | full }
355+ Options '0' and '1' are only provided for backward
356+ compatibility, 'off' or 'fast' should be used instead.
357+ 0|off : disable slab object sanitization
358+ 1|fast: enable slab object sanitization excluding
359+ whitelisted slabs (default)
360+ full : sanitize all slabs, even the whitelisted ones
361+
362+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
363+
364+ pax_extra_latent_entropy
365+ Enable a very simple form of latent entropy extraction
366+ from the first 4GB of memory as the bootmem allocator
367+ passes the memory pages to the buddy allocator.
368+
369+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
370+ when the processor supports PCID.
371+
372 pcbit= [HW,ISDN]
373
374 pcd. [PARIDE]
375diff --git a/Makefile b/Makefile
376index 1880cf7..a141b1e 100644
377--- a/Makefile
378+++ b/Makefile
379@@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
380 HOSTCC = gcc
381 HOSTCXX = g++
382 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
383-HOSTCXXFLAGS = -O2
384+HOSTCFLAGS = -W -Wno-unused-parameter -Wno-missing-field-initializers -fno-delete-null-pointer-checks
385+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
386+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
387
388 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
389 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
390@@ -446,8 +448,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
391 # Rules shared between *config targets and build targets
392
393 # Basic helpers built in scripts/
394-PHONY += scripts_basic
395-scripts_basic:
396+PHONY += scripts_basic gcc-plugins
397+scripts_basic: gcc-plugins
398 $(Q)$(MAKE) $(build)=scripts/basic
399 $(Q)rm -f .tmp_quiet_recordmcount
400
401@@ -622,6 +624,74 @@ endif
402 # Tell gcc to never replace conditional load with a non-conditional one
403 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
404
405+ifndef DISABLE_PAX_PLUGINS
406+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
407+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
408+else
409+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
410+endif
411+ifneq ($(PLUGINCC),)
412+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
413+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
414+endif
415+ifdef CONFIG_PAX_MEMORY_STACKLEAK
416+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
417+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
418+endif
419+ifdef CONFIG_KALLOCSTAT_PLUGIN
420+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
421+endif
422+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
423+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
424+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
425+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
426+endif
427+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
428+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
429+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
430+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
431+endif
432+endif
433+ifdef CONFIG_CHECKER_PLUGIN
434+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
435+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
436+endif
437+endif
438+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
439+ifdef CONFIG_PAX_SIZE_OVERFLOW
440+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
441+endif
442+ifdef CONFIG_PAX_LATENT_ENTROPY
443+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
444+endif
445+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
446+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
447+endif
448+INITIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/initify_plugin.so -DINITIFY_PLUGIN
449+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
450+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
451+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
452+GCC_PLUGINS_CFLAGS += $(INITIFY_PLUGIN_CFLAGS)
453+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
454+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
455+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
456+ifeq ($(KBUILD_EXTMOD),)
457+gcc-plugins:
458+ $(Q)$(MAKE) $(build)=tools/gcc
459+else
460+gcc-plugins: ;
461+endif
462+else
463+gcc-plugins:
464+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
465+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
466+else
467+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
468+endif
469+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
470+endif
471+endif
472+
473 ifdef CONFIG_READABLE_ASM
474 # Disable optimizations that make assembler listings hard to read.
475 # reorder blocks reorders the control in the function
476@@ -714,7 +784,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
477 else
478 KBUILD_CFLAGS += -g
479 endif
480-KBUILD_AFLAGS += -Wa,-gdwarf-2
481+KBUILD_AFLAGS += -Wa,--gdwarf-2
482 endif
483 ifdef CONFIG_DEBUG_INFO_DWARF4
484 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
485@@ -884,7 +954,7 @@ export mod_sign_cmd
486
487
488 ifeq ($(KBUILD_EXTMOD),)
489-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
490+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
491
492 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
493 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
494@@ -934,6 +1004,8 @@ endif
495
496 # The actual objects are generated when descending,
497 # make sure no implicit rule kicks in
498+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
499+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
500 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
501
502 # Handle descending into subdirectories listed in $(vmlinux-dirs)
503@@ -943,7 +1015,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
504 # Error messages still appears in the original language
505
506 PHONY += $(vmlinux-dirs)
507-$(vmlinux-dirs): prepare scripts
508+$(vmlinux-dirs): gcc-plugins prepare scripts
509 $(Q)$(MAKE) $(build)=$@
510
511 define filechk_kernel.release
512@@ -986,10 +1058,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
513
514 archprepare: archheaders archscripts prepare1 scripts_basic
515
516+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
517+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
518 prepare0: archprepare FORCE
519 $(Q)$(MAKE) $(build)=.
520
521 # All the preparing..
522+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
523 prepare: prepare0
524
525 # Generate some files
526@@ -1103,6 +1178,8 @@ all: modules
527 # using awk while concatenating to the final file.
528
529 PHONY += modules
530+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
531+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
532 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
533 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
534 @$(kecho) ' Building modules, stage 2.';
535@@ -1118,7 +1195,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
536
537 # Target to prepare building external modules
538 PHONY += modules_prepare
539-modules_prepare: prepare scripts
540+modules_prepare: gcc-plugins prepare scripts
541
542 # Target to install modules
543 PHONY += modules_install
544@@ -1184,7 +1261,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
545 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
546 signing_key.priv signing_key.x509 x509.genkey \
547 extra_certificates signing_key.x509.keyid \
548- signing_key.x509.signer vmlinux-gdb.py
549+ signing_key.x509.signer vmlinux-gdb.py \
550+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
551+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
552+ tools/gcc/randomize_layout_seed.h
553
554 # clean - Delete most, but leave enough to build external modules
555 #
556@@ -1223,7 +1303,7 @@ distclean: mrproper
557 @find $(srctree) $(RCS_FIND_IGNORE) \
558 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
559 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
560- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
561+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
562 -type f -print | xargs rm -f
563
564
565@@ -1389,6 +1469,8 @@ PHONY += $(module-dirs) modules
566 $(module-dirs): crmodverdir $(objtree)/Module.symvers
567 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
568
569+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
570+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
571 modules: $(module-dirs)
572 @$(kecho) ' Building modules, stage 2.';
573 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
574@@ -1529,17 +1611,21 @@ else
575 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
576 endif
577
578-%.s: %.c prepare scripts FORCE
579+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
580+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
581+%.s: %.c gcc-plugins prepare scripts FORCE
582 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
583 %.i: %.c prepare scripts FORCE
584 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
585-%.o: %.c prepare scripts FORCE
586+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
587+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
588+%.o: %.c gcc-plugins prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590 %.lst: %.c prepare scripts FORCE
591 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
592-%.s: %.S prepare scripts FORCE
593+%.s: %.S gcc-plugins prepare scripts FORCE
594 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
595-%.o: %.S prepare scripts FORCE
596+%.o: %.S gcc-plugins prepare scripts FORCE
597 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
598 %.symtypes: %.c prepare scripts FORCE
599 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
600@@ -1551,11 +1637,15 @@ endif
601 $(build)=$(build-dir)
602 # Make sure the latest headers are built for Documentation
603 Documentation/: headers_install
604-%/: prepare scripts FORCE
605+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
606+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
607+%/: gcc-plugins prepare scripts FORCE
608 $(cmd_crmodverdir)
609 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
610 $(build)=$(build-dir)
611-%.ko: prepare scripts FORCE
612+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
613+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
614+%.ko: gcc-plugins prepare scripts FORCE
615 $(cmd_crmodverdir)
616 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
617 $(build)=$(build-dir) $(@:.ko=.o)
618diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
619index 8f8eafb..3405f46 100644
620--- a/arch/alpha/include/asm/atomic.h
621+++ b/arch/alpha/include/asm/atomic.h
622@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
623 #define atomic_dec(v) atomic_sub(1,(v))
624 #define atomic64_dec(v) atomic64_sub(1,(v))
625
626+#define atomic64_read_unchecked(v) atomic64_read(v)
627+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
628+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
629+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
630+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
631+#define atomic64_inc_unchecked(v) atomic64_inc(v)
632+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
633+#define atomic64_dec_unchecked(v) atomic64_dec(v)
634+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
635+
636 #endif /* _ALPHA_ATOMIC_H */
637diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
638index ad368a9..fbe0f25 100644
639--- a/arch/alpha/include/asm/cache.h
640+++ b/arch/alpha/include/asm/cache.h
641@@ -4,19 +4,19 @@
642 #ifndef __ARCH_ALPHA_CACHE_H
643 #define __ARCH_ALPHA_CACHE_H
644
645+#include <linux/const.h>
646
647 /* Bytes per L1 (data) cache line. */
648 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
649-# define L1_CACHE_BYTES 64
650 # define L1_CACHE_SHIFT 6
651 #else
652 /* Both EV4 and EV5 are write-through, read-allocate,
653 direct-mapped, physical.
654 */
655-# define L1_CACHE_BYTES 32
656 # define L1_CACHE_SHIFT 5
657 #endif
658
659+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
660 #define SMP_CACHE_BYTES L1_CACHE_BYTES
661
662 #endif
663diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
664index 968d999..d36b2df 100644
665--- a/arch/alpha/include/asm/elf.h
666+++ b/arch/alpha/include/asm/elf.h
667@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
668
669 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
670
671+#ifdef CONFIG_PAX_ASLR
672+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
673+
674+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
675+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
676+#endif
677+
678 /* $0 is set by ld.so to a pointer to a function which might be
679 registered using atexit. This provides a mean for the dynamic
680 linker to call DT_FINI functions for shared libraries that have
681diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
682index aab14a0..b4fa3e7 100644
683--- a/arch/alpha/include/asm/pgalloc.h
684+++ b/arch/alpha/include/asm/pgalloc.h
685@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
686 pgd_set(pgd, pmd);
687 }
688
689+static inline void
690+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
691+{
692+ pgd_populate(mm, pgd, pmd);
693+}
694+
695 extern pgd_t *pgd_alloc(struct mm_struct *mm);
696
697 static inline void
698diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
699index a9a1195..e9b8417 100644
700--- a/arch/alpha/include/asm/pgtable.h
701+++ b/arch/alpha/include/asm/pgtable.h
702@@ -101,6 +101,17 @@ struct vm_area_struct;
703 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
704 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
705 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
706+
707+#ifdef CONFIG_PAX_PAGEEXEC
708+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
709+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
710+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
711+#else
712+# define PAGE_SHARED_NOEXEC PAGE_SHARED
713+# define PAGE_COPY_NOEXEC PAGE_COPY
714+# define PAGE_READONLY_NOEXEC PAGE_READONLY
715+#endif
716+
717 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
718
719 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
720diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
721index 2fd00b7..cfd5069 100644
722--- a/arch/alpha/kernel/module.c
723+++ b/arch/alpha/kernel/module.c
724@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
725
726 /* The small sections were sorted to the end of the segment.
727 The following should definitely cover them. */
728- gp = (u64)me->module_core + me->core_size - 0x8000;
729+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
730 got = sechdrs[me->arch.gotsecindex].sh_addr;
731
732 for (i = 0; i < n; i++) {
733diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
734index e51f578..16c64a3 100644
735--- a/arch/alpha/kernel/osf_sys.c
736+++ b/arch/alpha/kernel/osf_sys.c
737@@ -1296,10 +1296,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
738 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
739
740 static unsigned long
741-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
742- unsigned long limit)
743+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
744+ unsigned long limit, unsigned long flags)
745 {
746 struct vm_unmapped_area_info info;
747+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
748
749 info.flags = 0;
750 info.length = len;
751@@ -1307,6 +1308,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
752 info.high_limit = limit;
753 info.align_mask = 0;
754 info.align_offset = 0;
755+ info.threadstack_offset = offset;
756 return vm_unmapped_area(&info);
757 }
758
759@@ -1339,20 +1341,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
760 merely specific addresses, but regions of memory -- perhaps
761 this feature should be incorporated into all ports? */
762
763+#ifdef CONFIG_PAX_RANDMMAP
764+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
765+#endif
766+
767 if (addr) {
768- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
769+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
770 if (addr != (unsigned long) -ENOMEM)
771 return addr;
772 }
773
774 /* Next, try allocating at TASK_UNMAPPED_BASE. */
775- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
776- len, limit);
777+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
778+
779 if (addr != (unsigned long) -ENOMEM)
780 return addr;
781
782 /* Finally, try allocating in low memory. */
783- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
784+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
785
786 return addr;
787 }
788diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
789index 9d0ac09..479a962 100644
790--- a/arch/alpha/mm/fault.c
791+++ b/arch/alpha/mm/fault.c
792@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
793 __reload_thread(pcb);
794 }
795
796+#ifdef CONFIG_PAX_PAGEEXEC
797+/*
798+ * PaX: decide what to do with offenders (regs->pc = fault address)
799+ *
800+ * returns 1 when task should be killed
801+ * 2 when patched PLT trampoline was detected
802+ * 3 when unpatched PLT trampoline was detected
803+ */
804+static int pax_handle_fetch_fault(struct pt_regs *regs)
805+{
806+
807+#ifdef CONFIG_PAX_EMUPLT
808+ int err;
809+
810+ do { /* PaX: patched PLT emulation #1 */
811+ unsigned int ldah, ldq, jmp;
812+
813+ err = get_user(ldah, (unsigned int *)regs->pc);
814+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
815+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
816+
817+ if (err)
818+ break;
819+
820+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
821+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
822+ jmp == 0x6BFB0000U)
823+ {
824+ unsigned long r27, addr;
825+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
826+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
827+
828+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
829+ err = get_user(r27, (unsigned long *)addr);
830+ if (err)
831+ break;
832+
833+ regs->r27 = r27;
834+ regs->pc = r27;
835+ return 2;
836+ }
837+ } while (0);
838+
839+ do { /* PaX: patched PLT emulation #2 */
840+ unsigned int ldah, lda, br;
841+
842+ err = get_user(ldah, (unsigned int *)regs->pc);
843+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
844+ err |= get_user(br, (unsigned int *)(regs->pc+8));
845+
846+ if (err)
847+ break;
848+
849+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
850+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
851+ (br & 0xFFE00000U) == 0xC3E00000U)
852+ {
853+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
854+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
855+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
856+
857+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
858+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
859+ return 2;
860+ }
861+ } while (0);
862+
863+ do { /* PaX: unpatched PLT emulation */
864+ unsigned int br;
865+
866+ err = get_user(br, (unsigned int *)regs->pc);
867+
868+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
869+ unsigned int br2, ldq, nop, jmp;
870+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
871+
872+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
873+ err = get_user(br2, (unsigned int *)addr);
874+ err |= get_user(ldq, (unsigned int *)(addr+4));
875+ err |= get_user(nop, (unsigned int *)(addr+8));
876+ err |= get_user(jmp, (unsigned int *)(addr+12));
877+ err |= get_user(resolver, (unsigned long *)(addr+16));
878+
879+ if (err)
880+ break;
881+
882+ if (br2 == 0xC3600000U &&
883+ ldq == 0xA77B000CU &&
884+ nop == 0x47FF041FU &&
885+ jmp == 0x6B7B0000U)
886+ {
887+ regs->r28 = regs->pc+4;
888+ regs->r27 = addr+16;
889+ regs->pc = resolver;
890+ return 3;
891+ }
892+ }
893+ } while (0);
894+#endif
895+
896+ return 1;
897+}
898+
899+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
900+{
901+ unsigned long i;
902+
903+ printk(KERN_ERR "PAX: bytes at PC: ");
904+ for (i = 0; i < 5; i++) {
905+ unsigned int c;
906+ if (get_user(c, (unsigned int *)pc+i))
907+ printk(KERN_CONT "???????? ");
908+ else
909+ printk(KERN_CONT "%08x ", c);
910+ }
911+ printk("\n");
912+}
913+#endif
914
915 /*
916 * This routine handles page faults. It determines the address,
917@@ -133,8 +251,29 @@ retry:
918 good_area:
919 si_code = SEGV_ACCERR;
920 if (cause < 0) {
921- if (!(vma->vm_flags & VM_EXEC))
922+ if (!(vma->vm_flags & VM_EXEC)) {
923+
924+#ifdef CONFIG_PAX_PAGEEXEC
925+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
926+ goto bad_area;
927+
928+ up_read(&mm->mmap_sem);
929+ switch (pax_handle_fetch_fault(regs)) {
930+
931+#ifdef CONFIG_PAX_EMUPLT
932+ case 2:
933+ case 3:
934+ return;
935+#endif
936+
937+ }
938+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
939+ do_group_exit(SIGKILL);
940+#else
941 goto bad_area;
942+#endif
943+
944+ }
945 } else if (!cause) {
946 /* Allow reads even for write-only mappings */
947 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
948diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
949index cf4c0c9..a87ecf5 100644
950--- a/arch/arm/Kconfig
951+++ b/arch/arm/Kconfig
952@@ -1735,7 +1735,7 @@ config ALIGNMENT_TRAP
953
954 config UACCESS_WITH_MEMCPY
955 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
956- depends on MMU
957+ depends on MMU && !PAX_MEMORY_UDEREF
958 default y if CPU_FEROCEON
959 help
960 Implement faster copy_to_user and clear_user methods for CPU
961@@ -1999,6 +1999,7 @@ config XIP_PHYS_ADDR
962 config KEXEC
963 bool "Kexec system call (EXPERIMENTAL)"
964 depends on (!SMP || PM_SLEEP_SMP)
965+ depends on !GRKERNSEC_KMEM
966 help
967 kexec is a system call that implements the ability to shutdown your
968 current kernel, and to start another kernel. It is like a reboot
969diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
970index e22c119..abe7041 100644
971--- a/arch/arm/include/asm/atomic.h
972+++ b/arch/arm/include/asm/atomic.h
973@@ -18,17 +18,41 @@
974 #include <asm/barrier.h>
975 #include <asm/cmpxchg.h>
976
977+#ifdef CONFIG_GENERIC_ATOMIC64
978+#include <asm-generic/atomic64.h>
979+#endif
980+
981 #define ATOMIC_INIT(i) { (i) }
982
983 #ifdef __KERNEL__
984
985+#ifdef CONFIG_THUMB2_KERNEL
986+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
987+#else
988+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
989+#endif
990+
991+#define _ASM_EXTABLE(from, to) \
992+" .pushsection __ex_table,\"a\"\n"\
993+" .align 3\n" \
994+" .long " #from ", " #to"\n" \
995+" .popsection"
996+
997 /*
998 * On ARM, ordinary assignment (str instruction) doesn't clear the local
999 * strex/ldrex monitor on some implementations. The reason we can use it for
1000 * atomic_set() is the clrex or dummy strex done on every exception return.
1001 */
1002 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1003+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1004+{
1005+ return ACCESS_ONCE(v->counter);
1006+}
1007 #define atomic_set(v,i) (((v)->counter) = (i))
1008+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1009+{
1010+ v->counter = i;
1011+}
1012
1013 #if __LINUX_ARM_ARCH__ >= 6
1014
1015@@ -38,26 +62,50 @@
1016 * to ensure that the update happens.
1017 */
1018
1019-#define ATOMIC_OP(op, c_op, asm_op) \
1020-static inline void atomic_##op(int i, atomic_t *v) \
1021+#ifdef CONFIG_PAX_REFCOUNT
1022+#define __OVERFLOW_POST \
1023+ " bvc 3f\n" \
1024+ "2: " REFCOUNT_TRAP_INSN "\n"\
1025+ "3:\n"
1026+#define __OVERFLOW_POST_RETURN \
1027+ " bvc 3f\n" \
1028+" mov %0, %1\n" \
1029+ "2: " REFCOUNT_TRAP_INSN "\n"\
1030+ "3:\n"
1031+#define __OVERFLOW_EXTABLE \
1032+ "4:\n" \
1033+ _ASM_EXTABLE(2b, 4b)
1034+#else
1035+#define __OVERFLOW_POST
1036+#define __OVERFLOW_POST_RETURN
1037+#define __OVERFLOW_EXTABLE
1038+#endif
1039+
1040+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1041+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1042 { \
1043 unsigned long tmp; \
1044 int result; \
1045 \
1046 prefetchw(&v->counter); \
1047- __asm__ __volatile__("@ atomic_" #op "\n" \
1048+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1049 "1: ldrex %0, [%3]\n" \
1050 " " #asm_op " %0, %0, %4\n" \
1051+ post_op \
1052 " strex %1, %0, [%3]\n" \
1053 " teq %1, #0\n" \
1054-" bne 1b" \
1055+" bne 1b\n" \
1056+ extable \
1057 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1058 : "r" (&v->counter), "Ir" (i) \
1059 : "cc"); \
1060 } \
1061
1062-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1063-static inline int atomic_##op##_return(int i, atomic_t *v) \
1064+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1065+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1066+
1067+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1068+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1069 { \
1070 unsigned long tmp; \
1071 int result; \
1072@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1073 smp_mb(); \
1074 prefetchw(&v->counter); \
1075 \
1076- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1077+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1078 "1: ldrex %0, [%3]\n" \
1079 " " #asm_op " %0, %0, %4\n" \
1080+ post_op \
1081 " strex %1, %0, [%3]\n" \
1082 " teq %1, #0\n" \
1083-" bne 1b" \
1084+" bne 1b\n" \
1085+ extable \
1086 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1087 : "r" (&v->counter), "Ir" (i) \
1088 : "cc"); \
1089@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1090 return result; \
1091 }
1092
1093+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1094+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1095+
1096 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1097 {
1098 int oldval;
1099@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1100 __asm__ __volatile__ ("@ atomic_add_unless\n"
1101 "1: ldrex %0, [%4]\n"
1102 " teq %0, %5\n"
1103-" beq 2f\n"
1104-" add %1, %0, %6\n"
1105+" beq 4f\n"
1106+" adds %1, %0, %6\n"
1107+
1108+#ifdef CONFIG_PAX_REFCOUNT
1109+" bvc 3f\n"
1110+"2: " REFCOUNT_TRAP_INSN "\n"
1111+"3:\n"
1112+#endif
1113+
1114 " strex %2, %1, [%4]\n"
1115 " teq %2, #0\n"
1116 " bne 1b\n"
1117-"2:"
1118+"4:"
1119+
1120+#ifdef CONFIG_PAX_REFCOUNT
1121+ _ASM_EXTABLE(2b, 4b)
1122+#endif
1123+
1124 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1125 : "r" (&v->counter), "r" (u), "r" (a)
1126 : "cc");
1127@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1128 return oldval;
1129 }
1130
1131+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1132+{
1133+ unsigned long oldval, res;
1134+
1135+ smp_mb();
1136+
1137+ do {
1138+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1139+ "ldrex %1, [%3]\n"
1140+ "mov %0, #0\n"
1141+ "teq %1, %4\n"
1142+ "strexeq %0, %5, [%3]\n"
1143+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1144+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1145+ : "cc");
1146+ } while (res);
1147+
1148+ smp_mb();
1149+
1150+ return oldval;
1151+}
1152+
1153 #else /* ARM_ARCH_6 */
1154
1155 #ifdef CONFIG_SMP
1156 #error SMP not supported on pre-ARMv6 CPUs
1157 #endif
1158
1159-#define ATOMIC_OP(op, c_op, asm_op) \
1160-static inline void atomic_##op(int i, atomic_t *v) \
1161+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1162+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1163 { \
1164 unsigned long flags; \
1165 \
1166@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1167 raw_local_irq_restore(flags); \
1168 } \
1169
1170-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1171-static inline int atomic_##op##_return(int i, atomic_t *v) \
1172+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1173+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1174+
1175+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1176+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1177 { \
1178 unsigned long flags; \
1179 int val; \
1180@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1181 return val; \
1182 }
1183
1184+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1185+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1186+
1187 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1188 {
1189 int ret;
1190@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1191 return ret;
1192 }
1193
1194+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1195+{
1196+ return atomic_cmpxchg((atomic_t *)v, old, new);
1197+}
1198+
1199 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1200 {
1201 int c, old;
1202@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1203
1204 #undef ATOMIC_OPS
1205 #undef ATOMIC_OP_RETURN
1206+#undef __ATOMIC_OP_RETURN
1207 #undef ATOMIC_OP
1208+#undef __ATOMIC_OP
1209
1210 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1211+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1212+{
1213+ return xchg(&v->counter, new);
1214+}
1215
1216 #define atomic_inc(v) atomic_add(1, v)
1217+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1218+{
1219+ atomic_add_unchecked(1, v);
1220+}
1221 #define atomic_dec(v) atomic_sub(1, v)
1222+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1223+{
1224+ atomic_sub_unchecked(1, v);
1225+}
1226
1227 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1228+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1229+{
1230+ return atomic_add_return_unchecked(1, v) == 0;
1231+}
1232 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1233 #define atomic_inc_return(v) (atomic_add_return(1, v))
1234+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1235+{
1236+ return atomic_add_return_unchecked(1, v);
1237+}
1238 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1239 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1240
1241@@ -216,6 +336,14 @@ typedef struct {
1242 long long counter;
1243 } atomic64_t;
1244
1245+#ifdef CONFIG_PAX_REFCOUNT
1246+typedef struct {
1247+ long long counter;
1248+} atomic64_unchecked_t;
1249+#else
1250+typedef atomic64_t atomic64_unchecked_t;
1251+#endif
1252+
1253 #define ATOMIC64_INIT(i) { (i) }
1254
1255 #ifdef CONFIG_ARM_LPAE
1256@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1257 return result;
1258 }
1259
1260+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1261+{
1262+ long long result;
1263+
1264+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1265+" ldrd %0, %H0, [%1]"
1266+ : "=&r" (result)
1267+ : "r" (&v->counter), "Qo" (v->counter)
1268+ );
1269+
1270+ return result;
1271+}
1272+
1273 static inline void atomic64_set(atomic64_t *v, long long i)
1274 {
1275 __asm__ __volatile__("@ atomic64_set\n"
1276@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1277 : "r" (&v->counter), "r" (i)
1278 );
1279 }
1280+
1281+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1282+{
1283+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1284+" strd %2, %H2, [%1]"
1285+ : "=Qo" (v->counter)
1286+ : "r" (&v->counter), "r" (i)
1287+ );
1288+}
1289 #else
1290 static inline long long atomic64_read(const atomic64_t *v)
1291 {
1292@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1293 return result;
1294 }
1295
1296+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1297+{
1298+ long long result;
1299+
1300+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1301+" ldrexd %0, %H0, [%1]"
1302+ : "=&r" (result)
1303+ : "r" (&v->counter), "Qo" (v->counter)
1304+ );
1305+
1306+ return result;
1307+}
1308+
1309 static inline void atomic64_set(atomic64_t *v, long long i)
1310 {
1311 long long tmp;
1312@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1313 : "r" (&v->counter), "r" (i)
1314 : "cc");
1315 }
1316+
1317+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1318+{
1319+ long long tmp;
1320+
1321+ prefetchw(&v->counter);
1322+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1323+"1: ldrexd %0, %H0, [%2]\n"
1324+" strexd %0, %3, %H3, [%2]\n"
1325+" teq %0, #0\n"
1326+" bne 1b"
1327+ : "=&r" (tmp), "=Qo" (v->counter)
1328+ : "r" (&v->counter), "r" (i)
1329+ : "cc");
1330+}
1331 #endif
1332
1333-#define ATOMIC64_OP(op, op1, op2) \
1334-static inline void atomic64_##op(long long i, atomic64_t *v) \
1335+#undef __OVERFLOW_POST_RETURN
1336+#define __OVERFLOW_POST_RETURN \
1337+ " bvc 3f\n" \
1338+" mov %0, %1\n" \
1339+" mov %H0, %H1\n" \
1340+ "2: " REFCOUNT_TRAP_INSN "\n"\
1341+ "3:\n"
1342+
1343+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1344+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1345 { \
1346 long long result; \
1347 unsigned long tmp; \
1348 \
1349 prefetchw(&v->counter); \
1350- __asm__ __volatile__("@ atomic64_" #op "\n" \
1351+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1352 "1: ldrexd %0, %H0, [%3]\n" \
1353 " " #op1 " %Q0, %Q0, %Q4\n" \
1354 " " #op2 " %R0, %R0, %R4\n" \
1355+ post_op \
1356 " strexd %1, %0, %H0, [%3]\n" \
1357 " teq %1, #0\n" \
1358-" bne 1b" \
1359+" bne 1b\n" \
1360+ extable \
1361 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1362 : "r" (&v->counter), "r" (i) \
1363 : "cc"); \
1364 } \
1365
1366-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1367-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1368+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1369+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1370+
1371+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1372+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1373 { \
1374 long long result; \
1375 unsigned long tmp; \
1376@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1377 smp_mb(); \
1378 prefetchw(&v->counter); \
1379 \
1380- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1381+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1382 "1: ldrexd %0, %H0, [%3]\n" \
1383 " " #op1 " %Q0, %Q0, %Q4\n" \
1384 " " #op2 " %R0, %R0, %R4\n" \
1385+ post_op \
1386 " strexd %1, %0, %H0, [%3]\n" \
1387 " teq %1, #0\n" \
1388-" bne 1b" \
1389+" bne 1b\n" \
1390+ extable \
1391 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1392 : "r" (&v->counter), "r" (i) \
1393 : "cc"); \
1394@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1395 return result; \
1396 }
1397
1398+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1399+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1400+
1401 #define ATOMIC64_OPS(op, op1, op2) \
1402 ATOMIC64_OP(op, op1, op2) \
1403 ATOMIC64_OP_RETURN(op, op1, op2)
1404@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1405
1406 #undef ATOMIC64_OPS
1407 #undef ATOMIC64_OP_RETURN
1408+#undef __ATOMIC64_OP_RETURN
1409 #undef ATOMIC64_OP
1410+#undef __ATOMIC64_OP
1411+#undef __OVERFLOW_EXTABLE
1412+#undef __OVERFLOW_POST_RETURN
1413+#undef __OVERFLOW_POST
1414
1415 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1416 long long new)
1417@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1418 return oldval;
1419 }
1420
1421+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1422+ long long new)
1423+{
1424+ long long oldval;
1425+ unsigned long res;
1426+
1427+ smp_mb();
1428+
1429+ do {
1430+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1431+ "ldrexd %1, %H1, [%3]\n"
1432+ "mov %0, #0\n"
1433+ "teq %1, %4\n"
1434+ "teqeq %H1, %H4\n"
1435+ "strexdeq %0, %5, %H5, [%3]"
1436+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1437+ : "r" (&ptr->counter), "r" (old), "r" (new)
1438+ : "cc");
1439+ } while (res);
1440+
1441+ smp_mb();
1442+
1443+ return oldval;
1444+}
1445+
1446 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1447 {
1448 long long result;
1449@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1450 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1451 {
1452 long long result;
1453- unsigned long tmp;
1454+ u64 tmp;
1455
1456 smp_mb();
1457 prefetchw(&v->counter);
1458
1459 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1460-"1: ldrexd %0, %H0, [%3]\n"
1461-" subs %Q0, %Q0, #1\n"
1462-" sbc %R0, %R0, #0\n"
1463+"1: ldrexd %1, %H1, [%3]\n"
1464+" subs %Q0, %Q1, #1\n"
1465+" sbcs %R0, %R1, #0\n"
1466+
1467+#ifdef CONFIG_PAX_REFCOUNT
1468+" bvc 3f\n"
1469+" mov %Q0, %Q1\n"
1470+" mov %R0, %R1\n"
1471+"2: " REFCOUNT_TRAP_INSN "\n"
1472+"3:\n"
1473+#endif
1474+
1475 " teq %R0, #0\n"
1476-" bmi 2f\n"
1477+" bmi 4f\n"
1478 " strexd %1, %0, %H0, [%3]\n"
1479 " teq %1, #0\n"
1480 " bne 1b\n"
1481-"2:"
1482+"4:\n"
1483+
1484+#ifdef CONFIG_PAX_REFCOUNT
1485+ _ASM_EXTABLE(2b, 4b)
1486+#endif
1487+
1488 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1489 : "r" (&v->counter)
1490 : "cc");
1491@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1492 " teq %0, %5\n"
1493 " teqeq %H0, %H5\n"
1494 " moveq %1, #0\n"
1495-" beq 2f\n"
1496+" beq 4f\n"
1497 " adds %Q0, %Q0, %Q6\n"
1498-" adc %R0, %R0, %R6\n"
1499+" adcs %R0, %R0, %R6\n"
1500+
1501+#ifdef CONFIG_PAX_REFCOUNT
1502+" bvc 3f\n"
1503+"2: " REFCOUNT_TRAP_INSN "\n"
1504+"3:\n"
1505+#endif
1506+
1507 " strexd %2, %0, %H0, [%4]\n"
1508 " teq %2, #0\n"
1509 " bne 1b\n"
1510-"2:"
1511+"4:\n"
1512+
1513+#ifdef CONFIG_PAX_REFCOUNT
1514+ _ASM_EXTABLE(2b, 4b)
1515+#endif
1516+
1517 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1518 : "r" (&v->counter), "r" (u), "r" (a)
1519 : "cc");
1520@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1521
1522 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1523 #define atomic64_inc(v) atomic64_add(1LL, (v))
1524+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1525 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1526+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1527 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1528 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1529 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1530+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1531 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1532 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1533 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1534diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1535index d2f81e6..3c4dba5 100644
1536--- a/arch/arm/include/asm/barrier.h
1537+++ b/arch/arm/include/asm/barrier.h
1538@@ -67,7 +67,7 @@
1539 do { \
1540 compiletime_assert_atomic_type(*p); \
1541 smp_mb(); \
1542- ACCESS_ONCE(*p) = (v); \
1543+ ACCESS_ONCE_RW(*p) = (v); \
1544 } while (0)
1545
1546 #define smp_load_acquire(p) \
1547diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1548index 75fe66b..ba3dee4 100644
1549--- a/arch/arm/include/asm/cache.h
1550+++ b/arch/arm/include/asm/cache.h
1551@@ -4,8 +4,10 @@
1552 #ifndef __ASMARM_CACHE_H
1553 #define __ASMARM_CACHE_H
1554
1555+#include <linux/const.h>
1556+
1557 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1558-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1559+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1560
1561 /*
1562 * Memory returned by kmalloc() may be used for DMA, so we must make
1563@@ -24,5 +26,6 @@
1564 #endif
1565
1566 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1567+#define __read_only __attribute__ ((__section__(".data..read_only")))
1568
1569 #endif
1570diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1571index 2d46862..a35415b 100644
1572--- a/arch/arm/include/asm/cacheflush.h
1573+++ b/arch/arm/include/asm/cacheflush.h
1574@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1575 void (*dma_unmap_area)(const void *, size_t, int);
1576
1577 void (*dma_flush_range)(const void *, const void *);
1578-};
1579+} __no_const;
1580
1581 /*
1582 * Select the calling method
1583diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1584index 5233151..87a71fa 100644
1585--- a/arch/arm/include/asm/checksum.h
1586+++ b/arch/arm/include/asm/checksum.h
1587@@ -37,7 +37,19 @@ __wsum
1588 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1589
1590 __wsum
1591-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1592+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1593+
1594+static inline __wsum
1595+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1596+{
1597+ __wsum ret;
1598+ pax_open_userland();
1599+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1600+ pax_close_userland();
1601+ return ret;
1602+}
1603+
1604+
1605
1606 /*
1607 * Fold a partial checksum without adding pseudo headers
1608diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1609index abb2c37..96db950 100644
1610--- a/arch/arm/include/asm/cmpxchg.h
1611+++ b/arch/arm/include/asm/cmpxchg.h
1612@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1613
1614 #define xchg(ptr,x) \
1615 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1616+#define xchg_unchecked(ptr,x) \
1617+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1618
1619 #include <asm-generic/cmpxchg-local.h>
1620
1621diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1622index 6ddbe44..b5e38b1a 100644
1623--- a/arch/arm/include/asm/domain.h
1624+++ b/arch/arm/include/asm/domain.h
1625@@ -48,18 +48,37 @@
1626 * Domain types
1627 */
1628 #define DOMAIN_NOACCESS 0
1629-#define DOMAIN_CLIENT 1
1630 #ifdef CONFIG_CPU_USE_DOMAINS
1631+#define DOMAIN_USERCLIENT 1
1632+#define DOMAIN_KERNELCLIENT 1
1633 #define DOMAIN_MANAGER 3
1634+#define DOMAIN_VECTORS DOMAIN_USER
1635 #else
1636+
1637+#ifdef CONFIG_PAX_KERNEXEC
1638 #define DOMAIN_MANAGER 1
1639+#define DOMAIN_KERNEXEC 3
1640+#else
1641+#define DOMAIN_MANAGER 1
1642+#endif
1643+
1644+#ifdef CONFIG_PAX_MEMORY_UDEREF
1645+#define DOMAIN_USERCLIENT 0
1646+#define DOMAIN_UDEREF 1
1647+#define DOMAIN_VECTORS DOMAIN_KERNEL
1648+#else
1649+#define DOMAIN_USERCLIENT 1
1650+#define DOMAIN_VECTORS DOMAIN_USER
1651+#endif
1652+#define DOMAIN_KERNELCLIENT 1
1653+
1654 #endif
1655
1656 #define domain_val(dom,type) ((type) << (2*(dom)))
1657
1658 #ifndef __ASSEMBLY__
1659
1660-#ifdef CONFIG_CPU_USE_DOMAINS
1661+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1662 static inline void set_domain(unsigned val)
1663 {
1664 asm volatile(
1665@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1666 isb();
1667 }
1668
1669-#define modify_domain(dom,type) \
1670- do { \
1671- struct thread_info *thread = current_thread_info(); \
1672- unsigned int domain = thread->cpu_domain; \
1673- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1674- thread->cpu_domain = domain | domain_val(dom, type); \
1675- set_domain(thread->cpu_domain); \
1676- } while (0)
1677-
1678+extern void modify_domain(unsigned int dom, unsigned int type);
1679 #else
1680 static inline void set_domain(unsigned val) { }
1681 static inline void modify_domain(unsigned dom, unsigned type) { }
1682diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1683index 674d03f..9a0bac0 100644
1684--- a/arch/arm/include/asm/elf.h
1685+++ b/arch/arm/include/asm/elf.h
1686@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1687 the loader. We need to make sure that it is out of the way of the program
1688 that it will "exec", and that there is sufficient room for the brk. */
1689
1690-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1691+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1692+
1693+#ifdef CONFIG_PAX_ASLR
1694+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1695+
1696+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1697+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1698+#endif
1699
1700 /* When the program starts, a1 contains a pointer to a function to be
1701 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1702@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1703 extern void elf_set_personality(const struct elf32_hdr *);
1704 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1705
1706-struct mm_struct;
1707-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1708-#define arch_randomize_brk arch_randomize_brk
1709-
1710 #ifdef CONFIG_MMU
1711 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1712 struct linux_binprm;
1713diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1714index de53547..52b9a28 100644
1715--- a/arch/arm/include/asm/fncpy.h
1716+++ b/arch/arm/include/asm/fncpy.h
1717@@ -81,7 +81,9 @@
1718 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1719 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1720 \
1721+ pax_open_kernel(); \
1722 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1723+ pax_close_kernel(); \
1724 flush_icache_range((unsigned long)(dest_buf), \
1725 (unsigned long)(dest_buf) + (size)); \
1726 \
1727diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1728index 53e69da..3fdc896 100644
1729--- a/arch/arm/include/asm/futex.h
1730+++ b/arch/arm/include/asm/futex.h
1731@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1732 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1733 return -EFAULT;
1734
1735+ pax_open_userland();
1736+
1737 smp_mb();
1738 /* Prefetching cannot fault */
1739 prefetchw(uaddr);
1740@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1741 : "cc", "memory");
1742 smp_mb();
1743
1744+ pax_close_userland();
1745+
1746 *uval = val;
1747 return ret;
1748 }
1749@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1750 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1751 return -EFAULT;
1752
1753+ pax_open_userland();
1754+
1755 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1756 "1: " TUSER(ldr) " %1, [%4]\n"
1757 " teq %1, %2\n"
1758@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1759 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1760 : "cc", "memory");
1761
1762+ pax_close_userland();
1763+
1764 *uval = val;
1765 return ret;
1766 }
1767@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1768 return -EFAULT;
1769
1770 pagefault_disable(); /* implies preempt_disable() */
1771+ pax_open_userland();
1772
1773 switch (op) {
1774 case FUTEX_OP_SET:
1775@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1776 ret = -ENOSYS;
1777 }
1778
1779+ pax_close_userland();
1780 pagefault_enable(); /* subsumes preempt_enable() */
1781
1782 if (!ret) {
1783diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1784index 83eb2f7..ed77159 100644
1785--- a/arch/arm/include/asm/kmap_types.h
1786+++ b/arch/arm/include/asm/kmap_types.h
1787@@ -4,6 +4,6 @@
1788 /*
1789 * This is the "bare minimum". AIO seems to require this.
1790 */
1791-#define KM_TYPE_NR 16
1792+#define KM_TYPE_NR 17
1793
1794 #endif
1795diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1796index 9e614a1..3302cca 100644
1797--- a/arch/arm/include/asm/mach/dma.h
1798+++ b/arch/arm/include/asm/mach/dma.h
1799@@ -22,7 +22,7 @@ struct dma_ops {
1800 int (*residue)(unsigned int, dma_t *); /* optional */
1801 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1802 const char *type;
1803-};
1804+} __do_const;
1805
1806 struct dma_struct {
1807 void *addr; /* single DMA address */
1808diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1809index f98c7f3..e5c626d 100644
1810--- a/arch/arm/include/asm/mach/map.h
1811+++ b/arch/arm/include/asm/mach/map.h
1812@@ -23,17 +23,19 @@ struct map_desc {
1813
1814 /* types 0-3 are defined in asm/io.h */
1815 enum {
1816- MT_UNCACHED = 4,
1817- MT_CACHECLEAN,
1818- MT_MINICLEAN,
1819+ MT_UNCACHED_RW = 4,
1820+ MT_CACHECLEAN_RO,
1821+ MT_MINICLEAN_RO,
1822 MT_LOW_VECTORS,
1823 MT_HIGH_VECTORS,
1824- MT_MEMORY_RWX,
1825+ __MT_MEMORY_RWX,
1826 MT_MEMORY_RW,
1827- MT_ROM,
1828- MT_MEMORY_RWX_NONCACHED,
1829+ MT_MEMORY_RX,
1830+ MT_ROM_RX,
1831+ MT_MEMORY_RW_NONCACHED,
1832+ MT_MEMORY_RX_NONCACHED,
1833 MT_MEMORY_RW_DTCM,
1834- MT_MEMORY_RWX_ITCM,
1835+ MT_MEMORY_RX_ITCM,
1836 MT_MEMORY_RW_SO,
1837 MT_MEMORY_DMA_READY,
1838 };
1839diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1840index 563b92f..689d58e 100644
1841--- a/arch/arm/include/asm/outercache.h
1842+++ b/arch/arm/include/asm/outercache.h
1843@@ -39,7 +39,7 @@ struct outer_cache_fns {
1844 /* This is an ARM L2C thing */
1845 void (*write_sec)(unsigned long, unsigned);
1846 void (*configure)(const struct l2x0_regs *);
1847-};
1848+} __no_const;
1849
1850 extern struct outer_cache_fns outer_cache;
1851
1852diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1853index 4355f0e..cd9168e 100644
1854--- a/arch/arm/include/asm/page.h
1855+++ b/arch/arm/include/asm/page.h
1856@@ -23,6 +23,7 @@
1857
1858 #else
1859
1860+#include <linux/compiler.h>
1861 #include <asm/glue.h>
1862
1863 /*
1864@@ -114,7 +115,7 @@ struct cpu_user_fns {
1865 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1866 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1867 unsigned long vaddr, struct vm_area_struct *vma);
1868-};
1869+} __no_const;
1870
1871 #ifdef MULTI_USER
1872 extern struct cpu_user_fns cpu_user;
1873diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1874index 19cfab5..3f5c7e9 100644
1875--- a/arch/arm/include/asm/pgalloc.h
1876+++ b/arch/arm/include/asm/pgalloc.h
1877@@ -17,6 +17,7 @@
1878 #include <asm/processor.h>
1879 #include <asm/cacheflush.h>
1880 #include <asm/tlbflush.h>
1881+#include <asm/system_info.h>
1882
1883 #define check_pgt_cache() do { } while (0)
1884
1885@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1886 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1887 }
1888
1889+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1890+{
1891+ pud_populate(mm, pud, pmd);
1892+}
1893+
1894 #else /* !CONFIG_ARM_LPAE */
1895
1896 /*
1897@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1898 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1899 #define pmd_free(mm, pmd) do { } while (0)
1900 #define pud_populate(mm,pmd,pte) BUG()
1901+#define pud_populate_kernel(mm,pmd,pte) BUG()
1902
1903 #endif /* CONFIG_ARM_LPAE */
1904
1905@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1906 __free_page(pte);
1907 }
1908
1909+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1910+{
1911+#ifdef CONFIG_ARM_LPAE
1912+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913+#else
1914+ if (addr & SECTION_SIZE)
1915+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1916+ else
1917+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1918+#endif
1919+ flush_pmd_entry(pmdp);
1920+}
1921+
1922 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1923 pmdval_t prot)
1924 {
1925diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1926index 5e68278..1869bae 100644
1927--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1928+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1929@@ -27,7 +27,7 @@
1930 /*
1931 * - section
1932 */
1933-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1934+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1935 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1936 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1937 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1938@@ -39,6 +39,7 @@
1939 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1940 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1941 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1942+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1943
1944 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1945 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1946@@ -68,6 +69,7 @@
1947 * - extended small page/tiny page
1948 */
1949 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1950+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1951 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1952 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1953 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1954diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1955index bfd662e..f6cbb02 100644
1956--- a/arch/arm/include/asm/pgtable-2level.h
1957+++ b/arch/arm/include/asm/pgtable-2level.h
1958@@ -127,6 +127,9 @@
1959 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1960 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1961
1962+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1963+#define L_PTE_PXN (_AT(pteval_t, 0))
1964+
1965 /*
1966 * These are the memory types, defined to be compatible with
1967 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1968diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1969index a745a2a..481350a 100644
1970--- a/arch/arm/include/asm/pgtable-3level.h
1971+++ b/arch/arm/include/asm/pgtable-3level.h
1972@@ -80,6 +80,7 @@
1973 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1974 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1975 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1976+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1977 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1978 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
1979 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
1980@@ -91,10 +92,12 @@
1981 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
1982 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
1983 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
1984+#define PMD_SECT_RDONLY PMD_SECT_AP2
1985
1986 /*
1987 * To be used in assembly code with the upper page attributes.
1988 */
1989+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1990 #define L_PTE_XN_HIGH (1 << (54 - 32))
1991 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1992
1993diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1994index f403541..b10df68 100644
1995--- a/arch/arm/include/asm/pgtable.h
1996+++ b/arch/arm/include/asm/pgtable.h
1997@@ -33,6 +33,9 @@
1998 #include <asm/pgtable-2level.h>
1999 #endif
2000
2001+#define ktla_ktva(addr) (addr)
2002+#define ktva_ktla(addr) (addr)
2003+
2004 /*
2005 * Just any arbitrary offset to the start of the vmalloc VM area: the
2006 * current 8MB value just means that there will be a 8MB "hole" after the
2007@@ -48,6 +51,9 @@
2008 #define LIBRARY_TEXT_START 0x0c000000
2009
2010 #ifndef __ASSEMBLY__
2011+extern pteval_t __supported_pte_mask;
2012+extern pmdval_t __supported_pmd_mask;
2013+
2014 extern void __pte_error(const char *file, int line, pte_t);
2015 extern void __pmd_error(const char *file, int line, pmd_t);
2016 extern void __pgd_error(const char *file, int line, pgd_t);
2017@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2018 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2019 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2020
2021+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2022+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2023+
2024+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2025+#include <asm/domain.h>
2026+#include <linux/thread_info.h>
2027+#include <linux/preempt.h>
2028+
2029+static inline int test_domain(int domain, int domaintype)
2030+{
2031+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2032+}
2033+#endif
2034+
2035+#ifdef CONFIG_PAX_KERNEXEC
2036+static inline unsigned long pax_open_kernel(void) {
2037+#ifdef CONFIG_ARM_LPAE
2038+ /* TODO */
2039+#else
2040+ preempt_disable();
2041+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2042+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2043+#endif
2044+ return 0;
2045+}
2046+
2047+static inline unsigned long pax_close_kernel(void) {
2048+#ifdef CONFIG_ARM_LPAE
2049+ /* TODO */
2050+#else
2051+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2052+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2053+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2054+ preempt_enable_no_resched();
2055+#endif
2056+ return 0;
2057+}
2058+#else
2059+static inline unsigned long pax_open_kernel(void) { return 0; }
2060+static inline unsigned long pax_close_kernel(void) { return 0; }
2061+#endif
2062+
2063 /*
2064 * This is the lowest virtual address we can permit any user space
2065 * mapping to be mapped at. This is particularly important for
2066@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2067 /*
2068 * The pgprot_* and protection_map entries will be fixed up in runtime
2069 * to include the cachable and bufferable bits based on memory policy,
2070- * as well as any architecture dependent bits like global/ASID and SMP
2071- * shared mapping bits.
2072+ * as well as any architecture dependent bits like global/ASID, PXN,
2073+ * and SMP shared mapping bits.
2074 */
2075 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2076
2077@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2078 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2079 {
2080 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2081- L_PTE_NONE | L_PTE_VALID;
2082+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2083 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2084 return pte;
2085 }
2086diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2087index c25ef3e..735f14b 100644
2088--- a/arch/arm/include/asm/psci.h
2089+++ b/arch/arm/include/asm/psci.h
2090@@ -32,7 +32,7 @@ struct psci_operations {
2091 int (*affinity_info)(unsigned long target_affinity,
2092 unsigned long lowest_affinity_level);
2093 int (*migrate_info_type)(void);
2094-};
2095+} __no_const;
2096
2097 extern struct psci_operations psci_ops;
2098 extern struct smp_operations psci_smp_ops;
2099diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2100index 18f5a55..5072a40 100644
2101--- a/arch/arm/include/asm/smp.h
2102+++ b/arch/arm/include/asm/smp.h
2103@@ -107,7 +107,7 @@ struct smp_operations {
2104 int (*cpu_disable)(unsigned int cpu);
2105 #endif
2106 #endif
2107-};
2108+} __no_const;
2109
2110 struct of_cpu_method {
2111 const char *method;
2112diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2113index 72812a1..335f4f3 100644
2114--- a/arch/arm/include/asm/thread_info.h
2115+++ b/arch/arm/include/asm/thread_info.h
2116@@ -77,9 +77,9 @@ struct thread_info {
2117 .flags = 0, \
2118 .preempt_count = INIT_PREEMPT_COUNT, \
2119 .addr_limit = KERNEL_DS, \
2120- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2121- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2122- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2123+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2124+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2125+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2126 }
2127
2128 #define init_thread_info (init_thread_union.thread_info)
2129@@ -155,7 +155,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2130 #define TIF_SYSCALL_AUDIT 9
2131 #define TIF_SYSCALL_TRACEPOINT 10
2132 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2133-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2134+/* within 8 bits of TIF_SYSCALL_TRACE
2135+ * to meet flexible second operand requirements
2136+ */
2137+#define TIF_GRSEC_SETXID 12
2138+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2139 #define TIF_USING_IWMMXT 17
2140 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2141 #define TIF_RESTORE_SIGMASK 20
2142@@ -169,10 +173,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2143 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2144 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2145 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2146+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2147
2148 /* Checks for any syscall work in entry-common.S */
2149 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2150- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2151+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2152
2153 /*
2154 * Change these and you break ASM code in entry-common.S
2155diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2156index 5f833f7..76e6644 100644
2157--- a/arch/arm/include/asm/tls.h
2158+++ b/arch/arm/include/asm/tls.h
2159@@ -3,6 +3,7 @@
2160
2161 #include <linux/compiler.h>
2162 #include <asm/thread_info.h>
2163+#include <asm/pgtable.h>
2164
2165 #ifdef __ASSEMBLY__
2166 #include <asm/asm-offsets.h>
2167@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2168 * at 0xffff0fe0 must be used instead. (see
2169 * entry-armv.S for details)
2170 */
2171+ pax_open_kernel();
2172 *((unsigned int *)0xffff0ff0) = val;
2173+ pax_close_kernel();
2174 #endif
2175 }
2176
2177diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2178index ce0786e..a80c264 100644
2179--- a/arch/arm/include/asm/uaccess.h
2180+++ b/arch/arm/include/asm/uaccess.h
2181@@ -18,6 +18,7 @@
2182 #include <asm/domain.h>
2183 #include <asm/unified.h>
2184 #include <asm/compiler.h>
2185+#include <asm/pgtable.h>
2186
2187 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2188 #include <asm-generic/uaccess-unaligned.h>
2189@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2190 static inline void set_fs(mm_segment_t fs)
2191 {
2192 current_thread_info()->addr_limit = fs;
2193- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2194+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2195 }
2196
2197 #define segment_eq(a, b) ((a) == (b))
2198
2199+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2200+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2201+
2202+static inline void pax_open_userland(void)
2203+{
2204+
2205+#ifdef CONFIG_PAX_MEMORY_UDEREF
2206+ if (segment_eq(get_fs(), USER_DS)) {
2207+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2208+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2209+ }
2210+#endif
2211+
2212+}
2213+
2214+static inline void pax_close_userland(void)
2215+{
2216+
2217+#ifdef CONFIG_PAX_MEMORY_UDEREF
2218+ if (segment_eq(get_fs(), USER_DS)) {
2219+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2220+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2221+ }
2222+#endif
2223+
2224+}
2225+
2226 #define __addr_ok(addr) ({ \
2227 unsigned long flag; \
2228 __asm__("cmp %2, %0; movlo %0, #0" \
2229@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2230
2231 #define get_user(x, p) \
2232 ({ \
2233+ int __e; \
2234 might_fault(); \
2235- __get_user_check(x, p); \
2236+ pax_open_userland(); \
2237+ __e = __get_user_check((x), (p)); \
2238+ pax_close_userland(); \
2239+ __e; \
2240 })
2241
2242 extern int __put_user_1(void *, unsigned int);
2243@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2244
2245 #define put_user(x, p) \
2246 ({ \
2247+ int __e; \
2248 might_fault(); \
2249- __put_user_check(x, p); \
2250+ pax_open_userland(); \
2251+ __e = __put_user_check((x), (p)); \
2252+ pax_close_userland(); \
2253+ __e; \
2254 })
2255
2256 #else /* CONFIG_MMU */
2257@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2258
2259 #endif /* CONFIG_MMU */
2260
2261+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2262 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2263
2264 #define user_addr_max() \
2265@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2266 #define __get_user(x, ptr) \
2267 ({ \
2268 long __gu_err = 0; \
2269+ pax_open_userland(); \
2270 __get_user_err((x), (ptr), __gu_err); \
2271+ pax_close_userland(); \
2272 __gu_err; \
2273 })
2274
2275 #define __get_user_error(x, ptr, err) \
2276 ({ \
2277+ pax_open_userland(); \
2278 __get_user_err((x), (ptr), err); \
2279+ pax_close_userland(); \
2280 (void) 0; \
2281 })
2282
2283@@ -368,13 +409,17 @@ do { \
2284 #define __put_user(x, ptr) \
2285 ({ \
2286 long __pu_err = 0; \
2287+ pax_open_userland(); \
2288 __put_user_err((x), (ptr), __pu_err); \
2289+ pax_close_userland(); \
2290 __pu_err; \
2291 })
2292
2293 #define __put_user_error(x, ptr, err) \
2294 ({ \
2295+ pax_open_userland(); \
2296 __put_user_err((x), (ptr), err); \
2297+ pax_close_userland(); \
2298 (void) 0; \
2299 })
2300
2301@@ -474,11 +519,44 @@ do { \
2302
2303
2304 #ifdef CONFIG_MMU
2305-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2306-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2307+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2308+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2309+
2310+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2311+{
2312+ unsigned long ret;
2313+
2314+ check_object_size(to, n, false);
2315+ pax_open_userland();
2316+ ret = ___copy_from_user(to, from, n);
2317+ pax_close_userland();
2318+ return ret;
2319+}
2320+
2321+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2322+{
2323+ unsigned long ret;
2324+
2325+ check_object_size(from, n, true);
2326+ pax_open_userland();
2327+ ret = ___copy_to_user(to, from, n);
2328+ pax_close_userland();
2329+ return ret;
2330+}
2331+
2332 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2333-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2334+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2335 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2336+
2337+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2338+{
2339+ unsigned long ret;
2340+ pax_open_userland();
2341+ ret = ___clear_user(addr, n);
2342+ pax_close_userland();
2343+ return ret;
2344+}
2345+
2346 #else
2347 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2348 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2349@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2350
2351 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2352 {
2353+ if ((long)n < 0)
2354+ return n;
2355+
2356 if (access_ok(VERIFY_READ, from, n))
2357 n = __copy_from_user(to, from, n);
2358 else /* security hole - plug it */
2359@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2360
2361 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2362 {
2363+ if ((long)n < 0)
2364+ return n;
2365+
2366 if (access_ok(VERIFY_WRITE, to, n))
2367 n = __copy_to_user(to, from, n);
2368 return n;
2369diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2370index 5af0ed1..cea83883 100644
2371--- a/arch/arm/include/uapi/asm/ptrace.h
2372+++ b/arch/arm/include/uapi/asm/ptrace.h
2373@@ -92,7 +92,7 @@
2374 * ARMv7 groups of PSR bits
2375 */
2376 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2377-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2378+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2379 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2380 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2381
2382diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2383index a88671c..1cc895e 100644
2384--- a/arch/arm/kernel/armksyms.c
2385+++ b/arch/arm/kernel/armksyms.c
2386@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2387
2388 /* networking */
2389 EXPORT_SYMBOL(csum_partial);
2390-EXPORT_SYMBOL(csum_partial_copy_from_user);
2391+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2392 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2393 EXPORT_SYMBOL(__csum_ipv6_magic);
2394
2395@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2396 #ifdef CONFIG_MMU
2397 EXPORT_SYMBOL(copy_page);
2398
2399-EXPORT_SYMBOL(__copy_from_user);
2400-EXPORT_SYMBOL(__copy_to_user);
2401-EXPORT_SYMBOL(__clear_user);
2402+EXPORT_SYMBOL(___copy_from_user);
2403+EXPORT_SYMBOL(___copy_to_user);
2404+EXPORT_SYMBOL(___clear_user);
2405
2406 EXPORT_SYMBOL(__get_user_1);
2407 EXPORT_SYMBOL(__get_user_2);
2408diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2409index 672b219..4aa120a 100644
2410--- a/arch/arm/kernel/entry-armv.S
2411+++ b/arch/arm/kernel/entry-armv.S
2412@@ -48,6 +48,87 @@
2413 9997:
2414 .endm
2415
2416+ .macro pax_enter_kernel
2417+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2418+ @ make aligned space for saved DACR
2419+ sub sp, sp, #8
2420+ @ save regs
2421+ stmdb sp!, {r1, r2}
2422+ @ read DACR from cpu_domain into r1
2423+ mov r2, sp
2424+ @ assume 8K pages, since we have to split the immediate in two
2425+ bic r2, r2, #(0x1fc0)
2426+ bic r2, r2, #(0x3f)
2427+ ldr r1, [r2, #TI_CPU_DOMAIN]
2428+ @ store old DACR on stack
2429+ str r1, [sp, #8]
2430+#ifdef CONFIG_PAX_KERNEXEC
2431+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2432+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2433+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2434+#endif
2435+#ifdef CONFIG_PAX_MEMORY_UDEREF
2436+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2437+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2438+#endif
2439+ @ write r1 to current_thread_info()->cpu_domain
2440+ str r1, [r2, #TI_CPU_DOMAIN]
2441+ @ write r1 to DACR
2442+ mcr p15, 0, r1, c3, c0, 0
2443+ @ instruction sync
2444+ instr_sync
2445+ @ restore regs
2446+ ldmia sp!, {r1, r2}
2447+#endif
2448+ .endm
2449+
2450+ .macro pax_open_userland
2451+#ifdef CONFIG_PAX_MEMORY_UDEREF
2452+ @ save regs
2453+ stmdb sp!, {r0, r1}
2454+ @ read DACR from cpu_domain into r1
2455+ mov r0, sp
2456+ @ assume 8K pages, since we have to split the immediate in two
2457+ bic r0, r0, #(0x1fc0)
2458+ bic r0, r0, #(0x3f)
2459+ ldr r1, [r0, #TI_CPU_DOMAIN]
2460+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2461+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2462+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2463+ @ write r1 to current_thread_info()->cpu_domain
2464+ str r1, [r0, #TI_CPU_DOMAIN]
2465+ @ write r1 to DACR
2466+ mcr p15, 0, r1, c3, c0, 0
2467+ @ instruction sync
2468+ instr_sync
2469+ @ restore regs
2470+ ldmia sp!, {r0, r1}
2471+#endif
2472+ .endm
2473+
2474+ .macro pax_close_userland
2475+#ifdef CONFIG_PAX_MEMORY_UDEREF
2476+ @ save regs
2477+ stmdb sp!, {r0, r1}
2478+ @ read DACR from cpu_domain into r1
2479+ mov r0, sp
2480+ @ assume 8K pages, since we have to split the immediate in two
2481+ bic r0, r0, #(0x1fc0)
2482+ bic r0, r0, #(0x3f)
2483+ ldr r1, [r0, #TI_CPU_DOMAIN]
2484+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2485+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2486+ @ write r1 to current_thread_info()->cpu_domain
2487+ str r1, [r0, #TI_CPU_DOMAIN]
2488+ @ write r1 to DACR
2489+ mcr p15, 0, r1, c3, c0, 0
2490+ @ instruction sync
2491+ instr_sync
2492+ @ restore regs
2493+ ldmia sp!, {r0, r1}
2494+#endif
2495+ .endm
2496+
2497 .macro pabt_helper
2498 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2499 #ifdef MULTI_PABORT
2500@@ -90,11 +171,15 @@
2501 * Invalid mode handlers
2502 */
2503 .macro inv_entry, reason
2504+
2505+ pax_enter_kernel
2506+
2507 sub sp, sp, #S_FRAME_SIZE
2508 ARM( stmib sp, {r1 - lr} )
2509 THUMB( stmia sp, {r0 - r12} )
2510 THUMB( str sp, [sp, #S_SP] )
2511 THUMB( str lr, [sp, #S_LR] )
2512+
2513 mov r1, #\reason
2514 .endm
2515
2516@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2517 .macro svc_entry, stack_hole=0, trace=1
2518 UNWIND(.fnstart )
2519 UNWIND(.save {r0 - pc} )
2520+
2521+ pax_enter_kernel
2522+
2523 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2524+
2525 #ifdef CONFIG_THUMB2_KERNEL
2526 SPFIX( str r0, [sp] ) @ temporarily saved
2527 SPFIX( mov r0, sp )
2528@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2529 ldmia r0, {r3 - r5}
2530 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2531 mov r6, #-1 @ "" "" "" ""
2532+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2533+ @ offset sp by 8 as done in pax_enter_kernel
2534+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2535+#else
2536 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2537+#endif
2538 SPFIX( addeq r2, r2, #4 )
2539 str r3, [sp, #-4]! @ save the "real" r0 copied
2540 @ from the exception stack
2541@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2542 .macro usr_entry, trace=1
2543 UNWIND(.fnstart )
2544 UNWIND(.cantunwind ) @ don't unwind the user space
2545+
2546+ pax_enter_kernel_user
2547+
2548 sub sp, sp, #S_FRAME_SIZE
2549 ARM( stmib sp, {r1 - r12} )
2550 THUMB( stmia sp, {r0 - r12} )
2551@@ -479,7 +576,9 @@ __und_usr:
2552 tst r3, #PSR_T_BIT @ Thumb mode?
2553 bne __und_usr_thumb
2554 sub r4, r2, #4 @ ARM instr at LR - 4
2555+ pax_open_userland
2556 1: ldrt r0, [r4]
2557+ pax_close_userland
2558 ARM_BE8(rev r0, r0) @ little endian instruction
2559
2560 @ r0 = 32-bit ARM instruction which caused the exception
2561@@ -513,11 +612,15 @@ __und_usr_thumb:
2562 */
2563 .arch armv6t2
2564 #endif
2565+ pax_open_userland
2566 2: ldrht r5, [r4]
2567+ pax_close_userland
2568 ARM_BE8(rev16 r5, r5) @ little endian instruction
2569 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2570 blo __und_usr_fault_16 @ 16bit undefined instruction
2571+ pax_open_userland
2572 3: ldrht r0, [r2]
2573+ pax_close_userland
2574 ARM_BE8(rev16 r0, r0) @ little endian instruction
2575 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2576 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2577@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2578 */
2579 .pushsection .fixup, "ax"
2580 .align 2
2581-4: str r4, [sp, #S_PC] @ retry current instruction
2582+4: pax_close_userland
2583+ str r4, [sp, #S_PC] @ retry current instruction
2584 ret r9
2585 .popsection
2586 .pushsection __ex_table,"a"
2587@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2588 THUMB( str lr, [ip], #4 )
2589 ldr r4, [r2, #TI_TP_VALUE]
2590 ldr r5, [r2, #TI_TP_VALUE + 4]
2591-#ifdef CONFIG_CPU_USE_DOMAINS
2592+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2593 ldr r6, [r2, #TI_CPU_DOMAIN]
2594 #endif
2595 switch_tls r1, r4, r5, r3, r7
2596@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2597 ldr r8, =__stack_chk_guard
2598 ldr r7, [r7, #TSK_STACK_CANARY]
2599 #endif
2600-#ifdef CONFIG_CPU_USE_DOMAINS
2601+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2602 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2603 #endif
2604 mov r5, r0
2605diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2606index 4e7f40c..0f9ee2c 100644
2607--- a/arch/arm/kernel/entry-common.S
2608+++ b/arch/arm/kernel/entry-common.S
2609@@ -11,18 +11,46 @@
2610 #include <asm/assembler.h>
2611 #include <asm/unistd.h>
2612 #include <asm/ftrace.h>
2613+#include <asm/domain.h>
2614 #include <asm/unwind.h>
2615
2616+#include "entry-header.S"
2617+
2618 #ifdef CONFIG_NEED_RET_TO_USER
2619 #include <mach/entry-macro.S>
2620 #else
2621 .macro arch_ret_to_user, tmp1, tmp2
2622+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2623+ @ save regs
2624+ stmdb sp!, {r1, r2}
2625+ @ read DACR from cpu_domain into r1
2626+ mov r2, sp
2627+ @ assume 8K pages, since we have to split the immediate in two
2628+ bic r2, r2, #(0x1fc0)
2629+ bic r2, r2, #(0x3f)
2630+ ldr r1, [r2, #TI_CPU_DOMAIN]
2631+#ifdef CONFIG_PAX_KERNEXEC
2632+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2633+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2634+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2635+#endif
2636+#ifdef CONFIG_PAX_MEMORY_UDEREF
2637+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2638+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2639+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2640+#endif
2641+ @ write r1 to current_thread_info()->cpu_domain
2642+ str r1, [r2, #TI_CPU_DOMAIN]
2643+ @ write r1 to DACR
2644+ mcr p15, 0, r1, c3, c0, 0
2645+ @ instruction sync
2646+ instr_sync
2647+ @ restore regs
2648+ ldmia sp!, {r1, r2}
2649+#endif
2650 .endm
2651 #endif
2652
2653-#include "entry-header.S"
2654-
2655-
2656 .align 5
2657 /*
2658 * This is the fast syscall return path. We do as little as
2659@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2660 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2661 #endif
2662
2663+ /*
2664+ * do this here to avoid a performance hit of wrapping the code above
2665+ * that directly dereferences userland to parse the SWI instruction
2666+ */
2667+ pax_enter_kernel_user
2668+
2669 adr tbl, sys_call_table @ load syscall table pointer
2670
2671 #if defined(CONFIG_OABI_COMPAT)
2672diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2673index 1a0045a..9b4f34d 100644
2674--- a/arch/arm/kernel/entry-header.S
2675+++ b/arch/arm/kernel/entry-header.S
2676@@ -196,6 +196,60 @@
2677 msr cpsr_c, \rtemp @ switch back to the SVC mode
2678 .endm
2679
2680+ .macro pax_enter_kernel_user
2681+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2682+ @ save regs
2683+ stmdb sp!, {r0, r1}
2684+ @ read DACR from cpu_domain into r1
2685+ mov r0, sp
2686+ @ assume 8K pages, since we have to split the immediate in two
2687+ bic r0, r0, #(0x1fc0)
2688+ bic r0, r0, #(0x3f)
2689+ ldr r1, [r0, #TI_CPU_DOMAIN]
2690+#ifdef CONFIG_PAX_MEMORY_UDEREF
2691+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2692+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2693+#endif
2694+#ifdef CONFIG_PAX_KERNEXEC
2695+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2696+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2697+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2698+#endif
2699+ @ write r1 to current_thread_info()->cpu_domain
2700+ str r1, [r0, #TI_CPU_DOMAIN]
2701+ @ write r1 to DACR
2702+ mcr p15, 0, r1, c3, c0, 0
2703+ @ instruction sync
2704+ instr_sync
2705+ @ restore regs
2706+ ldmia sp!, {r0, r1}
2707+#endif
2708+ .endm
2709+
2710+ .macro pax_exit_kernel
2711+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2712+ @ save regs
2713+ stmdb sp!, {r0, r1}
2714+ @ read old DACR from stack into r1
2715+ ldr r1, [sp, #(8 + S_SP)]
2716+ sub r1, r1, #8
2717+ ldr r1, [r1]
2718+
2719+ @ write r1 to current_thread_info()->cpu_domain
2720+ mov r0, sp
2721+ @ assume 8K pages, since we have to split the immediate in two
2722+ bic r0, r0, #(0x1fc0)
2723+ bic r0, r0, #(0x3f)
2724+ str r1, [r0, #TI_CPU_DOMAIN]
2725+ @ write r1 to DACR
2726+ mcr p15, 0, r1, c3, c0, 0
2727+ @ instruction sync
2728+ instr_sync
2729+ @ restore regs
2730+ ldmia sp!, {r0, r1}
2731+#endif
2732+ .endm
2733+
2734 #ifndef CONFIG_THUMB2_KERNEL
2735 .macro svc_exit, rpsr, irq = 0
2736 .if \irq != 0
2737@@ -215,6 +269,9 @@
2738 blne trace_hardirqs_off
2739 #endif
2740 .endif
2741+
2742+ pax_exit_kernel
2743+
2744 msr spsr_cxsf, \rpsr
2745 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2746 @ We must avoid clrex due to Cortex-A15 erratum #830321
2747@@ -291,6 +348,9 @@
2748 blne trace_hardirqs_off
2749 #endif
2750 .endif
2751+
2752+ pax_exit_kernel
2753+
2754 ldr lr, [sp, #S_SP] @ top of the stack
2755 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2756
2757diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2758index 059c3da..8e45cfc 100644
2759--- a/arch/arm/kernel/fiq.c
2760+++ b/arch/arm/kernel/fiq.c
2761@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2762 void *base = vectors_page;
2763 unsigned offset = FIQ_OFFSET;
2764
2765+ pax_open_kernel();
2766 memcpy(base + offset, start, length);
2767+ pax_close_kernel();
2768+
2769 if (!cache_is_vipt_nonaliasing())
2770 flush_icache_range((unsigned long)base + offset, offset +
2771 length);
2772diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2773index 0196327..50ac8895 100644
2774--- a/arch/arm/kernel/head.S
2775+++ b/arch/arm/kernel/head.S
2776@@ -444,7 +444,7 @@ __enable_mmu:
2777 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2778 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2779 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2780- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2781+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2782 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2783 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2784 #endif
2785diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2786index 2e11961..07f0704 100644
2787--- a/arch/arm/kernel/module.c
2788+++ b/arch/arm/kernel/module.c
2789@@ -38,12 +38,39 @@
2790 #endif
2791
2792 #ifdef CONFIG_MMU
2793-void *module_alloc(unsigned long size)
2794+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2795 {
2796+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2797+ return NULL;
2798 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2799- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2800+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2801 __builtin_return_address(0));
2802 }
2803+
2804+void *module_alloc(unsigned long size)
2805+{
2806+
2807+#ifdef CONFIG_PAX_KERNEXEC
2808+ return __module_alloc(size, PAGE_KERNEL);
2809+#else
2810+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2811+#endif
2812+
2813+}
2814+
2815+#ifdef CONFIG_PAX_KERNEXEC
2816+void module_memfree_exec(void *module_region)
2817+{
2818+ module_memfree(module_region);
2819+}
2820+EXPORT_SYMBOL(module_memfree_exec);
2821+
2822+void *module_alloc_exec(unsigned long size)
2823+{
2824+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2825+}
2826+EXPORT_SYMBOL(module_alloc_exec);
2827+#endif
2828 #endif
2829
2830 int
2831diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2832index 69bda1a..755113a 100644
2833--- a/arch/arm/kernel/patch.c
2834+++ b/arch/arm/kernel/patch.c
2835@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2836 else
2837 __acquire(&patch_lock);
2838
2839+ pax_open_kernel();
2840 if (thumb2 && __opcode_is_thumb16(insn)) {
2841 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2842 size = sizeof(u16);
2843@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2844 *(u32 *)waddr = insn;
2845 size = sizeof(u32);
2846 }
2847+ pax_close_kernel();
2848
2849 if (waddr != addr) {
2850 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2851diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2852index 2bf1a16..d959d40 100644
2853--- a/arch/arm/kernel/process.c
2854+++ b/arch/arm/kernel/process.c
2855@@ -213,6 +213,7 @@ void machine_power_off(void)
2856
2857 if (pm_power_off)
2858 pm_power_off();
2859+ BUG();
2860 }
2861
2862 /*
2863@@ -226,7 +227,7 @@ void machine_power_off(void)
2864 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2865 * to use. Implementing such co-ordination would be essentially impossible.
2866 */
2867-void machine_restart(char *cmd)
2868+__noreturn void machine_restart(char *cmd)
2869 {
2870 local_irq_disable();
2871 smp_send_stop();
2872@@ -252,8 +253,8 @@ void __show_regs(struct pt_regs *regs)
2873
2874 show_regs_print_info(KERN_DEFAULT);
2875
2876- print_symbol("PC is at %s\n", instruction_pointer(regs));
2877- print_symbol("LR is at %s\n", regs->ARM_lr);
2878+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2879+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2880 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2881 "sp : %08lx ip : %08lx fp : %08lx\n",
2882 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2883@@ -430,12 +431,6 @@ unsigned long get_wchan(struct task_struct *p)
2884 return 0;
2885 }
2886
2887-unsigned long arch_randomize_brk(struct mm_struct *mm)
2888-{
2889- unsigned long range_end = mm->brk + 0x02000000;
2890- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2891-}
2892-
2893 #ifdef CONFIG_MMU
2894 #ifdef CONFIG_KUSER_HELPERS
2895 /*
2896@@ -451,7 +446,7 @@ static struct vm_area_struct gate_vma = {
2897
2898 static int __init gate_vma_init(void)
2899 {
2900- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2901+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2902 return 0;
2903 }
2904 arch_initcall(gate_vma_init);
2905@@ -480,81 +475,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2906 return is_gate_vma(vma) ? "[vectors]" : NULL;
2907 }
2908
2909-/* If possible, provide a placement hint at a random offset from the
2910- * stack for the signal page.
2911- */
2912-static unsigned long sigpage_addr(const struct mm_struct *mm,
2913- unsigned int npages)
2914-{
2915- unsigned long offset;
2916- unsigned long first;
2917- unsigned long last;
2918- unsigned long addr;
2919- unsigned int slots;
2920-
2921- first = PAGE_ALIGN(mm->start_stack);
2922-
2923- last = TASK_SIZE - (npages << PAGE_SHIFT);
2924-
2925- /* No room after stack? */
2926- if (first > last)
2927- return 0;
2928-
2929- /* Just enough room? */
2930- if (first == last)
2931- return first;
2932-
2933- slots = ((last - first) >> PAGE_SHIFT) + 1;
2934-
2935- offset = get_random_int() % slots;
2936-
2937- addr = first + (offset << PAGE_SHIFT);
2938-
2939- return addr;
2940-}
2941-
2942-static struct page *signal_page;
2943-extern struct page *get_signal_page(void);
2944-
2945-static const struct vm_special_mapping sigpage_mapping = {
2946- .name = "[sigpage]",
2947- .pages = &signal_page,
2948-};
2949-
2950 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2951 {
2952 struct mm_struct *mm = current->mm;
2953- struct vm_area_struct *vma;
2954- unsigned long addr;
2955- unsigned long hint;
2956- int ret = 0;
2957-
2958- if (!signal_page)
2959- signal_page = get_signal_page();
2960- if (!signal_page)
2961- return -ENOMEM;
2962
2963 down_write(&mm->mmap_sem);
2964- hint = sigpage_addr(mm, 1);
2965- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2966- if (IS_ERR_VALUE(addr)) {
2967- ret = addr;
2968- goto up_fail;
2969- }
2970-
2971- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2972- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2973- &sigpage_mapping);
2974-
2975- if (IS_ERR(vma)) {
2976- ret = PTR_ERR(vma);
2977- goto up_fail;
2978- }
2979-
2980- mm->context.sigpage = addr;
2981-
2982- up_fail:
2983+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2984 up_write(&mm->mmap_sem);
2985- return ret;
2986+ return 0;
2987 }
2988 #endif
2989diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2990index f90fdf4..24e8c84 100644
2991--- a/arch/arm/kernel/psci.c
2992+++ b/arch/arm/kernel/psci.c
2993@@ -26,7 +26,7 @@
2994 #include <asm/psci.h>
2995 #include <asm/system_misc.h>
2996
2997-struct psci_operations psci_ops;
2998+struct psci_operations psci_ops __read_only;
2999
3000 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3001 typedef int (*psci_initcall_t)(const struct device_node *);
3002diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3003index ef9119f..31995a3 100644
3004--- a/arch/arm/kernel/ptrace.c
3005+++ b/arch/arm/kernel/ptrace.c
3006@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3007 regs->ARM_ip = ip;
3008 }
3009
3010+#ifdef CONFIG_GRKERNSEC_SETXID
3011+extern void gr_delayed_cred_worker(void);
3012+#endif
3013+
3014 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3015 {
3016 current_thread_info()->syscall = scno;
3017
3018+#ifdef CONFIG_GRKERNSEC_SETXID
3019+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3020+ gr_delayed_cred_worker();
3021+#endif
3022+
3023 /* Do the secure computing check first; failures should be fast. */
3024 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3025 if (secure_computing() == -1)
3026diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3027index 1d60beb..4aa25d5 100644
3028--- a/arch/arm/kernel/setup.c
3029+++ b/arch/arm/kernel/setup.c
3030@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3031 unsigned int elf_hwcap2 __read_mostly;
3032 EXPORT_SYMBOL(elf_hwcap2);
3033
3034+pteval_t __supported_pte_mask __read_only;
3035+pmdval_t __supported_pmd_mask __read_only;
3036
3037 #ifdef MULTI_CPU
3038-struct processor processor __read_mostly;
3039+struct processor processor __read_only;
3040 #endif
3041 #ifdef MULTI_TLB
3042-struct cpu_tlb_fns cpu_tlb __read_mostly;
3043+struct cpu_tlb_fns cpu_tlb __read_only;
3044 #endif
3045 #ifdef MULTI_USER
3046-struct cpu_user_fns cpu_user __read_mostly;
3047+struct cpu_user_fns cpu_user __read_only;
3048 #endif
3049 #ifdef MULTI_CACHE
3050-struct cpu_cache_fns cpu_cache __read_mostly;
3051+struct cpu_cache_fns cpu_cache __read_only;
3052 #endif
3053 #ifdef CONFIG_OUTER_CACHE
3054-struct outer_cache_fns outer_cache __read_mostly;
3055+struct outer_cache_fns outer_cache __read_only;
3056 EXPORT_SYMBOL(outer_cache);
3057 #endif
3058
3059@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3060 * Register 0 and check for VMSAv7 or PMSAv7 */
3061 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3062 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3063- (mmfr0 & 0x000000f0) >= 0x00000030)
3064+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3065 cpu_arch = CPU_ARCH_ARMv7;
3066- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3067+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3068+ __supported_pte_mask |= L_PTE_PXN;
3069+ __supported_pmd_mask |= PMD_PXNTABLE;
3070+ }
3071+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3072 (mmfr0 & 0x000000f0) == 0x00000020)
3073 cpu_arch = CPU_ARCH_ARMv6;
3074 else
3075diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3076index 023ac90..0a69950 100644
3077--- a/arch/arm/kernel/signal.c
3078+++ b/arch/arm/kernel/signal.c
3079@@ -24,8 +24,6 @@
3080
3081 extern const unsigned long sigreturn_codes[7];
3082
3083-static unsigned long signal_return_offset;
3084-
3085 #ifdef CONFIG_CRUNCH
3086 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3087 {
3088@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3089 * except when the MPU has protected the vectors
3090 * page from PL0
3091 */
3092- retcode = mm->context.sigpage + signal_return_offset +
3093- (idx << 2) + thumb;
3094+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3095 } else
3096 #endif
3097 {
3098@@ -603,33 +600,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3099 } while (thread_flags & _TIF_WORK_MASK);
3100 return 0;
3101 }
3102-
3103-struct page *get_signal_page(void)
3104-{
3105- unsigned long ptr;
3106- unsigned offset;
3107- struct page *page;
3108- void *addr;
3109-
3110- page = alloc_pages(GFP_KERNEL, 0);
3111-
3112- if (!page)
3113- return NULL;
3114-
3115- addr = page_address(page);
3116-
3117- /* Give the signal return code some randomness */
3118- offset = 0x200 + (get_random_int() & 0x7fc);
3119- signal_return_offset = offset;
3120-
3121- /*
3122- * Copy signal return handlers into the vector page, and
3123- * set sigreturn to be a pointer to these.
3124- */
3125- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3126-
3127- ptr = (unsigned long)addr + offset;
3128- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3129-
3130- return page;
3131-}
3132diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3133index 86ef244..c518451 100644
3134--- a/arch/arm/kernel/smp.c
3135+++ b/arch/arm/kernel/smp.c
3136@@ -76,7 +76,7 @@ enum ipi_msg_type {
3137
3138 static DECLARE_COMPLETION(cpu_running);
3139
3140-static struct smp_operations smp_ops;
3141+static struct smp_operations smp_ops __read_only;
3142
3143 void __init smp_set_ops(struct smp_operations *ops)
3144 {
3145diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3146index 7a3be1d..b00c7de 100644
3147--- a/arch/arm/kernel/tcm.c
3148+++ b/arch/arm/kernel/tcm.c
3149@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3150 .virtual = ITCM_OFFSET,
3151 .pfn = __phys_to_pfn(ITCM_OFFSET),
3152 .length = 0,
3153- .type = MT_MEMORY_RWX_ITCM,
3154+ .type = MT_MEMORY_RX_ITCM,
3155 }
3156 };
3157
3158@@ -267,7 +267,9 @@ no_dtcm:
3159 start = &__sitcm_text;
3160 end = &__eitcm_text;
3161 ram = &__itcm_start;
3162+ pax_open_kernel();
3163 memcpy(start, ram, itcm_code_sz);
3164+ pax_close_kernel();
3165 pr_debug("CPU ITCM: copied code from %p - %p\n",
3166 start, end);
3167 itcm_present = true;
3168diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3169index 788e23f..6fa06a1 100644
3170--- a/arch/arm/kernel/traps.c
3171+++ b/arch/arm/kernel/traps.c
3172@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3173 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3174 {
3175 #ifdef CONFIG_KALLSYMS
3176- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3177+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3178 #else
3179 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3180 #endif
3181@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3182 static int die_owner = -1;
3183 static unsigned int die_nest_count;
3184
3185+extern void gr_handle_kernel_exploit(void);
3186+
3187 static unsigned long oops_begin(void)
3188 {
3189 int cpu;
3190@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3191 panic("Fatal exception in interrupt");
3192 if (panic_on_oops)
3193 panic("Fatal exception");
3194+
3195+ gr_handle_kernel_exploit();
3196+
3197 if (signr)
3198 do_exit(signr);
3199 }
3200@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3201 kuser_init(vectors_base);
3202
3203 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3204- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3205+
3206+#ifndef CONFIG_PAX_MEMORY_UDEREF
3207+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3208+#endif
3209+
3210 #else /* ifndef CONFIG_CPU_V7M */
3211 /*
3212 * on V7-M there is no need to copy the vector table to a dedicated
3213diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3214index b31aa73..cc4b7a1 100644
3215--- a/arch/arm/kernel/vmlinux.lds.S
3216+++ b/arch/arm/kernel/vmlinux.lds.S
3217@@ -37,7 +37,7 @@
3218 #endif
3219
3220 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3221- defined(CONFIG_GENERIC_BUG)
3222+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3223 #define ARM_EXIT_KEEP(x) x
3224 #define ARM_EXIT_DISCARD(x)
3225 #else
3226@@ -123,6 +123,8 @@ SECTIONS
3227 #ifdef CONFIG_DEBUG_RODATA
3228 . = ALIGN(1<<SECTION_SHIFT);
3229 #endif
3230+ _etext = .; /* End of text section */
3231+
3232 RO_DATA(PAGE_SIZE)
3233
3234 . = ALIGN(4);
3235@@ -153,8 +155,6 @@ SECTIONS
3236
3237 NOTES
3238
3239- _etext = .; /* End of text and rodata section */
3240-
3241 #ifndef CONFIG_XIP_KERNEL
3242 # ifdef CONFIG_ARM_KERNMEM_PERMS
3243 . = ALIGN(1<<SECTION_SHIFT);
3244diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3245index b652af5..60231ab 100644
3246--- a/arch/arm/kvm/arm.c
3247+++ b/arch/arm/kvm/arm.c
3248@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3249 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3250
3251 /* The VMID used in the VTTBR */
3252-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3253+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3254 static u8 kvm_next_vmid;
3255 static DEFINE_SPINLOCK(kvm_vmid_lock);
3256
3257@@ -358,7 +358,7 @@ void force_vm_exit(const cpumask_t *mask)
3258 */
3259 static bool need_new_vmid_gen(struct kvm *kvm)
3260 {
3261- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3262+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3263 }
3264
3265 /**
3266@@ -391,7 +391,7 @@ static void update_vttbr(struct kvm *kvm)
3267
3268 /* First user of a new VMID generation? */
3269 if (unlikely(kvm_next_vmid == 0)) {
3270- atomic64_inc(&kvm_vmid_gen);
3271+ atomic64_inc_unchecked(&kvm_vmid_gen);
3272 kvm_next_vmid = 1;
3273
3274 /*
3275@@ -408,7 +408,7 @@ static void update_vttbr(struct kvm *kvm)
3276 kvm_call_hyp(__kvm_flush_vm_context);
3277 }
3278
3279- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3280+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3281 kvm->arch.vmid = kvm_next_vmid;
3282 kvm_next_vmid++;
3283
3284@@ -1087,7 +1087,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3285 /**
3286 * Initialize Hyp-mode and memory mappings on all CPUs.
3287 */
3288-int kvm_arch_init(void *opaque)
3289+int kvm_arch_init(const void *opaque)
3290 {
3291 int err;
3292 int ret, cpu;
3293diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3294index 14a0d98..7771a7d 100644
3295--- a/arch/arm/lib/clear_user.S
3296+++ b/arch/arm/lib/clear_user.S
3297@@ -12,14 +12,14 @@
3298
3299 .text
3300
3301-/* Prototype: int __clear_user(void *addr, size_t sz)
3302+/* Prototype: int ___clear_user(void *addr, size_t sz)
3303 * Purpose : clear some user memory
3304 * Params : addr - user memory address to clear
3305 * : sz - number of bytes to clear
3306 * Returns : number of bytes NOT cleared
3307 */
3308 ENTRY(__clear_user_std)
3309-WEAK(__clear_user)
3310+WEAK(___clear_user)
3311 stmfd sp!, {r1, lr}
3312 mov r2, #0
3313 cmp r1, #4
3314@@ -44,7 +44,7 @@ WEAK(__clear_user)
3315 USER( strnebt r2, [r0])
3316 mov r0, #0
3317 ldmfd sp!, {r1, pc}
3318-ENDPROC(__clear_user)
3319+ENDPROC(___clear_user)
3320 ENDPROC(__clear_user_std)
3321
3322 .pushsection .fixup,"ax"
3323diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3324index 7a235b9..73a0556 100644
3325--- a/arch/arm/lib/copy_from_user.S
3326+++ b/arch/arm/lib/copy_from_user.S
3327@@ -17,7 +17,7 @@
3328 /*
3329 * Prototype:
3330 *
3331- * size_t __copy_from_user(void *to, const void *from, size_t n)
3332+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3333 *
3334 * Purpose:
3335 *
3336@@ -89,11 +89,11 @@
3337
3338 .text
3339
3340-ENTRY(__copy_from_user)
3341+ENTRY(___copy_from_user)
3342
3343 #include "copy_template.S"
3344
3345-ENDPROC(__copy_from_user)
3346+ENDPROC(___copy_from_user)
3347
3348 .pushsection .fixup,"ax"
3349 .align 0
3350diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3351index 6ee2f67..d1cce76 100644
3352--- a/arch/arm/lib/copy_page.S
3353+++ b/arch/arm/lib/copy_page.S
3354@@ -10,6 +10,7 @@
3355 * ASM optimised string functions
3356 */
3357 #include <linux/linkage.h>
3358+#include <linux/const.h>
3359 #include <asm/assembler.h>
3360 #include <asm/asm-offsets.h>
3361 #include <asm/cache.h>
3362diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3363index a9d3db1..164b089 100644
3364--- a/arch/arm/lib/copy_to_user.S
3365+++ b/arch/arm/lib/copy_to_user.S
3366@@ -17,7 +17,7 @@
3367 /*
3368 * Prototype:
3369 *
3370- * size_t __copy_to_user(void *to, const void *from, size_t n)
3371+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3372 *
3373 * Purpose:
3374 *
3375@@ -93,11 +93,11 @@
3376 .text
3377
3378 ENTRY(__copy_to_user_std)
3379-WEAK(__copy_to_user)
3380+WEAK(___copy_to_user)
3381
3382 #include "copy_template.S"
3383
3384-ENDPROC(__copy_to_user)
3385+ENDPROC(___copy_to_user)
3386 ENDPROC(__copy_to_user_std)
3387
3388 .pushsection .fixup,"ax"
3389diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3390index 7d08b43..f7ca7ea 100644
3391--- a/arch/arm/lib/csumpartialcopyuser.S
3392+++ b/arch/arm/lib/csumpartialcopyuser.S
3393@@ -57,8 +57,8 @@
3394 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3395 */
3396
3397-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3398-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3399+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3400+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3401
3402 #include "csumpartialcopygeneric.S"
3403
3404diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3405index 312d43e..21d2322 100644
3406--- a/arch/arm/lib/delay.c
3407+++ b/arch/arm/lib/delay.c
3408@@ -29,7 +29,7 @@
3409 /*
3410 * Default to the loop-based delay implementation.
3411 */
3412-struct arm_delay_ops arm_delay_ops = {
3413+struct arm_delay_ops arm_delay_ops __read_only = {
3414 .delay = __loop_delay,
3415 .const_udelay = __loop_const_udelay,
3416 .udelay = __loop_udelay,
3417diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3418index 3e58d71..029817c 100644
3419--- a/arch/arm/lib/uaccess_with_memcpy.c
3420+++ b/arch/arm/lib/uaccess_with_memcpy.c
3421@@ -136,7 +136,7 @@ out:
3422 }
3423
3424 unsigned long
3425-__copy_to_user(void __user *to, const void *from, unsigned long n)
3426+___copy_to_user(void __user *to, const void *from, unsigned long n)
3427 {
3428 /*
3429 * This test is stubbed out of the main function above to keep
3430@@ -190,7 +190,7 @@ out:
3431 return n;
3432 }
3433
3434-unsigned long __clear_user(void __user *addr, unsigned long n)
3435+unsigned long ___clear_user(void __user *addr, unsigned long n)
3436 {
3437 /* See rational for this in __copy_to_user() above. */
3438 if (n < 64)
3439diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3440index 318d127..9aab0d1 100644
3441--- a/arch/arm/mach-exynos/suspend.c
3442+++ b/arch/arm/mach-exynos/suspend.c
3443@@ -18,6 +18,7 @@
3444 #include <linux/syscore_ops.h>
3445 #include <linux/cpu_pm.h>
3446 #include <linux/io.h>
3447+#include <linux/irq.h>
3448 #include <linux/irqchip/arm-gic.h>
3449 #include <linux/err.h>
3450 #include <linux/regulator/machine.h>
3451@@ -632,8 +633,10 @@ void __init exynos_pm_init(void)
3452 tmp |= pm_data->wake_disable_mask;
3453 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3454
3455- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3456- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3457+ pax_open_kernel();
3458+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3459+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3460+ pax_close_kernel();
3461
3462 register_syscore_ops(&exynos_pm_syscore_ops);
3463 suspend_set_ops(&exynos_suspend_ops);
3464diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3465index 0662087..004d163 100644
3466--- a/arch/arm/mach-keystone/keystone.c
3467+++ b/arch/arm/mach-keystone/keystone.c
3468@@ -27,7 +27,7 @@
3469
3470 #include "keystone.h"
3471
3472-static struct notifier_block platform_nb;
3473+static notifier_block_no_const platform_nb;
3474 static unsigned long keystone_dma_pfn_offset __read_mostly;
3475
3476 static int keystone_platform_notifier(struct notifier_block *nb,
3477diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3478index e46e9ea..9141c83 100644
3479--- a/arch/arm/mach-mvebu/coherency.c
3480+++ b/arch/arm/mach-mvebu/coherency.c
3481@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3482
3483 /*
3484 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3485- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3486+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3487 * is needed as a workaround for a deadlock issue between the PCIe
3488 * interface and the cache controller.
3489 */
3490@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3491 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3492
3493 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3494- mtype = MT_UNCACHED;
3495+ mtype = MT_UNCACHED_RW;
3496
3497 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3498 }
3499diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3500index b6443a4..20a0b74 100644
3501--- a/arch/arm/mach-omap2/board-n8x0.c
3502+++ b/arch/arm/mach-omap2/board-n8x0.c
3503@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3504 }
3505 #endif
3506
3507-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3508+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3509 .late_init = n8x0_menelaus_late_init,
3510 };
3511
3512diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3513index 79f49d9..70bf184 100644
3514--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3515+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3516@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3517 void (*resume)(void);
3518 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3519 void (*hotplug_restart)(void);
3520-};
3521+} __no_const;
3522
3523 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3524 static struct powerdomain *mpuss_pd;
3525@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3526 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3527 {}
3528
3529-struct cpu_pm_ops omap_pm_ops = {
3530+static struct cpu_pm_ops omap_pm_ops __read_only = {
3531 .finish_suspend = default_finish_suspend,
3532 .resume = dummy_cpu_resume,
3533 .scu_prepare = dummy_scu_prepare,
3534diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3535index 5305ec7..6d74045 100644
3536--- a/arch/arm/mach-omap2/omap-smp.c
3537+++ b/arch/arm/mach-omap2/omap-smp.c
3538@@ -19,6 +19,7 @@
3539 #include <linux/device.h>
3540 #include <linux/smp.h>
3541 #include <linux/io.h>
3542+#include <linux/irq.h>
3543 #include <linux/irqchip/arm-gic.h>
3544
3545 #include <asm/smp_scu.h>
3546diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3547index f961c46..4a453dc 100644
3548--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3549+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3550@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3551 return NOTIFY_OK;
3552 }
3553
3554-static struct notifier_block __refdata irq_hotplug_notifier = {
3555+static struct notifier_block irq_hotplug_notifier = {
3556 .notifier_call = irq_cpu_hotplug_notify,
3557 };
3558
3559diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3560index be9541e..821805f 100644
3561--- a/arch/arm/mach-omap2/omap_device.c
3562+++ b/arch/arm/mach-omap2/omap_device.c
3563@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3564 struct platform_device __init *omap_device_build(const char *pdev_name,
3565 int pdev_id,
3566 struct omap_hwmod *oh,
3567- void *pdata, int pdata_len)
3568+ const void *pdata, int pdata_len)
3569 {
3570 struct omap_hwmod *ohs[] = { oh };
3571
3572@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3573 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3574 int pdev_id,
3575 struct omap_hwmod **ohs,
3576- int oh_cnt, void *pdata,
3577+ int oh_cnt, const void *pdata,
3578 int pdata_len)
3579 {
3580 int ret = -ENOMEM;
3581diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3582index 78c02b3..c94109a 100644
3583--- a/arch/arm/mach-omap2/omap_device.h
3584+++ b/arch/arm/mach-omap2/omap_device.h
3585@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3586 /* Core code interface */
3587
3588 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3589- struct omap_hwmod *oh, void *pdata,
3590+ struct omap_hwmod *oh, const void *pdata,
3591 int pdata_len);
3592
3593 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3594 struct omap_hwmod **oh, int oh_cnt,
3595- void *pdata, int pdata_len);
3596+ const void *pdata, int pdata_len);
3597
3598 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3599 struct omap_hwmod **ohs, int oh_cnt);
3600diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3601index 355b089..2c9d7c3 100644
3602--- a/arch/arm/mach-omap2/omap_hwmod.c
3603+++ b/arch/arm/mach-omap2/omap_hwmod.c
3604@@ -193,10 +193,10 @@ struct omap_hwmod_soc_ops {
3605 int (*init_clkdm)(struct omap_hwmod *oh);
3606 void (*update_context_lost)(struct omap_hwmod *oh);
3607 int (*get_context_lost)(struct omap_hwmod *oh);
3608-};
3609+} __no_const;
3610
3611 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3612-static struct omap_hwmod_soc_ops soc_ops;
3613+static struct omap_hwmod_soc_ops soc_ops __read_only;
3614
3615 /* omap_hwmod_list contains all registered struct omap_hwmods */
3616 static LIST_HEAD(omap_hwmod_list);
3617diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3618index 95fee54..cfa9cf1 100644
3619--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3620+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3621@@ -10,6 +10,7 @@
3622
3623 #include <linux/kernel.h>
3624 #include <linux/init.h>
3625+#include <asm/pgtable.h>
3626
3627 #include "powerdomain.h"
3628
3629@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3630
3631 void __init am43xx_powerdomains_init(void)
3632 {
3633- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3634+ pax_open_kernel();
3635+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3636+ pax_close_kernel();
3637 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3638 pwrdm_register_pwrdms(powerdomains_am43xx);
3639 pwrdm_complete_init();
3640diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3641index ff0a68c..b312aa0 100644
3642--- a/arch/arm/mach-omap2/wd_timer.c
3643+++ b/arch/arm/mach-omap2/wd_timer.c
3644@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3645 struct omap_hwmod *oh;
3646 char *oh_name = "wd_timer2";
3647 char *dev_name = "omap_wdt";
3648- struct omap_wd_timer_platform_data pdata;
3649+ static struct omap_wd_timer_platform_data pdata = {
3650+ .read_reset_sources = prm_read_reset_sources
3651+ };
3652
3653 if (!cpu_class_is_omap2() || of_have_populated_dt())
3654 return 0;
3655@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3656 return -EINVAL;
3657 }
3658
3659- pdata.read_reset_sources = prm_read_reset_sources;
3660-
3661 pdev = omap_device_build(dev_name, id, oh, &pdata,
3662 sizeof(struct omap_wd_timer_platform_data));
3663 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3664diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3665index 4f25a7c..a81be85 100644
3666--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3667+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3668@@ -179,7 +179,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3669 bool entered_lp2 = false;
3670
3671 if (tegra_pending_sgi())
3672- ACCESS_ONCE(abort_flag) = true;
3673+ ACCESS_ONCE_RW(abort_flag) = true;
3674
3675 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3676
3677diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3678index ab95f53..4b977a7 100644
3679--- a/arch/arm/mach-tegra/irq.c
3680+++ b/arch/arm/mach-tegra/irq.c
3681@@ -20,6 +20,7 @@
3682 #include <linux/cpu_pm.h>
3683 #include <linux/interrupt.h>
3684 #include <linux/io.h>
3685+#include <linux/irq.h>
3686 #include <linux/irqchip/arm-gic.h>
3687 #include <linux/irq.h>
3688 #include <linux/kernel.h>
3689diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3690index 2cb587b..6ddfebf 100644
3691--- a/arch/arm/mach-ux500/pm.c
3692+++ b/arch/arm/mach-ux500/pm.c
3693@@ -10,6 +10,7 @@
3694 */
3695
3696 #include <linux/kernel.h>
3697+#include <linux/irq.h>
3698 #include <linux/irqchip/arm-gic.h>
3699 #include <linux/delay.h>
3700 #include <linux/io.h>
3701diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3702index 2dea8b5..6499da2 100644
3703--- a/arch/arm/mach-ux500/setup.h
3704+++ b/arch/arm/mach-ux500/setup.h
3705@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3706 .type = MT_DEVICE, \
3707 }
3708
3709-#define __MEM_DEV_DESC(x, sz) { \
3710- .virtual = IO_ADDRESS(x), \
3711- .pfn = __phys_to_pfn(x), \
3712- .length = sz, \
3713- .type = MT_MEMORY_RWX, \
3714-}
3715-
3716 extern struct smp_operations ux500_smp_ops;
3717 extern void ux500_cpu_die(unsigned int cpu);
3718
3719diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3720index 52d768f..5f93180 100644
3721--- a/arch/arm/mach-zynq/platsmp.c
3722+++ b/arch/arm/mach-zynq/platsmp.c
3723@@ -24,6 +24,7 @@
3724 #include <linux/io.h>
3725 #include <asm/cacheflush.h>
3726 #include <asm/smp_scu.h>
3727+#include <linux/irq.h>
3728 #include <linux/irqchip/arm-gic.h>
3729 #include "common.h"
3730
3731diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3732index 9b4f29e..bbf3bfa 100644
3733--- a/arch/arm/mm/Kconfig
3734+++ b/arch/arm/mm/Kconfig
3735@@ -446,6 +446,7 @@ config CPU_32v5
3736
3737 config CPU_32v6
3738 bool
3739+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3740 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3741
3742 config CPU_32v6K
3743@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3744
3745 config CPU_USE_DOMAINS
3746 bool
3747+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3748 help
3749 This option enables or disables the use of domain switching
3750 via the set_fs() function.
3751@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3752
3753 config KUSER_HELPERS
3754 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3755- depends on MMU
3756+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3757 default y
3758 help
3759 Warning: disabling this option may break user programs.
3760@@ -812,7 +814,7 @@ config KUSER_HELPERS
3761 See Documentation/arm/kernel_user_helpers.txt for details.
3762
3763 However, the fixed address nature of these helpers can be used
3764- by ROP (return orientated programming) authors when creating
3765+ by ROP (Return Oriented Programming) authors when creating
3766 exploits.
3767
3768 If all of the binaries and libraries which run on your platform
3769diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3770index 2c0c541..4585df9 100644
3771--- a/arch/arm/mm/alignment.c
3772+++ b/arch/arm/mm/alignment.c
3773@@ -216,10 +216,12 @@ union offset_union {
3774 #define __get16_unaligned_check(ins,val,addr) \
3775 do { \
3776 unsigned int err = 0, v, a = addr; \
3777+ pax_open_userland(); \
3778 __get8_unaligned_check(ins,v,a,err); \
3779 val = v << ((BE) ? 8 : 0); \
3780 __get8_unaligned_check(ins,v,a,err); \
3781 val |= v << ((BE) ? 0 : 8); \
3782+ pax_close_userland(); \
3783 if (err) \
3784 goto fault; \
3785 } while (0)
3786@@ -233,6 +235,7 @@ union offset_union {
3787 #define __get32_unaligned_check(ins,val,addr) \
3788 do { \
3789 unsigned int err = 0, v, a = addr; \
3790+ pax_open_userland(); \
3791 __get8_unaligned_check(ins,v,a,err); \
3792 val = v << ((BE) ? 24 : 0); \
3793 __get8_unaligned_check(ins,v,a,err); \
3794@@ -241,6 +244,7 @@ union offset_union {
3795 val |= v << ((BE) ? 8 : 16); \
3796 __get8_unaligned_check(ins,v,a,err); \
3797 val |= v << ((BE) ? 0 : 24); \
3798+ pax_close_userland(); \
3799 if (err) \
3800 goto fault; \
3801 } while (0)
3802@@ -254,6 +258,7 @@ union offset_union {
3803 #define __put16_unaligned_check(ins,val,addr) \
3804 do { \
3805 unsigned int err = 0, v = val, a = addr; \
3806+ pax_open_userland(); \
3807 __asm__( FIRST_BYTE_16 \
3808 ARM( "1: "ins" %1, [%2], #1\n" ) \
3809 THUMB( "1: "ins" %1, [%2]\n" ) \
3810@@ -273,6 +278,7 @@ union offset_union {
3811 " .popsection\n" \
3812 : "=r" (err), "=&r" (v), "=&r" (a) \
3813 : "0" (err), "1" (v), "2" (a)); \
3814+ pax_close_userland(); \
3815 if (err) \
3816 goto fault; \
3817 } while (0)
3818@@ -286,6 +292,7 @@ union offset_union {
3819 #define __put32_unaligned_check(ins,val,addr) \
3820 do { \
3821 unsigned int err = 0, v = val, a = addr; \
3822+ pax_open_userland(); \
3823 __asm__( FIRST_BYTE_32 \
3824 ARM( "1: "ins" %1, [%2], #1\n" ) \
3825 THUMB( "1: "ins" %1, [%2]\n" ) \
3826@@ -315,6 +322,7 @@ union offset_union {
3827 " .popsection\n" \
3828 : "=r" (err), "=&r" (v), "=&r" (a) \
3829 : "0" (err), "1" (v), "2" (a)); \
3830+ pax_close_userland(); \
3831 if (err) \
3832 goto fault; \
3833 } while (0)
3834diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3835index 8f15f70..d599a2b 100644
3836--- a/arch/arm/mm/cache-l2x0.c
3837+++ b/arch/arm/mm/cache-l2x0.c
3838@@ -43,7 +43,7 @@ struct l2c_init_data {
3839 void (*save)(void __iomem *);
3840 void (*configure)(void __iomem *);
3841 struct outer_cache_fns outer_cache;
3842-};
3843+} __do_const;
3844
3845 #define CACHE_LINE_SIZE 32
3846
3847diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3848index 845769e..4278fd7 100644
3849--- a/arch/arm/mm/context.c
3850+++ b/arch/arm/mm/context.c
3851@@ -43,7 +43,7 @@
3852 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3853
3854 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3855-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3856+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3857 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3858
3859 static DEFINE_PER_CPU(atomic64_t, active_asids);
3860@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3861 {
3862 static u32 cur_idx = 1;
3863 u64 asid = atomic64_read(&mm->context.id);
3864- u64 generation = atomic64_read(&asid_generation);
3865+ u64 generation = atomic64_read_unchecked(&asid_generation);
3866
3867 if (asid != 0) {
3868 /*
3869@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3870 */
3871 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3872 if (asid == NUM_USER_ASIDS) {
3873- generation = atomic64_add_return(ASID_FIRST_VERSION,
3874+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3875 &asid_generation);
3876 flush_context(cpu);
3877 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3878@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3879 cpu_set_reserved_ttbr0();
3880
3881 asid = atomic64_read(&mm->context.id);
3882- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3883+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3884 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3885 goto switch_mm_fastpath;
3886
3887 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3888 /* Check that our ASID belongs to the current generation. */
3889 asid = atomic64_read(&mm->context.id);
3890- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3891+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3892 asid = new_context(mm, cpu);
3893 atomic64_set(&mm->context.id, asid);
3894 }
3895diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3896index 6333d9c..fd09b46 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_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3915+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3916+ else
3917+ printk(KERN_ERR "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_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3929+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3930+ else
3931+ printk(KERN_ERR "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_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3995+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3996+ else
3997+ printk(KERN_ERR "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_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
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_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4082+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4083+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4084+ goto die;
4085+ }
4086+#endif
4087+
4088+#ifdef CONFIG_PAX_REFCOUNT
4089+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4090+#ifdef CONFIG_THUMB2_KERNEL
4091+ unsigned short bkpt;
4092+
4093+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4094+#else
4095+ unsigned int bkpt;
4096+
4097+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4098+#endif
4099+ current->thread.error_code = ifsr;
4100+ current->thread.trap_no = 0;
4101+ pax_report_refcount_overflow(regs);
4102+ fixup_exception(regs);
4103+ return;
4104+ }
4105+ }
4106+#endif
4107
4108 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4109 return;
4110
4111+die:
4112 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4113 inf->name, ifsr, addr);
4114
4115diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4116index cf08bdf..772656c 100644
4117--- a/arch/arm/mm/fault.h
4118+++ b/arch/arm/mm/fault.h
4119@@ -3,6 +3,7 @@
4120
4121 /*
4122 * Fault status register encodings. We steal bit 31 for our own purposes.
4123+ * Set when the FSR value is from an instruction fault.
4124 */
4125 #define FSR_LNX_PF (1 << 31)
4126 #define FSR_WRITE (1 << 11)
4127@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4128 }
4129 #endif
4130
4131+/* valid for LPAE and !LPAE */
4132+static inline int is_xn_fault(unsigned int fsr)
4133+{
4134+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4135+}
4136+
4137+static inline int is_domain_fault(unsigned int fsr)
4138+{
4139+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4140+}
4141+
4142 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4143 unsigned long search_exception_table(unsigned long addr);
4144
4145diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4146index 1609b02..def0785 100644
4147--- a/arch/arm/mm/init.c
4148+++ b/arch/arm/mm/init.c
4149@@ -755,7 +755,46 @@ void free_tcmmem(void)
4150 {
4151 #ifdef CONFIG_HAVE_TCM
4152 extern char __tcm_start, __tcm_end;
4153+#endif
4154
4155+#ifdef CONFIG_PAX_KERNEXEC
4156+ unsigned long addr;
4157+ pgd_t *pgd;
4158+ pud_t *pud;
4159+ pmd_t *pmd;
4160+ int cpu_arch = cpu_architecture();
4161+ unsigned int cr = get_cr();
4162+
4163+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4164+ /* make pages tables, etc before .text NX */
4165+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4166+ pgd = pgd_offset_k(addr);
4167+ pud = pud_offset(pgd, addr);
4168+ pmd = pmd_offset(pud, addr);
4169+ __section_update(pmd, addr, PMD_SECT_XN);
4170+ }
4171+ /* make init NX */
4172+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4173+ pgd = pgd_offset_k(addr);
4174+ pud = pud_offset(pgd, addr);
4175+ pmd = pmd_offset(pud, addr);
4176+ __section_update(pmd, addr, PMD_SECT_XN);
4177+ }
4178+ /* make kernel code/rodata RX */
4179+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4180+ pgd = pgd_offset_k(addr);
4181+ pud = pud_offset(pgd, addr);
4182+ pmd = pmd_offset(pud, addr);
4183+#ifdef CONFIG_ARM_LPAE
4184+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4185+#else
4186+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4187+#endif
4188+ }
4189+ }
4190+#endif
4191+
4192+#ifdef CONFIG_HAVE_TCM
4193 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4194 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4195 #endif
4196diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4197index d1e5ad7..84dcbf2 100644
4198--- a/arch/arm/mm/ioremap.c
4199+++ b/arch/arm/mm/ioremap.c
4200@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4201 unsigned int mtype;
4202
4203 if (cached)
4204- mtype = MT_MEMORY_RWX;
4205+ mtype = MT_MEMORY_RX;
4206 else
4207- mtype = MT_MEMORY_RWX_NONCACHED;
4208+ mtype = MT_MEMORY_RX_NONCACHED;
4209
4210 return __arm_ioremap_caller(phys_addr, size, mtype,
4211 __builtin_return_address(0));
4212diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4213index 5e85ed3..b10a7ed 100644
4214--- a/arch/arm/mm/mmap.c
4215+++ b/arch/arm/mm/mmap.c
4216@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4217 struct vm_area_struct *vma;
4218 int do_align = 0;
4219 int aliasing = cache_is_vipt_aliasing();
4220+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4221 struct vm_unmapped_area_info info;
4222
4223 /*
4224@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4225 if (len > TASK_SIZE)
4226 return -ENOMEM;
4227
4228+#ifdef CONFIG_PAX_RANDMMAP
4229+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4230+#endif
4231+
4232 if (addr) {
4233 if (do_align)
4234 addr = COLOUR_ALIGN(addr, pgoff);
4235@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4236 addr = PAGE_ALIGN(addr);
4237
4238 vma = find_vma(mm, addr);
4239- if (TASK_SIZE - len >= addr &&
4240- (!vma || addr + len <= vma->vm_start))
4241+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4242 return addr;
4243 }
4244
4245@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4246 info.high_limit = TASK_SIZE;
4247 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4248 info.align_offset = pgoff << PAGE_SHIFT;
4249+ info.threadstack_offset = offset;
4250 return vm_unmapped_area(&info);
4251 }
4252
4253@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4254 unsigned long addr = addr0;
4255 int do_align = 0;
4256 int aliasing = cache_is_vipt_aliasing();
4257+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4258 struct vm_unmapped_area_info info;
4259
4260 /*
4261@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4262 return addr;
4263 }
4264
4265+#ifdef CONFIG_PAX_RANDMMAP
4266+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4267+#endif
4268+
4269 /* requesting a specific address */
4270 if (addr) {
4271 if (do_align)
4272@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4273 else
4274 addr = PAGE_ALIGN(addr);
4275 vma = find_vma(mm, addr);
4276- if (TASK_SIZE - len >= addr &&
4277- (!vma || addr + len <= vma->vm_start))
4278+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4279 return addr;
4280 }
4281
4282@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4283 info.high_limit = mm->mmap_base;
4284 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4285 info.align_offset = pgoff << PAGE_SHIFT;
4286+ info.threadstack_offset = offset;
4287 addr = vm_unmapped_area(&info);
4288
4289 /*
4290@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4291 {
4292 unsigned long random_factor = 0UL;
4293
4294+#ifdef CONFIG_PAX_RANDMMAP
4295+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4296+#endif
4297+
4298 /* 8 bits of randomness in 20 address space bits */
4299 if ((current->flags & PF_RANDOMIZE) &&
4300 !(current->personality & ADDR_NO_RANDOMIZE))
4301@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4302
4303 if (mmap_is_legacy()) {
4304 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4305+
4306+#ifdef CONFIG_PAX_RANDMMAP
4307+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4308+ mm->mmap_base += mm->delta_mmap;
4309+#endif
4310+
4311 mm->get_unmapped_area = arch_get_unmapped_area;
4312 } else {
4313 mm->mmap_base = mmap_base(random_factor);
4314+
4315+#ifdef CONFIG_PAX_RANDMMAP
4316+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4317+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4318+#endif
4319+
4320 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4321 }
4322 }
4323diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4324index 7186382..0c145cf 100644
4325--- a/arch/arm/mm/mmu.c
4326+++ b/arch/arm/mm/mmu.c
4327@@ -41,6 +41,22 @@
4328 #include "mm.h"
4329 #include "tcm.h"
4330
4331+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4332+void modify_domain(unsigned int dom, unsigned int type)
4333+{
4334+ struct thread_info *thread = current_thread_info();
4335+ unsigned int domain = thread->cpu_domain;
4336+ /*
4337+ * DOMAIN_MANAGER might be defined to some other value,
4338+ * use the arch-defined constant
4339+ */
4340+ domain &= ~domain_val(dom, 3);
4341+ thread->cpu_domain = domain | domain_val(dom, type);
4342+ set_domain(thread->cpu_domain);
4343+}
4344+EXPORT_SYMBOL(modify_domain);
4345+#endif
4346+
4347 /*
4348 * empty_zero_page is a special page that is used for
4349 * zero-initialized data and COW.
4350@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4351 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4352 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4353
4354-static struct mem_type mem_types[] = {
4355+#ifdef CONFIG_PAX_KERNEXEC
4356+#define L_PTE_KERNEXEC L_PTE_RDONLY
4357+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4358+#else
4359+#define L_PTE_KERNEXEC L_PTE_DIRTY
4360+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4361+#endif
4362+
4363+static struct mem_type mem_types[] __read_only = {
4364 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4365 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4366 L_PTE_SHARED,
4367@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4368 .prot_sect = PROT_SECT_DEVICE,
4369 .domain = DOMAIN_IO,
4370 },
4371- [MT_UNCACHED] = {
4372+ [MT_UNCACHED_RW] = {
4373 .prot_pte = PROT_PTE_DEVICE,
4374 .prot_l1 = PMD_TYPE_TABLE,
4375 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4376 .domain = DOMAIN_IO,
4377 },
4378- [MT_CACHECLEAN] = {
4379- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4380+ [MT_CACHECLEAN_RO] = {
4381+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4382 .domain = DOMAIN_KERNEL,
4383 },
4384 #ifndef CONFIG_ARM_LPAE
4385- [MT_MINICLEAN] = {
4386- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4387+ [MT_MINICLEAN_RO] = {
4388+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4389 .domain = DOMAIN_KERNEL,
4390 },
4391 #endif
4392@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4393 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4394 L_PTE_RDONLY,
4395 .prot_l1 = PMD_TYPE_TABLE,
4396- .domain = DOMAIN_USER,
4397+ .domain = DOMAIN_VECTORS,
4398 },
4399 [MT_HIGH_VECTORS] = {
4400 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4401 L_PTE_USER | L_PTE_RDONLY,
4402 .prot_l1 = PMD_TYPE_TABLE,
4403- .domain = DOMAIN_USER,
4404+ .domain = DOMAIN_VECTORS,
4405 },
4406- [MT_MEMORY_RWX] = {
4407+ [__MT_MEMORY_RWX] = {
4408 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4409 .prot_l1 = PMD_TYPE_TABLE,
4410 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4411@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4412 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4413 .domain = DOMAIN_KERNEL,
4414 },
4415- [MT_ROM] = {
4416- .prot_sect = PMD_TYPE_SECT,
4417+ [MT_MEMORY_RX] = {
4418+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4419+ .prot_l1 = PMD_TYPE_TABLE,
4420+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4421+ .domain = DOMAIN_KERNEL,
4422+ },
4423+ [MT_ROM_RX] = {
4424+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427- [MT_MEMORY_RWX_NONCACHED] = {
4428+ [MT_MEMORY_RW_NONCACHED] = {
4429 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4430 L_PTE_MT_BUFFERABLE,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4433 .domain = DOMAIN_KERNEL,
4434 },
4435+ [MT_MEMORY_RX_NONCACHED] = {
4436+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4437+ L_PTE_MT_BUFFERABLE,
4438+ .prot_l1 = PMD_TYPE_TABLE,
4439+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4440+ .domain = DOMAIN_KERNEL,
4441+ },
4442 [MT_MEMORY_RW_DTCM] = {
4443 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4444 L_PTE_XN,
4445@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4446 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449- [MT_MEMORY_RWX_ITCM] = {
4450- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4451+ [MT_MEMORY_RX_ITCM] = {
4452+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4455 .domain = DOMAIN_KERNEL,
4456 },
4457 [MT_MEMORY_RW_SO] = {
4458@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4459 * Mark cache clean areas and XIP ROM read only
4460 * from SVC mode and no access from userspace.
4461 */
4462- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4463- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4464- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4465+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4466+#ifdef CONFIG_PAX_KERNEXEC
4467+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4468+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4469+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4470+#endif
4471+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4472+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4473 #endif
4474
4475 /*
4476@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4477 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4478 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4479 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4480- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4481- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4482+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4483+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4484 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4485 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4486+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4487+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4488 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4489- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4490- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4491+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4492+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4493+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4494+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4495 }
4496 }
4497
4498@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4499 if (cpu_arch >= CPU_ARCH_ARMv6) {
4500 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4501 /* Non-cacheable Normal is XCB = 001 */
4502- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4503+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4504+ PMD_SECT_BUFFERED;
4505+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4506 PMD_SECT_BUFFERED;
4507 } else {
4508 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4509- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4510+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4511+ PMD_SECT_TEX(1);
4512+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4513 PMD_SECT_TEX(1);
4514 }
4515 } else {
4516- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4517+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4518+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4519 }
4520
4521 #ifdef CONFIG_ARM_LPAE
4522@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4523 user_pgprot |= PTE_EXT_PXN;
4524 #endif
4525
4526+ user_pgprot |= __supported_pte_mask;
4527+
4528 for (i = 0; i < 16; i++) {
4529 pteval_t v = pgprot_val(protection_map[i]);
4530 protection_map[i] = __pgprot(v | user_pgprot);
4531@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4532
4533 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4534 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4535- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4536- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4537+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4538+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4539 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4540 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4541+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4542+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4543 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4544- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4545- mem_types[MT_ROM].prot_sect |= cp->pmd;
4546+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4547+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4548+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4549
4550 switch (cp->pmd) {
4551 case PMD_SECT_WT:
4552- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4553+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4554 break;
4555 case PMD_SECT_WB:
4556 case PMD_SECT_WBWA:
4557- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4558+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4559 break;
4560 }
4561 pr_info("Memory policy: %sData cache %s\n",
4562@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4563 return;
4564 }
4565
4566- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4567+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4568 md->virtual >= PAGE_OFFSET &&
4569 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4570 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4571@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4572 * called function. This means you can't use any function or debugging
4573 * method which may touch any device, otherwise the kernel _will_ crash.
4574 */
4575+
4576+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4577+
4578 static void __init devicemaps_init(const struct machine_desc *mdesc)
4579 {
4580 struct map_desc map;
4581 unsigned long addr;
4582- void *vectors;
4583
4584- /*
4585- * Allocate the vector page early.
4586- */
4587- vectors = early_alloc(PAGE_SIZE * 2);
4588-
4589- early_trap_init(vectors);
4590+ early_trap_init(&vectors);
4591
4592 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4593 pmd_clear(pmd_off_k(addr));
4594@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4595 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4596 map.virtual = MODULES_VADDR;
4597 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4598- map.type = MT_ROM;
4599+ map.type = MT_ROM_RX;
4600 create_mapping(&map);
4601 #endif
4602
4603@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4604 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4605 map.virtual = FLUSH_BASE;
4606 map.length = SZ_1M;
4607- map.type = MT_CACHECLEAN;
4608+ map.type = MT_CACHECLEAN_RO;
4609 create_mapping(&map);
4610 #endif
4611 #ifdef FLUSH_BASE_MINICACHE
4612 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4613 map.virtual = FLUSH_BASE_MINICACHE;
4614 map.length = SZ_1M;
4615- map.type = MT_MINICLEAN;
4616+ map.type = MT_MINICLEAN_RO;
4617 create_mapping(&map);
4618 #endif
4619
4620@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4621 * location (0xffff0000). If we aren't using high-vectors, also
4622 * create a mapping at the low-vectors virtual address.
4623 */
4624- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4625+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4626 map.virtual = 0xffff0000;
4627 map.length = PAGE_SIZE;
4628 #ifdef CONFIG_KUSER_HELPERS
4629@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4630 static void __init map_lowmem(void)
4631 {
4632 struct memblock_region *reg;
4633+#ifndef CONFIG_PAX_KERNEXEC
4634 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4635 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4636+#endif
4637
4638 /* Map all the lowmem memory banks. */
4639 for_each_memblock(memory, reg) {
4640@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4641 if (start >= end)
4642 break;
4643
4644+#ifdef CONFIG_PAX_KERNEXEC
4645+ map.pfn = __phys_to_pfn(start);
4646+ map.virtual = __phys_to_virt(start);
4647+ map.length = end - start;
4648+
4649+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4650+ struct map_desc kernel;
4651+ struct map_desc initmap;
4652+
4653+ /* when freeing initmem we will make this RW */
4654+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4655+ initmap.virtual = (unsigned long)__init_begin;
4656+ initmap.length = _sdata - __init_begin;
4657+ initmap.type = __MT_MEMORY_RWX;
4658+ create_mapping(&initmap);
4659+
4660+ /* when freeing initmem we will make this RX */
4661+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4662+ kernel.virtual = (unsigned long)_stext;
4663+ kernel.length = __init_begin - _stext;
4664+ kernel.type = __MT_MEMORY_RWX;
4665+ create_mapping(&kernel);
4666+
4667+ if (map.virtual < (unsigned long)_stext) {
4668+ map.length = (unsigned long)_stext - map.virtual;
4669+ map.type = __MT_MEMORY_RWX;
4670+ create_mapping(&map);
4671+ }
4672+
4673+ map.pfn = __phys_to_pfn(__pa(_sdata));
4674+ map.virtual = (unsigned long)_sdata;
4675+ map.length = end - __pa(_sdata);
4676+ }
4677+
4678+ map.type = MT_MEMORY_RW;
4679+ create_mapping(&map);
4680+#else
4681 if (end < kernel_x_start) {
4682 map.pfn = __phys_to_pfn(start);
4683 map.virtual = __phys_to_virt(start);
4684 map.length = end - start;
4685- map.type = MT_MEMORY_RWX;
4686+ map.type = __MT_MEMORY_RWX;
4687
4688 create_mapping(&map);
4689 } else if (start >= kernel_x_end) {
4690@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4691 map.pfn = __phys_to_pfn(kernel_x_start);
4692 map.virtual = __phys_to_virt(kernel_x_start);
4693 map.length = kernel_x_end - kernel_x_start;
4694- map.type = MT_MEMORY_RWX;
4695+ map.type = __MT_MEMORY_RWX;
4696
4697 create_mapping(&map);
4698
4699@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4700 create_mapping(&map);
4701 }
4702 }
4703+#endif
4704 }
4705 }
4706
4707diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4708index f412b53..fc89433 100644
4709--- a/arch/arm/net/bpf_jit_32.c
4710+++ b/arch/arm/net/bpf_jit_32.c
4711@@ -20,6 +20,7 @@
4712 #include <asm/cacheflush.h>
4713 #include <asm/hwcap.h>
4714 #include <asm/opcodes.h>
4715+#include <asm/pgtable.h>
4716
4717 #include "bpf_jit_32.h"
4718
4719@@ -71,7 +72,11 @@ struct jit_ctx {
4720 #endif
4721 };
4722
4723+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4724+int bpf_jit_enable __read_only;
4725+#else
4726 int bpf_jit_enable __read_mostly;
4727+#endif
4728
4729 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4730 {
4731@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4732 {
4733 u32 *ptr;
4734 /* We are guaranteed to have aligned memory. */
4735+ pax_open_kernel();
4736 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4737 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4738+ pax_close_kernel();
4739 }
4740
4741 static void build_prologue(struct jit_ctx *ctx)
4742diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4743index 5b217f4..c23f40e 100644
4744--- a/arch/arm/plat-iop/setup.c
4745+++ b/arch/arm/plat-iop/setup.c
4746@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4747 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4748 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4749 .length = IOP3XX_PERIPHERAL_SIZE,
4750- .type = MT_UNCACHED,
4751+ .type = MT_UNCACHED_RW,
4752 },
4753 };
4754
4755diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4756index a5bc92d..0bb4730 100644
4757--- a/arch/arm/plat-omap/sram.c
4758+++ b/arch/arm/plat-omap/sram.c
4759@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4760 * Looks like we need to preserve some bootloader code at the
4761 * beginning of SRAM for jumping to flash for reboot to work...
4762 */
4763+ pax_open_kernel();
4764 memset_io(omap_sram_base + omap_sram_skip, 0,
4765 omap_sram_size - omap_sram_skip);
4766+ pax_close_kernel();
4767 }
4768diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4769index 7047051..44e8675 100644
4770--- a/arch/arm64/include/asm/atomic.h
4771+++ b/arch/arm64/include/asm/atomic.h
4772@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4773 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4774 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4775
4776+#define atomic64_read_unchecked(v) atomic64_read(v)
4777+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4778+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4779+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4780+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4781+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4782+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4783+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4784+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4785+
4786 #endif
4787 #endif
4788diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4789index a5abb00..9cbca9a 100644
4790--- a/arch/arm64/include/asm/barrier.h
4791+++ b/arch/arm64/include/asm/barrier.h
4792@@ -44,7 +44,7 @@
4793 do { \
4794 compiletime_assert_atomic_type(*p); \
4795 barrier(); \
4796- ACCESS_ONCE(*p) = (v); \
4797+ ACCESS_ONCE_RW(*p) = (v); \
4798 } while (0)
4799
4800 #define smp_load_acquire(p) \
4801diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4802index 4fde8c1..441f84f 100644
4803--- a/arch/arm64/include/asm/percpu.h
4804+++ b/arch/arm64/include/asm/percpu.h
4805@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4806 {
4807 switch (size) {
4808 case 1:
4809- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4810+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4811 break;
4812 case 2:
4813- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4814+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4815 break;
4816 case 4:
4817- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4818+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4819 break;
4820 case 8:
4821- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4822+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4823 break;
4824 default:
4825 BUILD_BUG();
4826diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4827index e20df38..027ede3 100644
4828--- a/arch/arm64/include/asm/pgalloc.h
4829+++ b/arch/arm64/include/asm/pgalloc.h
4830@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4831 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4832 }
4833
4834+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4835+{
4836+ pud_populate(mm, pud, pmd);
4837+}
4838+
4839 #endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
4840
4841 #if CONFIG_ARM64_PGTABLE_LEVELS > 3
4842diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4843index 07e1ba44..ec8cbbb 100644
4844--- a/arch/arm64/include/asm/uaccess.h
4845+++ b/arch/arm64/include/asm/uaccess.h
4846@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4847 flag; \
4848 })
4849
4850+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4851 #define access_ok(type, addr, size) __range_ok(addr, size)
4852 #define user_addr_max get_fs
4853
4854diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4855index b0bd4e5..54e82f6 100644
4856--- a/arch/arm64/mm/dma-mapping.c
4857+++ b/arch/arm64/mm/dma-mapping.c
4858@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4859 phys_to_page(paddr),
4860 size >> PAGE_SHIFT);
4861 if (!freed)
4862- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4863+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4864 }
4865
4866 static void *__dma_alloc(struct device *dev, size_t size,
4867diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4868index c3a58a1..78fbf54 100644
4869--- a/arch/avr32/include/asm/cache.h
4870+++ b/arch/avr32/include/asm/cache.h
4871@@ -1,8 +1,10 @@
4872 #ifndef __ASM_AVR32_CACHE_H
4873 #define __ASM_AVR32_CACHE_H
4874
4875+#include <linux/const.h>
4876+
4877 #define L1_CACHE_SHIFT 5
4878-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4879+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4880
4881 /*
4882 * Memory returned by kmalloc() may be used for DMA, so we must make
4883diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4884index d232888..87c8df1 100644
4885--- a/arch/avr32/include/asm/elf.h
4886+++ b/arch/avr32/include/asm/elf.h
4887@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4888 the loader. We need to make sure that it is out of the way of the program
4889 that it will "exec", and that there is sufficient room for the brk. */
4890
4891-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4892+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4893
4894+#ifdef CONFIG_PAX_ASLR
4895+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4896+
4897+#define PAX_DELTA_MMAP_LEN 15
4898+#define PAX_DELTA_STACK_LEN 15
4899+#endif
4900
4901 /* This yields a mask that user programs can use to figure out what
4902 instruction set this CPU supports. This could be done in user space,
4903diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4904index 479330b..53717a8 100644
4905--- a/arch/avr32/include/asm/kmap_types.h
4906+++ b/arch/avr32/include/asm/kmap_types.h
4907@@ -2,9 +2,9 @@
4908 #define __ASM_AVR32_KMAP_TYPES_H
4909
4910 #ifdef CONFIG_DEBUG_HIGHMEM
4911-# define KM_TYPE_NR 29
4912+# define KM_TYPE_NR 30
4913 #else
4914-# define KM_TYPE_NR 14
4915+# define KM_TYPE_NR 15
4916 #endif
4917
4918 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4919diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4920index d223a8b..69c5210 100644
4921--- a/arch/avr32/mm/fault.c
4922+++ b/arch/avr32/mm/fault.c
4923@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4924
4925 int exception_trace = 1;
4926
4927+#ifdef CONFIG_PAX_PAGEEXEC
4928+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4929+{
4930+ unsigned long i;
4931+
4932+ printk(KERN_ERR "PAX: bytes at PC: ");
4933+ for (i = 0; i < 20; i++) {
4934+ unsigned char c;
4935+ if (get_user(c, (unsigned char *)pc+i))
4936+ printk(KERN_CONT "???????? ");
4937+ else
4938+ printk(KERN_CONT "%02x ", c);
4939+ }
4940+ printk("\n");
4941+}
4942+#endif
4943+
4944 /*
4945 * This routine handles page faults. It determines the address and the
4946 * problem, and then passes it off to one of the appropriate routines.
4947@@ -178,6 +195,16 @@ bad_area:
4948 up_read(&mm->mmap_sem);
4949
4950 if (user_mode(regs)) {
4951+
4952+#ifdef CONFIG_PAX_PAGEEXEC
4953+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4954+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4955+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4956+ do_group_exit(SIGKILL);
4957+ }
4958+ }
4959+#endif
4960+
4961 if (exception_trace && printk_ratelimit())
4962 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4963 "sp %08lx ecr %lu\n",
4964diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4965index 568885a..f8008df 100644
4966--- a/arch/blackfin/include/asm/cache.h
4967+++ b/arch/blackfin/include/asm/cache.h
4968@@ -7,6 +7,7 @@
4969 #ifndef __ARCH_BLACKFIN_CACHE_H
4970 #define __ARCH_BLACKFIN_CACHE_H
4971
4972+#include <linux/const.h>
4973 #include <linux/linkage.h> /* for asmlinkage */
4974
4975 /*
4976@@ -14,7 +15,7 @@
4977 * Blackfin loads 32 bytes for cache
4978 */
4979 #define L1_CACHE_SHIFT 5
4980-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4981+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4982 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4983
4984 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4985diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4986index aea2718..3639a60 100644
4987--- a/arch/cris/include/arch-v10/arch/cache.h
4988+++ b/arch/cris/include/arch-v10/arch/cache.h
4989@@ -1,8 +1,9 @@
4990 #ifndef _ASM_ARCH_CACHE_H
4991 #define _ASM_ARCH_CACHE_H
4992
4993+#include <linux/const.h>
4994 /* Etrax 100LX have 32-byte cache-lines. */
4995-#define L1_CACHE_BYTES 32
4996 #define L1_CACHE_SHIFT 5
4997+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4998
4999 #endif /* _ASM_ARCH_CACHE_H */
5000diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5001index 7caf25d..ee65ac5 100644
5002--- a/arch/cris/include/arch-v32/arch/cache.h
5003+++ b/arch/cris/include/arch-v32/arch/cache.h
5004@@ -1,11 +1,12 @@
5005 #ifndef _ASM_CRIS_ARCH_CACHE_H
5006 #define _ASM_CRIS_ARCH_CACHE_H
5007
5008+#include <linux/const.h>
5009 #include <arch/hwregs/dma.h>
5010
5011 /* A cache-line is 32 bytes. */
5012-#define L1_CACHE_BYTES 32
5013 #define L1_CACHE_SHIFT 5
5014+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5015
5016 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5017
5018diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5019index 102190a..5334cea 100644
5020--- a/arch/frv/include/asm/atomic.h
5021+++ b/arch/frv/include/asm/atomic.h
5022@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5023 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5024 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5025
5026+#define atomic64_read_unchecked(v) atomic64_read(v)
5027+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5028+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5029+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5030+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5031+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5032+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5033+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5034+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5035+
5036 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5037 {
5038 int c, old;
5039diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5040index 2797163..c2a401df9 100644
5041--- a/arch/frv/include/asm/cache.h
5042+++ b/arch/frv/include/asm/cache.h
5043@@ -12,10 +12,11 @@
5044 #ifndef __ASM_CACHE_H
5045 #define __ASM_CACHE_H
5046
5047+#include <linux/const.h>
5048
5049 /* bytes per L1 cache line */
5050 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5051-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5052+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5053
5054 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5055 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5056diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5057index 43901f2..0d8b865 100644
5058--- a/arch/frv/include/asm/kmap_types.h
5059+++ b/arch/frv/include/asm/kmap_types.h
5060@@ -2,6 +2,6 @@
5061 #ifndef _ASM_KMAP_TYPES_H
5062 #define _ASM_KMAP_TYPES_H
5063
5064-#define KM_TYPE_NR 17
5065+#define KM_TYPE_NR 18
5066
5067 #endif
5068diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5069index 836f147..4cf23f5 100644
5070--- a/arch/frv/mm/elf-fdpic.c
5071+++ b/arch/frv/mm/elf-fdpic.c
5072@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5073 {
5074 struct vm_area_struct *vma;
5075 struct vm_unmapped_area_info info;
5076+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5077
5078 if (len > TASK_SIZE)
5079 return -ENOMEM;
5080@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5081 if (addr) {
5082 addr = PAGE_ALIGN(addr);
5083 vma = find_vma(current->mm, addr);
5084- if (TASK_SIZE - len >= addr &&
5085- (!vma || addr + len <= vma->vm_start))
5086+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5087 goto success;
5088 }
5089
5090@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5091 info.high_limit = (current->mm->start_stack - 0x00200000);
5092 info.align_mask = 0;
5093 info.align_offset = 0;
5094+ info.threadstack_offset = offset;
5095 addr = vm_unmapped_area(&info);
5096 if (!(addr & ~PAGE_MASK))
5097 goto success;
5098diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5099index 69952c18..4fa2908 100644
5100--- a/arch/hexagon/include/asm/cache.h
5101+++ b/arch/hexagon/include/asm/cache.h
5102@@ -21,9 +21,11 @@
5103 #ifndef __ASM_CACHE_H
5104 #define __ASM_CACHE_H
5105
5106+#include <linux/const.h>
5107+
5108 /* Bytes per L1 cache line */
5109-#define L1_CACHE_SHIFT (5)
5110-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5111+#define L1_CACHE_SHIFT 5
5112+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5113
5114 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5115
5116diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5117index 074e52b..76afdac 100644
5118--- a/arch/ia64/Kconfig
5119+++ b/arch/ia64/Kconfig
5120@@ -548,6 +548,7 @@ source "drivers/sn/Kconfig"
5121 config KEXEC
5122 bool "kexec system call"
5123 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5124+ depends on !GRKERNSEC_KMEM
5125 help
5126 kexec is a system call that implements the ability to shutdown your
5127 current kernel, and to start another kernel. It is like a reboot
5128diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5129index 970d0bd..e750b9b 100644
5130--- a/arch/ia64/Makefile
5131+++ b/arch/ia64/Makefile
5132@@ -98,5 +98,6 @@ endef
5133 archprepare: make_nr_irqs_h FORCE
5134 PHONY += make_nr_irqs_h FORCE
5135
5136+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5137 make_nr_irqs_h: FORCE
5138 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5139diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5140index 0bf0350..2ad1957 100644
5141--- a/arch/ia64/include/asm/atomic.h
5142+++ b/arch/ia64/include/asm/atomic.h
5143@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5144 #define atomic64_inc(v) atomic64_add(1, (v))
5145 #define atomic64_dec(v) atomic64_sub(1, (v))
5146
5147+#define atomic64_read_unchecked(v) atomic64_read(v)
5148+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5149+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5150+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5151+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5152+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5153+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5154+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5155+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5156+
5157 #endif /* _ASM_IA64_ATOMIC_H */
5158diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5159index f6769eb..1cdb590 100644
5160--- a/arch/ia64/include/asm/barrier.h
5161+++ b/arch/ia64/include/asm/barrier.h
5162@@ -66,7 +66,7 @@
5163 do { \
5164 compiletime_assert_atomic_type(*p); \
5165 barrier(); \
5166- ACCESS_ONCE(*p) = (v); \
5167+ ACCESS_ONCE_RW(*p) = (v); \
5168 } while (0)
5169
5170 #define smp_load_acquire(p) \
5171diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5172index 988254a..e1ee885 100644
5173--- a/arch/ia64/include/asm/cache.h
5174+++ b/arch/ia64/include/asm/cache.h
5175@@ -1,6 +1,7 @@
5176 #ifndef _ASM_IA64_CACHE_H
5177 #define _ASM_IA64_CACHE_H
5178
5179+#include <linux/const.h>
5180
5181 /*
5182 * Copyright (C) 1998-2000 Hewlett-Packard Co
5183@@ -9,7 +10,7 @@
5184
5185 /* Bytes per L1 (data) cache line. */
5186 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5187-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5188+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5189
5190 #ifdef CONFIG_SMP
5191 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5192diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5193index 5a83c5c..4d7f553 100644
5194--- a/arch/ia64/include/asm/elf.h
5195+++ b/arch/ia64/include/asm/elf.h
5196@@ -42,6 +42,13 @@
5197 */
5198 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5199
5200+#ifdef CONFIG_PAX_ASLR
5201+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5202+
5203+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5204+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5205+#endif
5206+
5207 #define PT_IA_64_UNWIND 0x70000001
5208
5209 /* IA-64 relocations: */
5210diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5211index 5767cdf..7462574 100644
5212--- a/arch/ia64/include/asm/pgalloc.h
5213+++ b/arch/ia64/include/asm/pgalloc.h
5214@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5215 pgd_val(*pgd_entry) = __pa(pud);
5216 }
5217
5218+static inline void
5219+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5220+{
5221+ pgd_populate(mm, pgd_entry, pud);
5222+}
5223+
5224 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5225 {
5226 return quicklist_alloc(0, GFP_KERNEL, NULL);
5227@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5228 pud_val(*pud_entry) = __pa(pmd);
5229 }
5230
5231+static inline void
5232+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5233+{
5234+ pud_populate(mm, pud_entry, pmd);
5235+}
5236+
5237 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5238 {
5239 return quicklist_alloc(0, GFP_KERNEL, NULL);
5240diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5241index 7b6f880..ac8e008 100644
5242--- a/arch/ia64/include/asm/pgtable.h
5243+++ b/arch/ia64/include/asm/pgtable.h
5244@@ -12,7 +12,7 @@
5245 * David Mosberger-Tang <davidm@hpl.hp.com>
5246 */
5247
5248-
5249+#include <linux/const.h>
5250 #include <asm/mman.h>
5251 #include <asm/page.h>
5252 #include <asm/processor.h>
5253@@ -139,6 +139,17 @@
5254 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5255 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5256 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5257+
5258+#ifdef CONFIG_PAX_PAGEEXEC
5259+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5260+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5261+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5262+#else
5263+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5264+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5265+# define PAGE_COPY_NOEXEC PAGE_COPY
5266+#endif
5267+
5268 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5269 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5270 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5271diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5272index 45698cd..e8e2dbc 100644
5273--- a/arch/ia64/include/asm/spinlock.h
5274+++ b/arch/ia64/include/asm/spinlock.h
5275@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5276 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5277
5278 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5279- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5280+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5281 }
5282
5283 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5284diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5285index 4f3fb6cc..254055e 100644
5286--- a/arch/ia64/include/asm/uaccess.h
5287+++ b/arch/ia64/include/asm/uaccess.h
5288@@ -70,6 +70,7 @@
5289 && ((segment).seg == KERNEL_DS.seg \
5290 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5291 })
5292+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5293 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5294
5295 /*
5296@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5297 static inline unsigned long
5298 __copy_to_user (void __user *to, const void *from, unsigned long count)
5299 {
5300+ if (count > INT_MAX)
5301+ return count;
5302+
5303+ if (!__builtin_constant_p(count))
5304+ check_object_size(from, count, true);
5305+
5306 return __copy_user(to, (__force void __user *) from, count);
5307 }
5308
5309 static inline unsigned long
5310 __copy_from_user (void *to, const void __user *from, unsigned long count)
5311 {
5312+ if (count > INT_MAX)
5313+ return count;
5314+
5315+ if (!__builtin_constant_p(count))
5316+ check_object_size(to, count, false);
5317+
5318 return __copy_user((__force void __user *) to, from, count);
5319 }
5320
5321@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5322 ({ \
5323 void __user *__cu_to = (to); \
5324 const void *__cu_from = (from); \
5325- long __cu_len = (n); \
5326+ unsigned long __cu_len = (n); \
5327 \
5328- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5329+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5330+ if (!__builtin_constant_p(n)) \
5331+ check_object_size(__cu_from, __cu_len, true); \
5332 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5333+ } \
5334 __cu_len; \
5335 })
5336
5337@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5338 ({ \
5339 void *__cu_to = (to); \
5340 const void __user *__cu_from = (from); \
5341- long __cu_len = (n); \
5342+ unsigned long __cu_len = (n); \
5343 \
5344 __chk_user_ptr(__cu_from); \
5345- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5346+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5347+ if (!__builtin_constant_p(n)) \
5348+ check_object_size(__cu_to, __cu_len, false); \
5349 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5350+ } \
5351 __cu_len; \
5352 })
5353
5354diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5355index 29754aa..06d2838 100644
5356--- a/arch/ia64/kernel/module.c
5357+++ b/arch/ia64/kernel/module.c
5358@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5359 }
5360
5361 static inline int
5362+in_init_rx (const struct module *mod, uint64_t addr)
5363+{
5364+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5365+}
5366+
5367+static inline int
5368+in_init_rw (const struct module *mod, uint64_t addr)
5369+{
5370+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5371+}
5372+
5373+static inline int
5374 in_init (const struct module *mod, uint64_t addr)
5375 {
5376- return addr - (uint64_t) mod->module_init < mod->init_size;
5377+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5378+}
5379+
5380+static inline int
5381+in_core_rx (const struct module *mod, uint64_t addr)
5382+{
5383+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5384+}
5385+
5386+static inline int
5387+in_core_rw (const struct module *mod, uint64_t addr)
5388+{
5389+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5390 }
5391
5392 static inline int
5393 in_core (const struct module *mod, uint64_t addr)
5394 {
5395- return addr - (uint64_t) mod->module_core < mod->core_size;
5396+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5397 }
5398
5399 static inline int
5400@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5401 break;
5402
5403 case RV_BDREL:
5404- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5405+ if (in_init_rx(mod, val))
5406+ val -= (uint64_t) mod->module_init_rx;
5407+ else if (in_init_rw(mod, val))
5408+ val -= (uint64_t) mod->module_init_rw;
5409+ else if (in_core_rx(mod, val))
5410+ val -= (uint64_t) mod->module_core_rx;
5411+ else if (in_core_rw(mod, val))
5412+ val -= (uint64_t) mod->module_core_rw;
5413 break;
5414
5415 case RV_LTV:
5416@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5417 * addresses have been selected...
5418 */
5419 uint64_t gp;
5420- if (mod->core_size > MAX_LTOFF)
5421+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5422 /*
5423 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5424 * at the end of the module.
5425 */
5426- gp = mod->core_size - MAX_LTOFF / 2;
5427+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5428 else
5429- gp = mod->core_size / 2;
5430- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5431+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5432+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5433 mod->arch.gp = gp;
5434 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5435 }
5436diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5437index c39c3cd..3c77738 100644
5438--- a/arch/ia64/kernel/palinfo.c
5439+++ b/arch/ia64/kernel/palinfo.c
5440@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5441 return NOTIFY_OK;
5442 }
5443
5444-static struct notifier_block __refdata palinfo_cpu_notifier =
5445+static struct notifier_block palinfo_cpu_notifier =
5446 {
5447 .notifier_call = palinfo_cpu_callback,
5448 .priority = 0,
5449diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5450index 41e33f8..65180b2a 100644
5451--- a/arch/ia64/kernel/sys_ia64.c
5452+++ b/arch/ia64/kernel/sys_ia64.c
5453@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5454 unsigned long align_mask = 0;
5455 struct mm_struct *mm = current->mm;
5456 struct vm_unmapped_area_info info;
5457+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5458
5459 if (len > RGN_MAP_LIMIT)
5460 return -ENOMEM;
5461@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5462 if (REGION_NUMBER(addr) == RGN_HPAGE)
5463 addr = 0;
5464 #endif
5465+
5466+#ifdef CONFIG_PAX_RANDMMAP
5467+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5468+ addr = mm->free_area_cache;
5469+ else
5470+#endif
5471+
5472 if (!addr)
5473 addr = TASK_UNMAPPED_BASE;
5474
5475@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5476 info.high_limit = TASK_SIZE;
5477 info.align_mask = align_mask;
5478 info.align_offset = 0;
5479+ info.threadstack_offset = offset;
5480 return vm_unmapped_area(&info);
5481 }
5482
5483diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5484index 84f8a52..7c76178 100644
5485--- a/arch/ia64/kernel/vmlinux.lds.S
5486+++ b/arch/ia64/kernel/vmlinux.lds.S
5487@@ -192,7 +192,7 @@ SECTIONS {
5488 /* Per-cpu data: */
5489 . = ALIGN(PERCPU_PAGE_SIZE);
5490 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5491- __phys_per_cpu_start = __per_cpu_load;
5492+ __phys_per_cpu_start = per_cpu_load;
5493 /*
5494 * ensure percpu data fits
5495 * into percpu page size
5496diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5497index ba5ba7a..36e9d3a 100644
5498--- a/arch/ia64/mm/fault.c
5499+++ b/arch/ia64/mm/fault.c
5500@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5501 return pte_present(pte);
5502 }
5503
5504+#ifdef CONFIG_PAX_PAGEEXEC
5505+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5506+{
5507+ unsigned long i;
5508+
5509+ printk(KERN_ERR "PAX: bytes at PC: ");
5510+ for (i = 0; i < 8; i++) {
5511+ unsigned int c;
5512+ if (get_user(c, (unsigned int *)pc+i))
5513+ printk(KERN_CONT "???????? ");
5514+ else
5515+ printk(KERN_CONT "%08x ", c);
5516+ }
5517+ printk("\n");
5518+}
5519+#endif
5520+
5521 # define VM_READ_BIT 0
5522 # define VM_WRITE_BIT 1
5523 # define VM_EXEC_BIT 2
5524@@ -151,8 +168,21 @@ retry:
5525 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5526 goto bad_area;
5527
5528- if ((vma->vm_flags & mask) != mask)
5529+ if ((vma->vm_flags & mask) != mask) {
5530+
5531+#ifdef CONFIG_PAX_PAGEEXEC
5532+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5533+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5534+ goto bad_area;
5535+
5536+ up_read(&mm->mmap_sem);
5537+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5538+ do_group_exit(SIGKILL);
5539+ }
5540+#endif
5541+
5542 goto bad_area;
5543+ }
5544
5545 /*
5546 * If for any reason at all we couldn't handle the fault, make
5547diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5548index 52b7604b..455cb85 100644
5549--- a/arch/ia64/mm/hugetlbpage.c
5550+++ b/arch/ia64/mm/hugetlbpage.c
5551@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5552 unsigned long pgoff, unsigned long flags)
5553 {
5554 struct vm_unmapped_area_info info;
5555+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5556
5557 if (len > RGN_MAP_LIMIT)
5558 return -ENOMEM;
5559@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5560 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5561 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5562 info.align_offset = 0;
5563+ info.threadstack_offset = offset;
5564 return vm_unmapped_area(&info);
5565 }
5566
5567diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5568index 6b33457..88b5124 100644
5569--- a/arch/ia64/mm/init.c
5570+++ b/arch/ia64/mm/init.c
5571@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5572 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5573 vma->vm_end = vma->vm_start + PAGE_SIZE;
5574 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5575+
5576+#ifdef CONFIG_PAX_PAGEEXEC
5577+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5578+ vma->vm_flags &= ~VM_EXEC;
5579+
5580+#ifdef CONFIG_PAX_MPROTECT
5581+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5582+ vma->vm_flags &= ~VM_MAYEXEC;
5583+#endif
5584+
5585+ }
5586+#endif
5587+
5588 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5589 down_write(&current->mm->mmap_sem);
5590 if (insert_vm_struct(current->mm, vma)) {
5591@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5592 gate_vma.vm_start = FIXADDR_USER_START;
5593 gate_vma.vm_end = FIXADDR_USER_END;
5594 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5595- gate_vma.vm_page_prot = __P101;
5596+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5597
5598 return 0;
5599 }
5600diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5601index 40b3ee98..8c2c112 100644
5602--- a/arch/m32r/include/asm/cache.h
5603+++ b/arch/m32r/include/asm/cache.h
5604@@ -1,8 +1,10 @@
5605 #ifndef _ASM_M32R_CACHE_H
5606 #define _ASM_M32R_CACHE_H
5607
5608+#include <linux/const.h>
5609+
5610 /* L1 cache line size */
5611 #define L1_CACHE_SHIFT 4
5612-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5613+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5614
5615 #endif /* _ASM_M32R_CACHE_H */
5616diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5617index 82abd15..d95ae5d 100644
5618--- a/arch/m32r/lib/usercopy.c
5619+++ b/arch/m32r/lib/usercopy.c
5620@@ -14,6 +14,9 @@
5621 unsigned long
5622 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5623 {
5624+ if ((long)n < 0)
5625+ return n;
5626+
5627 prefetch(from);
5628 if (access_ok(VERIFY_WRITE, to, n))
5629 __copy_user(to,from,n);
5630@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5631 unsigned long
5632 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5633 {
5634+ if ((long)n < 0)
5635+ return n;
5636+
5637 prefetchw(to);
5638 if (access_ok(VERIFY_READ, from, n))
5639 __copy_user_zeroing(to,from,n);
5640diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5641index 0395c51..5f26031 100644
5642--- a/arch/m68k/include/asm/cache.h
5643+++ b/arch/m68k/include/asm/cache.h
5644@@ -4,9 +4,11 @@
5645 #ifndef __ARCH_M68K_CACHE_H
5646 #define __ARCH_M68K_CACHE_H
5647
5648+#include <linux/const.h>
5649+
5650 /* bytes per L1 cache line */
5651 #define L1_CACHE_SHIFT 4
5652-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5653+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5654
5655 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5656
5657diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5658index d703d8e..a8e2d70 100644
5659--- a/arch/metag/include/asm/barrier.h
5660+++ b/arch/metag/include/asm/barrier.h
5661@@ -90,7 +90,7 @@ static inline void fence(void)
5662 do { \
5663 compiletime_assert_atomic_type(*p); \
5664 smp_mb(); \
5665- ACCESS_ONCE(*p) = (v); \
5666+ ACCESS_ONCE_RW(*p) = (v); \
5667 } while (0)
5668
5669 #define smp_load_acquire(p) \
5670diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5671index 7ca80ac..794ba72 100644
5672--- a/arch/metag/mm/hugetlbpage.c
5673+++ b/arch/metag/mm/hugetlbpage.c
5674@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5675 info.high_limit = TASK_SIZE;
5676 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5677 info.align_offset = 0;
5678+ info.threadstack_offset = 0;
5679 return vm_unmapped_area(&info);
5680 }
5681
5682diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5683index 4efe96a..60e8699 100644
5684--- a/arch/microblaze/include/asm/cache.h
5685+++ b/arch/microblaze/include/asm/cache.h
5686@@ -13,11 +13,12 @@
5687 #ifndef _ASM_MICROBLAZE_CACHE_H
5688 #define _ASM_MICROBLAZE_CACHE_H
5689
5690+#include <linux/const.h>
5691 #include <asm/registers.h>
5692
5693 #define L1_CACHE_SHIFT 5
5694 /* word-granular cache in microblaze */
5695-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5696+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5697
5698 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5699
5700diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5701index 1a313c4..f27b613 100644
5702--- a/arch/mips/Kconfig
5703+++ b/arch/mips/Kconfig
5704@@ -2504,6 +2504,7 @@ source "kernel/Kconfig.preempt"
5705
5706 config KEXEC
5707 bool "Kexec system call"
5708+ depends on !GRKERNSEC_KMEM
5709 help
5710 kexec is a system call that implements the ability to shutdown your
5711 current kernel, and to start another kernel. It is like a reboot
5712diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5713index d8960d4..77dbd31 100644
5714--- a/arch/mips/cavium-octeon/dma-octeon.c
5715+++ b/arch/mips/cavium-octeon/dma-octeon.c
5716@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5717 if (dma_release_from_coherent(dev, order, vaddr))
5718 return;
5719
5720- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5721+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5722 }
5723
5724 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5725diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5726index 26d4363..3c9a82e 100644
5727--- a/arch/mips/include/asm/atomic.h
5728+++ b/arch/mips/include/asm/atomic.h
5729@@ -22,15 +22,39 @@
5730 #include <asm/cmpxchg.h>
5731 #include <asm/war.h>
5732
5733+#ifdef CONFIG_GENERIC_ATOMIC64
5734+#include <asm-generic/atomic64.h>
5735+#endif
5736+
5737 #define ATOMIC_INIT(i) { (i) }
5738
5739+#ifdef CONFIG_64BIT
5740+#define _ASM_EXTABLE(from, to) \
5741+" .section __ex_table,\"a\"\n" \
5742+" .dword " #from ", " #to"\n" \
5743+" .previous\n"
5744+#else
5745+#define _ASM_EXTABLE(from, to) \
5746+" .section __ex_table,\"a\"\n" \
5747+" .word " #from ", " #to"\n" \
5748+" .previous\n"
5749+#endif
5750+
5751 /*
5752 * atomic_read - read atomic variable
5753 * @v: pointer of type atomic_t
5754 *
5755 * Atomically reads the value of @v.
5756 */
5757-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5758+static inline int atomic_read(const atomic_t *v)
5759+{
5760+ return ACCESS_ONCE(v->counter);
5761+}
5762+
5763+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5764+{
5765+ return ACCESS_ONCE(v->counter);
5766+}
5767
5768 /*
5769 * atomic_set - set atomic variable
5770@@ -39,47 +63,77 @@
5771 *
5772 * Atomically sets the value of @v to @i.
5773 */
5774-#define atomic_set(v, i) ((v)->counter = (i))
5775+static inline void atomic_set(atomic_t *v, int i)
5776+{
5777+ v->counter = i;
5778+}
5779
5780-#define ATOMIC_OP(op, c_op, asm_op) \
5781-static __inline__ void atomic_##op(int i, atomic_t * v) \
5782+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5783+{
5784+ v->counter = i;
5785+}
5786+
5787+#ifdef CONFIG_PAX_REFCOUNT
5788+#define __OVERFLOW_POST \
5789+ " b 4f \n" \
5790+ " .set noreorder \n" \
5791+ "3: b 5f \n" \
5792+ " move %0, %1 \n" \
5793+ " .set reorder \n"
5794+#define __OVERFLOW_EXTABLE \
5795+ "3:\n" \
5796+ _ASM_EXTABLE(2b, 3b)
5797+#else
5798+#define __OVERFLOW_POST
5799+#define __OVERFLOW_EXTABLE
5800+#endif
5801+
5802+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5803+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5804 { \
5805 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5806 int temp; \
5807 \
5808 __asm__ __volatile__( \
5809- " .set arch=r4000 \n" \
5810- "1: ll %0, %1 # atomic_" #op " \n" \
5811- " " #asm_op " %0, %2 \n" \
5812+ " .set mips3 \n" \
5813+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5814+ "2: " #asm_op " %0, %2 \n" \
5815 " sc %0, %1 \n" \
5816 " beqzl %0, 1b \n" \
5817+ extable \
5818 " .set mips0 \n" \
5819 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5820 : "Ir" (i)); \
5821 } else if (kernel_uses_llsc) { \
5822 int temp; \
5823 \
5824- do { \
5825- __asm__ __volatile__( \
5826- " .set "MIPS_ISA_LEVEL" \n" \
5827- " ll %0, %1 # atomic_" #op "\n" \
5828- " " #asm_op " %0, %2 \n" \
5829- " sc %0, %1 \n" \
5830- " .set mips0 \n" \
5831- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5832- : "Ir" (i)); \
5833- } while (unlikely(!temp)); \
5834+ __asm__ __volatile__( \
5835+ " .set "MIPS_ISA_LEVEL" \n" \
5836+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5837+ "2: " #asm_op " %0, %2 \n" \
5838+ " sc %0, %1 \n" \
5839+ " beqz %0, 1b \n" \
5840+ extable \
5841+ " .set mips0 \n" \
5842+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5843+ : "Ir" (i)); \
5844 } else { \
5845 unsigned long flags; \
5846 \
5847 raw_local_irq_save(flags); \
5848- v->counter c_op i; \
5849+ __asm__ __volatile__( \
5850+ "2: " #asm_op " %0, %1 \n" \
5851+ extable \
5852+ : "+r" (v->counter) : "Ir" (i)); \
5853 raw_local_irq_restore(flags); \
5854 } \
5855 }
5856
5857-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5858-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5859+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5860+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5861+
5862+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5863+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5864 { \
5865 int result; \
5866 \
5867@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5868 int temp; \
5869 \
5870 __asm__ __volatile__( \
5871- " .set arch=r4000 \n" \
5872- "1: ll %1, %2 # atomic_" #op "_return \n" \
5873- " " #asm_op " %0, %1, %3 \n" \
5874+ " .set mips3 \n" \
5875+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5876+ "2: " #asm_op " %0, %1, %3 \n" \
5877 " sc %0, %2 \n" \
5878 " beqzl %0, 1b \n" \
5879- " " #asm_op " %0, %1, %3 \n" \
5880+ post_op \
5881+ extable \
5882+ "4: " #asm_op " %0, %1, %3 \n" \
5883+ "5: \n" \
5884 " .set mips0 \n" \
5885 : "=&r" (result), "=&r" (temp), \
5886 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5887@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5888 } else if (kernel_uses_llsc) { \
5889 int temp; \
5890 \
5891- do { \
5892- __asm__ __volatile__( \
5893- " .set "MIPS_ISA_LEVEL" \n" \
5894- " ll %1, %2 # atomic_" #op "_return \n" \
5895- " " #asm_op " %0, %1, %3 \n" \
5896- " sc %0, %2 \n" \
5897- " .set mips0 \n" \
5898- : "=&r" (result), "=&r" (temp), \
5899- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5900- : "Ir" (i)); \
5901- } while (unlikely(!result)); \
5902+ __asm__ __volatile__( \
5903+ " .set "MIPS_ISA_LEVEL" \n" \
5904+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5905+ "2: " #asm_op " %0, %1, %3 \n" \
5906+ " sc %0, %2 \n" \
5907+ post_op \
5908+ extable \
5909+ "4: " #asm_op " %0, %1, %3 \n" \
5910+ "5: \n" \
5911+ " .set mips0 \n" \
5912+ : "=&r" (result), "=&r" (temp), \
5913+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5914+ : "Ir" (i)); \
5915 \
5916 result = temp; result c_op i; \
5917 } else { \
5918 unsigned long flags; \
5919 \
5920 raw_local_irq_save(flags); \
5921- result = v->counter; \
5922- result c_op i; \
5923- v->counter = result; \
5924+ __asm__ __volatile__( \
5925+ " lw %0, %1 \n" \
5926+ "2: " #asm_op " %0, %1, %2 \n" \
5927+ " sw %0, %1 \n" \
5928+ "3: \n" \
5929+ extable \
5930+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5931+ : "Ir" (i)); \
5932 raw_local_irq_restore(flags); \
5933 } \
5934 \
5935@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5936 return result; \
5937 }
5938
5939-#define ATOMIC_OPS(op, c_op, asm_op) \
5940- ATOMIC_OP(op, c_op, asm_op) \
5941- ATOMIC_OP_RETURN(op, c_op, asm_op)
5942+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
5943+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5944
5945-ATOMIC_OPS(add, +=, addu)
5946-ATOMIC_OPS(sub, -=, subu)
5947+#define ATOMIC_OPS(op, asm_op) \
5948+ ATOMIC_OP(op, asm_op) \
5949+ ATOMIC_OP_RETURN(op, asm_op)
5950+
5951+ATOMIC_OPS(add, add)
5952+ATOMIC_OPS(sub, sub)
5953
5954 #undef ATOMIC_OPS
5955 #undef ATOMIC_OP_RETURN
5956+#undef __ATOMIC_OP_RETURN
5957 #undef ATOMIC_OP
5958+#undef __ATOMIC_OP
5959
5960 /*
5961 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5962@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
5963 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5964 * The function returns the old value of @v minus @i.
5965 */
5966-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5967+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5968 {
5969 int result;
5970
5971@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5972 int temp;
5973
5974 __asm__ __volatile__(
5975- " .set arch=r4000 \n"
5976+ " .set "MIPS_ISA_LEVEL" \n"
5977 "1: ll %1, %2 # atomic_sub_if_positive\n"
5978 " subu %0, %1, %3 \n"
5979 " bltz %0, 1f \n"
5980@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5981 return result;
5982 }
5983
5984-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5985-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5986+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5987+{
5988+ return cmpxchg(&v->counter, old, new);
5989+}
5990+
5991+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5992+ int new)
5993+{
5994+ return cmpxchg(&(v->counter), old, new);
5995+}
5996+
5997+static inline int atomic_xchg(atomic_t *v, int new)
5998+{
5999+ return xchg(&v->counter, new);
6000+}
6001+
6002+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6003+{
6004+ return xchg(&(v->counter), new);
6005+}
6006
6007 /**
6008 * __atomic_add_unless - add unless the number is a given value
6009@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6010
6011 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6012 #define atomic_inc_return(v) atomic_add_return(1, (v))
6013+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6014+{
6015+ return atomic_add_return_unchecked(1, v);
6016+}
6017
6018 /*
6019 * atomic_sub_and_test - subtract value from variable and test result
6020@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6021 * other cases.
6022 */
6023 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6024+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6025+{
6026+ return atomic_add_return_unchecked(1, v) == 0;
6027+}
6028
6029 /*
6030 * atomic_dec_and_test - decrement by 1 and test
6031@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6032 * Atomically increments @v by 1.
6033 */
6034 #define atomic_inc(v) atomic_add(1, (v))
6035+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6036+{
6037+ atomic_add_unchecked(1, v);
6038+}
6039
6040 /*
6041 * atomic_dec - decrement and test
6042@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6043 * Atomically decrements @v by 1.
6044 */
6045 #define atomic_dec(v) atomic_sub(1, (v))
6046+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6047+{
6048+ atomic_sub_unchecked(1, v);
6049+}
6050
6051 /*
6052 * atomic_add_negative - add and test if negative
6053@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6054 * @v: pointer of type atomic64_t
6055 *
6056 */
6057-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6058+static inline long atomic64_read(const atomic64_t *v)
6059+{
6060+ return ACCESS_ONCE(v->counter);
6061+}
6062+
6063+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6064+{
6065+ return ACCESS_ONCE(v->counter);
6066+}
6067
6068 /*
6069 * atomic64_set - set atomic variable
6070 * @v: pointer of type atomic64_t
6071 * @i: required value
6072 */
6073-#define atomic64_set(v, i) ((v)->counter = (i))
6074+static inline void atomic64_set(atomic64_t *v, long i)
6075+{
6076+ v->counter = i;
6077+}
6078
6079-#define ATOMIC64_OP(op, c_op, asm_op) \
6080-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6081+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6082+{
6083+ v->counter = i;
6084+}
6085+
6086+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6087+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6088 { \
6089 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6090 long temp; \
6091 \
6092 __asm__ __volatile__( \
6093- " .set arch=r4000 \n" \
6094- "1: lld %0, %1 # atomic64_" #op " \n" \
6095- " " #asm_op " %0, %2 \n" \
6096+ " .set "MIPS_ISA_LEVEL" \n" \
6097+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6098+ "2: " #asm_op " %0, %2 \n" \
6099 " scd %0, %1 \n" \
6100 " beqzl %0, 1b \n" \
6101+ extable \
6102 " .set mips0 \n" \
6103 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6104 : "Ir" (i)); \
6105 } else if (kernel_uses_llsc) { \
6106 long temp; \
6107 \
6108- do { \
6109- __asm__ __volatile__( \
6110- " .set "MIPS_ISA_LEVEL" \n" \
6111- " lld %0, %1 # atomic64_" #op "\n" \
6112- " " #asm_op " %0, %2 \n" \
6113- " scd %0, %1 \n" \
6114- " .set mips0 \n" \
6115- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6116- : "Ir" (i)); \
6117- } while (unlikely(!temp)); \
6118+ __asm__ __volatile__( \
6119+ " .set "MIPS_ISA_LEVEL" \n" \
6120+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6121+ "2: " #asm_op " %0, %2 \n" \
6122+ " scd %0, %1 \n" \
6123+ " beqz %0, 1b \n" \
6124+ extable \
6125+ " .set mips0 \n" \
6126+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6127+ : "Ir" (i)); \
6128 } else { \
6129 unsigned long flags; \
6130 \
6131 raw_local_irq_save(flags); \
6132- v->counter c_op i; \
6133+ __asm__ __volatile__( \
6134+ "2: " #asm_op " %0, %1 \n" \
6135+ extable \
6136+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6137 raw_local_irq_restore(flags); \
6138 } \
6139 }
6140
6141-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6142-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6143+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6144+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6145+
6146+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6147+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6148 { \
6149 long result; \
6150 \
6151@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6152 long temp; \
6153 \
6154 __asm__ __volatile__( \
6155- " .set arch=r4000 \n" \
6156+ " .set mips3 \n" \
6157 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6158- " " #asm_op " %0, %1, %3 \n" \
6159+ "2: " #asm_op " %0, %1, %3 \n" \
6160 " scd %0, %2 \n" \
6161 " beqzl %0, 1b \n" \
6162- " " #asm_op " %0, %1, %3 \n" \
6163+ post_op \
6164+ extable \
6165+ "4: " #asm_op " %0, %1, %3 \n" \
6166+ "5: \n" \
6167 " .set mips0 \n" \
6168 : "=&r" (result), "=&r" (temp), \
6169 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6170@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6171 } else if (kernel_uses_llsc) { \
6172 long temp; \
6173 \
6174- do { \
6175- __asm__ __volatile__( \
6176- " .set "MIPS_ISA_LEVEL" \n" \
6177- " lld %1, %2 # atomic64_" #op "_return\n" \
6178- " " #asm_op " %0, %1, %3 \n" \
6179- " scd %0, %2 \n" \
6180- " .set mips0 \n" \
6181- : "=&r" (result), "=&r" (temp), \
6182- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6183- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6184- : "memory"); \
6185- } while (unlikely(!result)); \
6186+ __asm__ __volatile__( \
6187+ " .set "MIPS_ISA_LEVEL" \n" \
6188+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6189+ "2: " #asm_op " %0, %1, %3 \n" \
6190+ " scd %0, %2 \n" \
6191+ " beqz %0, 1b \n" \
6192+ post_op \
6193+ extable \
6194+ "4: " #asm_op " %0, %1, %3 \n" \
6195+ "5: \n" \
6196+ " .set mips0 \n" \
6197+ : "=&r" (result), "=&r" (temp), \
6198+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6199+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6200+ : "memory"); \
6201 \
6202 result = temp; result c_op i; \
6203 } else { \
6204 unsigned long flags; \
6205 \
6206 raw_local_irq_save(flags); \
6207- result = v->counter; \
6208- result c_op i; \
6209- v->counter = result; \
6210+ __asm__ __volatile__( \
6211+ " ld %0, %1 \n" \
6212+ "2: " #asm_op " %0, %1, %2 \n" \
6213+ " sd %0, %1 \n" \
6214+ "3: \n" \
6215+ extable \
6216+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6217+ : "Ir" (i)); \
6218 raw_local_irq_restore(flags); \
6219 } \
6220 \
6221@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6222 return result; \
6223 }
6224
6225-#define ATOMIC64_OPS(op, c_op, asm_op) \
6226- ATOMIC64_OP(op, c_op, asm_op) \
6227- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6228+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6229+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6230
6231-ATOMIC64_OPS(add, +=, daddu)
6232-ATOMIC64_OPS(sub, -=, dsubu)
6233+#define ATOMIC64_OPS(op, asm_op) \
6234+ ATOMIC64_OP(op, asm_op) \
6235+ ATOMIC64_OP_RETURN(op, asm_op)
6236+
6237+ATOMIC64_OPS(add, dadd)
6238+ATOMIC64_OPS(sub, dsub)
6239
6240 #undef ATOMIC64_OPS
6241 #undef ATOMIC64_OP_RETURN
6242+#undef __ATOMIC64_OP_RETURN
6243 #undef ATOMIC64_OP
6244+#undef __ATOMIC64_OP
6245+#undef __OVERFLOW_EXTABLE
6246+#undef __OVERFLOW_POST
6247
6248 /*
6249 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6250@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6251 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6252 * The function returns the old value of @v minus @i.
6253 */
6254-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6255+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6256 {
6257 long result;
6258
6259@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6260 long temp;
6261
6262 __asm__ __volatile__(
6263- " .set arch=r4000 \n"
6264+ " .set "MIPS_ISA_LEVEL" \n"
6265 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6266 " dsubu %0, %1, %3 \n"
6267 " bltz %0, 1f \n"
6268@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6269 return result;
6270 }
6271
6272-#define atomic64_cmpxchg(v, o, n) \
6273- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6274-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6275+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6276+{
6277+ return cmpxchg(&v->counter, old, new);
6278+}
6279+
6280+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6281+ long new)
6282+{
6283+ return cmpxchg(&(v->counter), old, new);
6284+}
6285+
6286+static inline long atomic64_xchg(atomic64_t *v, long new)
6287+{
6288+ return xchg(&v->counter, new);
6289+}
6290+
6291+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6292+{
6293+ return xchg(&(v->counter), new);
6294+}
6295
6296 /**
6297 * atomic64_add_unless - add unless the number is a given value
6298@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6299
6300 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6301 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6302+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6303
6304 /*
6305 * atomic64_sub_and_test - subtract value from variable and test result
6306@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6307 * other cases.
6308 */
6309 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6310+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6311
6312 /*
6313 * atomic64_dec_and_test - decrement by 1 and test
6314@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6315 * Atomically increments @v by 1.
6316 */
6317 #define atomic64_inc(v) atomic64_add(1, (v))
6318+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6319
6320 /*
6321 * atomic64_dec - decrement and test
6322@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6323 * Atomically decrements @v by 1.
6324 */
6325 #define atomic64_dec(v) atomic64_sub(1, (v))
6326+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6327
6328 /*
6329 * atomic64_add_negative - add and test if negative
6330diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6331index 2b8bbbc..4556df6 100644
6332--- a/arch/mips/include/asm/barrier.h
6333+++ b/arch/mips/include/asm/barrier.h
6334@@ -133,7 +133,7 @@
6335 do { \
6336 compiletime_assert_atomic_type(*p); \
6337 smp_mb(); \
6338- ACCESS_ONCE(*p) = (v); \
6339+ ACCESS_ONCE_RW(*p) = (v); \
6340 } while (0)
6341
6342 #define smp_load_acquire(p) \
6343diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6344index b4db69f..8f3b093 100644
6345--- a/arch/mips/include/asm/cache.h
6346+++ b/arch/mips/include/asm/cache.h
6347@@ -9,10 +9,11 @@
6348 #ifndef _ASM_CACHE_H
6349 #define _ASM_CACHE_H
6350
6351+#include <linux/const.h>
6352 #include <kmalloc.h>
6353
6354 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6355-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6356+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6357
6358 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6359 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6360diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6361index 694925a..990fa62 100644
6362--- a/arch/mips/include/asm/elf.h
6363+++ b/arch/mips/include/asm/elf.h
6364@@ -410,15 +410,18 @@ extern const char *__elf_platform;
6365 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6366 #endif
6367
6368+#ifdef CONFIG_PAX_ASLR
6369+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6370+
6371+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6372+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6373+#endif
6374+
6375 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6376 struct linux_binprm;
6377 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6378 int uses_interp);
6379
6380-struct mm_struct;
6381-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6382-#define arch_randomize_brk arch_randomize_brk
6383-
6384 struct arch_elf_state {
6385 int fp_abi;
6386 int interp_fp_abi;
6387diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6388index c1f6afa..38cc6e9 100644
6389--- a/arch/mips/include/asm/exec.h
6390+++ b/arch/mips/include/asm/exec.h
6391@@ -12,6 +12,6 @@
6392 #ifndef _ASM_EXEC_H
6393 #define _ASM_EXEC_H
6394
6395-extern unsigned long arch_align_stack(unsigned long sp);
6396+#define arch_align_stack(x) ((x) & ~0xfUL)
6397
6398 #endif /* _ASM_EXEC_H */
6399diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6400index 9e8ef59..1139d6b 100644
6401--- a/arch/mips/include/asm/hw_irq.h
6402+++ b/arch/mips/include/asm/hw_irq.h
6403@@ -10,7 +10,7 @@
6404
6405 #include <linux/atomic.h>
6406
6407-extern atomic_t irq_err_count;
6408+extern atomic_unchecked_t irq_err_count;
6409
6410 /*
6411 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6412diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6413index 8feaed6..1bd8a64 100644
6414--- a/arch/mips/include/asm/local.h
6415+++ b/arch/mips/include/asm/local.h
6416@@ -13,15 +13,25 @@ typedef struct
6417 atomic_long_t a;
6418 } local_t;
6419
6420+typedef struct {
6421+ atomic_long_unchecked_t a;
6422+} local_unchecked_t;
6423+
6424 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6425
6426 #define local_read(l) atomic_long_read(&(l)->a)
6427+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6428 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6429+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6430
6431 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6432+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6433 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6434+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6435 #define local_inc(l) atomic_long_inc(&(l)->a)
6436+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6437 #define local_dec(l) atomic_long_dec(&(l)->a)
6438+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6439
6440 /*
6441 * Same as above, but return the result value
6442@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6443 return result;
6444 }
6445
6446+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6447+{
6448+ unsigned long result;
6449+
6450+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6451+ unsigned long temp;
6452+
6453+ __asm__ __volatile__(
6454+ " .set mips3 \n"
6455+ "1:" __LL "%1, %2 # local_add_return \n"
6456+ " addu %0, %1, %3 \n"
6457+ __SC "%0, %2 \n"
6458+ " beqzl %0, 1b \n"
6459+ " addu %0, %1, %3 \n"
6460+ " .set mips0 \n"
6461+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6462+ : "Ir" (i), "m" (l->a.counter)
6463+ : "memory");
6464+ } else if (kernel_uses_llsc) {
6465+ unsigned long temp;
6466+
6467+ __asm__ __volatile__(
6468+ " .set mips3 \n"
6469+ "1:" __LL "%1, %2 # local_add_return \n"
6470+ " addu %0, %1, %3 \n"
6471+ __SC "%0, %2 \n"
6472+ " beqz %0, 1b \n"
6473+ " addu %0, %1, %3 \n"
6474+ " .set mips0 \n"
6475+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6476+ : "Ir" (i), "m" (l->a.counter)
6477+ : "memory");
6478+ } else {
6479+ unsigned long flags;
6480+
6481+ local_irq_save(flags);
6482+ result = l->a.counter;
6483+ result += i;
6484+ l->a.counter = result;
6485+ local_irq_restore(flags);
6486+ }
6487+
6488+ return result;
6489+}
6490+
6491 static __inline__ long local_sub_return(long i, local_t * l)
6492 {
6493 unsigned long result;
6494@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6495
6496 #define local_cmpxchg(l, o, n) \
6497 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6498+#define local_cmpxchg_unchecked(l, o, n) \
6499+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6500 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6501
6502 /**
6503diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6504index 154b70a..426ae3d 100644
6505--- a/arch/mips/include/asm/page.h
6506+++ b/arch/mips/include/asm/page.h
6507@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6508 #ifdef CONFIG_CPU_MIPS32
6509 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6510 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6511- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6512+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6513 #else
6514 typedef struct { unsigned long long pte; } pte_t;
6515 #define pte_val(x) ((x).pte)
6516diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6517index b336037..5b874cc 100644
6518--- a/arch/mips/include/asm/pgalloc.h
6519+++ b/arch/mips/include/asm/pgalloc.h
6520@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6521 {
6522 set_pud(pud, __pud((unsigned long)pmd));
6523 }
6524+
6525+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6526+{
6527+ pud_populate(mm, pud, pmd);
6528+}
6529 #endif
6530
6531 /*
6532diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6533index f8f809f..b5f3fa4 100644
6534--- a/arch/mips/include/asm/pgtable.h
6535+++ b/arch/mips/include/asm/pgtable.h
6536@@ -20,6 +20,9 @@
6537 #include <asm/io.h>
6538 #include <asm/pgtable-bits.h>
6539
6540+#define ktla_ktva(addr) (addr)
6541+#define ktva_ktla(addr) (addr)
6542+
6543 struct mm_struct;
6544 struct vm_area_struct;
6545
6546diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6547index 55ed660..3dc9422 100644
6548--- a/arch/mips/include/asm/thread_info.h
6549+++ b/arch/mips/include/asm/thread_info.h
6550@@ -102,6 +102,9 @@ static inline struct thread_info *current_thread_info(void)
6551 #define TIF_SECCOMP 4 /* secure computing */
6552 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6553 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6554+/* li takes a 32bit immediate */
6555+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6556+
6557 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6558 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6559 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6560@@ -137,14 +140,16 @@ static inline struct thread_info *current_thread_info(void)
6561 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6562 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6563 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6564+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6565
6566 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6567 _TIF_SYSCALL_AUDIT | \
6568- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6569+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6570+ _TIF_GRSEC_SETXID)
6571
6572 /* work to do in syscall_trace_leave() */
6573 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6574- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6575+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6576
6577 /* work to do on interrupt/exception return */
6578 #define _TIF_WORK_MASK \
6579@@ -152,7 +157,7 @@ static inline struct thread_info *current_thread_info(void)
6580 /* work to do on any return to u-space */
6581 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6582 _TIF_WORK_SYSCALL_EXIT | \
6583- _TIF_SYSCALL_TRACEPOINT)
6584+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6585
6586 /*
6587 * We stash processor id into a COP0 register to retrieve it fast
6588diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6589index bf8b324..cec5705 100644
6590--- a/arch/mips/include/asm/uaccess.h
6591+++ b/arch/mips/include/asm/uaccess.h
6592@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6593 __ok == 0; \
6594 })
6595
6596+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6597 #define access_ok(type, addr, size) \
6598 likely(__access_ok((addr), (size), __access_mask))
6599
6600diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6601index 1188e00..41cf144 100644
6602--- a/arch/mips/kernel/binfmt_elfn32.c
6603+++ b/arch/mips/kernel/binfmt_elfn32.c
6604@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6605 #undef ELF_ET_DYN_BASE
6606 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6607
6608+#ifdef CONFIG_PAX_ASLR
6609+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6610+
6611+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6612+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6613+#endif
6614+
6615 #include <asm/processor.h>
6616 #include <linux/module.h>
6617 #include <linux/elfcore.h>
6618diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6619index 9287678..f870e47 100644
6620--- a/arch/mips/kernel/binfmt_elfo32.c
6621+++ b/arch/mips/kernel/binfmt_elfo32.c
6622@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6623 #undef ELF_ET_DYN_BASE
6624 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6625
6626+#ifdef CONFIG_PAX_ASLR
6627+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6628+
6629+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6630+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6631+#endif
6632+
6633 #include <asm/processor.h>
6634
6635 #include <linux/module.h>
6636diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6637index a74ec3a..4f06f18 100644
6638--- a/arch/mips/kernel/i8259.c
6639+++ b/arch/mips/kernel/i8259.c
6640@@ -202,7 +202,7 @@ spurious_8259A_irq:
6641 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6642 spurious_irq_mask |= irqmask;
6643 }
6644- atomic_inc(&irq_err_count);
6645+ atomic_inc_unchecked(&irq_err_count);
6646 /*
6647 * Theoretically we do not have to handle this IRQ,
6648 * but in Linux this does not cause problems and is
6649diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6650index 44a1f79..2bd6aa3 100644
6651--- a/arch/mips/kernel/irq-gt641xx.c
6652+++ b/arch/mips/kernel/irq-gt641xx.c
6653@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6654 }
6655 }
6656
6657- atomic_inc(&irq_err_count);
6658+ atomic_inc_unchecked(&irq_err_count);
6659 }
6660
6661 void __init gt641xx_irq_init(void)
6662diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6663index d2bfbc2..a8eacd2 100644
6664--- a/arch/mips/kernel/irq.c
6665+++ b/arch/mips/kernel/irq.c
6666@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6667 printk("unexpected IRQ # %d\n", irq);
6668 }
6669
6670-atomic_t irq_err_count;
6671+atomic_unchecked_t irq_err_count;
6672
6673 int arch_show_interrupts(struct seq_file *p, int prec)
6674 {
6675- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6676+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6677 return 0;
6678 }
6679
6680 asmlinkage void spurious_interrupt(void)
6681 {
6682- atomic_inc(&irq_err_count);
6683+ atomic_inc_unchecked(&irq_err_count);
6684 }
6685
6686 void __init init_IRQ(void)
6687@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6688 #endif
6689 }
6690
6691+
6692 #ifdef DEBUG_STACKOVERFLOW
6693+extern void gr_handle_kernel_exploit(void);
6694+
6695 static inline void check_stack_overflow(void)
6696 {
6697 unsigned long sp;
6698@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6699 printk("do_IRQ: stack overflow: %ld\n",
6700 sp - sizeof(struct thread_info));
6701 dump_stack();
6702+ gr_handle_kernel_exploit();
6703 }
6704 }
6705 #else
6706diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6707index 0614717..002fa43 100644
6708--- a/arch/mips/kernel/pm-cps.c
6709+++ b/arch/mips/kernel/pm-cps.c
6710@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6711 nc_core_ready_count = nc_addr;
6712
6713 /* Ensure ready_count is zero-initialised before the assembly runs */
6714- ACCESS_ONCE(*nc_core_ready_count) = 0;
6715+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6716 coupled_barrier(&per_cpu(pm_barrier, core), online);
6717
6718 /* Run the generated entry code */
6719diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6720index bf85cc1..b365c61 100644
6721--- a/arch/mips/kernel/process.c
6722+++ b/arch/mips/kernel/process.c
6723@@ -535,18 +535,6 @@ out:
6724 return pc;
6725 }
6726
6727-/*
6728- * Don't forget that the stack pointer must be aligned on a 8 bytes
6729- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6730- */
6731-unsigned long arch_align_stack(unsigned long sp)
6732-{
6733- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6734- sp -= get_random_int() & ~PAGE_MASK;
6735-
6736- return sp & ALMASK;
6737-}
6738-
6739 static void arch_dump_stack(void *info)
6740 {
6741 struct pt_regs *regs;
6742diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6743index 5104528..950bbdc 100644
6744--- a/arch/mips/kernel/ptrace.c
6745+++ b/arch/mips/kernel/ptrace.c
6746@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6747 return ret;
6748 }
6749
6750+#ifdef CONFIG_GRKERNSEC_SETXID
6751+extern void gr_delayed_cred_worker(void);
6752+#endif
6753+
6754 /*
6755 * Notification of system call entry/exit
6756 * - triggered by current->work.syscall_trace
6757@@ -779,6 +783,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6758 tracehook_report_syscall_entry(regs))
6759 ret = -1;
6760
6761+#ifdef CONFIG_GRKERNSEC_SETXID
6762+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6763+ gr_delayed_cred_worker();
6764+#endif
6765+
6766 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6767 trace_sys_enter(regs, regs->regs[2]);
6768
6769diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6770index 07fc524..b9d7f28 100644
6771--- a/arch/mips/kernel/reset.c
6772+++ b/arch/mips/kernel/reset.c
6773@@ -13,6 +13,7 @@
6774 #include <linux/reboot.h>
6775
6776 #include <asm/reboot.h>
6777+#include <asm/bug.h>
6778
6779 /*
6780 * Urgs ... Too many MIPS machines to handle this in a generic way.
6781@@ -29,16 +30,19 @@ void machine_restart(char *command)
6782 {
6783 if (_machine_restart)
6784 _machine_restart(command);
6785+ BUG();
6786 }
6787
6788 void machine_halt(void)
6789 {
6790 if (_machine_halt)
6791 _machine_halt();
6792+ BUG();
6793 }
6794
6795 void machine_power_off(void)
6796 {
6797 if (pm_power_off)
6798 pm_power_off();
6799+ BUG();
6800 }
6801diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6802index 2242bdd..b284048 100644
6803--- a/arch/mips/kernel/sync-r4k.c
6804+++ b/arch/mips/kernel/sync-r4k.c
6805@@ -18,8 +18,8 @@
6806 #include <asm/mipsregs.h>
6807
6808 static atomic_t count_start_flag = ATOMIC_INIT(0);
6809-static atomic_t count_count_start = ATOMIC_INIT(0);
6810-static atomic_t count_count_stop = ATOMIC_INIT(0);
6811+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6812+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6813 static atomic_t count_reference = ATOMIC_INIT(0);
6814
6815 #define COUNTON 100
6816@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6817
6818 for (i = 0; i < NR_LOOPS; i++) {
6819 /* slaves loop on '!= 2' */
6820- while (atomic_read(&count_count_start) != 1)
6821+ while (atomic_read_unchecked(&count_count_start) != 1)
6822 mb();
6823- atomic_set(&count_count_stop, 0);
6824+ atomic_set_unchecked(&count_count_stop, 0);
6825 smp_wmb();
6826
6827 /* this lets the slaves write their count register */
6828- atomic_inc(&count_count_start);
6829+ atomic_inc_unchecked(&count_count_start);
6830
6831 /*
6832 * Everyone initialises count in the last loop:
6833@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6834 /*
6835 * Wait for all slaves to leave the synchronization point:
6836 */
6837- while (atomic_read(&count_count_stop) != 1)
6838+ while (atomic_read_unchecked(&count_count_stop) != 1)
6839 mb();
6840- atomic_set(&count_count_start, 0);
6841+ atomic_set_unchecked(&count_count_start, 0);
6842 smp_wmb();
6843- atomic_inc(&count_count_stop);
6844+ atomic_inc_unchecked(&count_count_stop);
6845 }
6846 /* Arrange for an interrupt in a short while */
6847 write_c0_compare(read_c0_count() + COUNTON);
6848@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6849 initcount = atomic_read(&count_reference);
6850
6851 for (i = 0; i < NR_LOOPS; i++) {
6852- atomic_inc(&count_count_start);
6853- while (atomic_read(&count_count_start) != 2)
6854+ atomic_inc_unchecked(&count_count_start);
6855+ while (atomic_read_unchecked(&count_count_start) != 2)
6856 mb();
6857
6858 /*
6859@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6860 if (i == NR_LOOPS-1)
6861 write_c0_count(initcount);
6862
6863- atomic_inc(&count_count_stop);
6864- while (atomic_read(&count_count_stop) != 2)
6865+ atomic_inc_unchecked(&count_count_stop);
6866+ while (atomic_read_unchecked(&count_count_stop) != 2)
6867 mb();
6868 }
6869 /* Arrange for an interrupt in a short while */
6870diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6871index 33984c0..666a96d 100644
6872--- a/arch/mips/kernel/traps.c
6873+++ b/arch/mips/kernel/traps.c
6874@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6875 siginfo_t info;
6876
6877 prev_state = exception_enter();
6878- die_if_kernel("Integer overflow", regs);
6879+ if (unlikely(!user_mode(regs))) {
6880+
6881+#ifdef CONFIG_PAX_REFCOUNT
6882+ if (fixup_exception(regs)) {
6883+ pax_report_refcount_overflow(regs);
6884+ exception_exit(prev_state);
6885+ return;
6886+ }
6887+#endif
6888+
6889+ die("Integer overflow", regs);
6890+ }
6891
6892 info.si_code = FPE_INTOVF;
6893 info.si_signo = SIGFPE;
6894diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6895index f5e7dda..47198ec 100644
6896--- a/arch/mips/kvm/mips.c
6897+++ b/arch/mips/kvm/mips.c
6898@@ -816,7 +816,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6899 return r;
6900 }
6901
6902-int kvm_arch_init(void *opaque)
6903+int kvm_arch_init(const void *opaque)
6904 {
6905 if (kvm_mips_callbacks) {
6906 kvm_err("kvm: module already exists\n");
6907diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6908index 7ff8637..6004edb 100644
6909--- a/arch/mips/mm/fault.c
6910+++ b/arch/mips/mm/fault.c
6911@@ -31,6 +31,23 @@
6912
6913 int show_unhandled_signals = 1;
6914
6915+#ifdef CONFIG_PAX_PAGEEXEC
6916+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6917+{
6918+ unsigned long i;
6919+
6920+ printk(KERN_ERR "PAX: bytes at PC: ");
6921+ for (i = 0; i < 5; i++) {
6922+ unsigned int c;
6923+ if (get_user(c, (unsigned int *)pc+i))
6924+ printk(KERN_CONT "???????? ");
6925+ else
6926+ printk(KERN_CONT "%08x ", c);
6927+ }
6928+ printk("\n");
6929+}
6930+#endif
6931+
6932 /*
6933 * This routine handles page faults. It determines the address,
6934 * and the problem, and then passes it off to one of the appropriate
6935@@ -206,6 +223,14 @@ bad_area:
6936 bad_area_nosemaphore:
6937 /* User mode accesses just cause a SIGSEGV */
6938 if (user_mode(regs)) {
6939+
6940+#ifdef CONFIG_PAX_PAGEEXEC
6941+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6942+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6943+ do_group_exit(SIGKILL);
6944+ }
6945+#endif
6946+
6947 tsk->thread.cp0_badvaddr = address;
6948 tsk->thread.error_code = write;
6949 if (show_unhandled_signals &&
6950diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6951index f1baadd..5472dca 100644
6952--- a/arch/mips/mm/mmap.c
6953+++ b/arch/mips/mm/mmap.c
6954@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6955 struct vm_area_struct *vma;
6956 unsigned long addr = addr0;
6957 int do_color_align;
6958+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6959 struct vm_unmapped_area_info info;
6960
6961 if (unlikely(len > TASK_SIZE))
6962@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6963 do_color_align = 1;
6964
6965 /* requesting a specific address */
6966+
6967+#ifdef CONFIG_PAX_RANDMMAP
6968+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6969+#endif
6970+
6971 if (addr) {
6972 if (do_color_align)
6973 addr = COLOUR_ALIGN(addr, pgoff);
6974@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6975 addr = PAGE_ALIGN(addr);
6976
6977 vma = find_vma(mm, addr);
6978- if (TASK_SIZE - len >= addr &&
6979- (!vma || addr + len <= vma->vm_start))
6980+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6981 return addr;
6982 }
6983
6984 info.length = len;
6985 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6986 info.align_offset = pgoff << PAGE_SHIFT;
6987+ info.threadstack_offset = offset;
6988
6989 if (dir == DOWN) {
6990 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6991@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6992 {
6993 unsigned long random_factor = 0UL;
6994
6995+#ifdef CONFIG_PAX_RANDMMAP
6996+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6997+#endif
6998+
6999 if (current->flags & PF_RANDOMIZE) {
7000 random_factor = get_random_int();
7001 random_factor = random_factor << PAGE_SHIFT;
7002@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7003
7004 if (mmap_is_legacy()) {
7005 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7006+
7007+#ifdef CONFIG_PAX_RANDMMAP
7008+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7009+ mm->mmap_base += mm->delta_mmap;
7010+#endif
7011+
7012 mm->get_unmapped_area = arch_get_unmapped_area;
7013 } else {
7014 mm->mmap_base = mmap_base(random_factor);
7015+
7016+#ifdef CONFIG_PAX_RANDMMAP
7017+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7018+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7019+#endif
7020+
7021 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7022 }
7023 }
7024
7025-static inline unsigned long brk_rnd(void)
7026-{
7027- unsigned long rnd = get_random_int();
7028-
7029- rnd = rnd << PAGE_SHIFT;
7030- /* 8MB for 32bit, 256MB for 64bit */
7031- if (TASK_IS_32BIT_ADDR)
7032- rnd = rnd & 0x7ffffful;
7033- else
7034- rnd = rnd & 0xffffffful;
7035-
7036- return rnd;
7037-}
7038-
7039-unsigned long arch_randomize_brk(struct mm_struct *mm)
7040-{
7041- unsigned long base = mm->brk;
7042- unsigned long ret;
7043-
7044- ret = PAGE_ALIGN(base + brk_rnd());
7045-
7046- if (ret < mm->brk)
7047- return mm->brk;
7048-
7049- return ret;
7050-}
7051-
7052 int __virt_addr_valid(const volatile void *kaddr)
7053 {
7054 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7055diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7056index a2358b4..7cead4f 100644
7057--- a/arch/mips/sgi-ip27/ip27-nmi.c
7058+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7059@@ -187,9 +187,9 @@ void
7060 cont_nmi_dump(void)
7061 {
7062 #ifndef REAL_NMI_SIGNAL
7063- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7064+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7065
7066- atomic_inc(&nmied_cpus);
7067+ atomic_inc_unchecked(&nmied_cpus);
7068 #endif
7069 /*
7070 * Only allow 1 cpu to proceed
7071@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7072 udelay(10000);
7073 }
7074 #else
7075- while (atomic_read(&nmied_cpus) != num_online_cpus());
7076+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7077 #endif
7078
7079 /*
7080diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7081index a046b30..6799527 100644
7082--- a/arch/mips/sni/rm200.c
7083+++ b/arch/mips/sni/rm200.c
7084@@ -270,7 +270,7 @@ spurious_8259A_irq:
7085 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7086 spurious_irq_mask |= irqmask;
7087 }
7088- atomic_inc(&irq_err_count);
7089+ atomic_inc_unchecked(&irq_err_count);
7090 /*
7091 * Theoretically we do not have to handle this IRQ,
7092 * but in Linux this does not cause problems and is
7093diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7094index 41e873b..34d33a7 100644
7095--- a/arch/mips/vr41xx/common/icu.c
7096+++ b/arch/mips/vr41xx/common/icu.c
7097@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7098
7099 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7100
7101- atomic_inc(&irq_err_count);
7102+ atomic_inc_unchecked(&irq_err_count);
7103
7104 return -1;
7105 }
7106diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7107index ae0e4ee..e8f0692 100644
7108--- a/arch/mips/vr41xx/common/irq.c
7109+++ b/arch/mips/vr41xx/common/irq.c
7110@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7111 irq_cascade_t *cascade;
7112
7113 if (irq >= NR_IRQS) {
7114- atomic_inc(&irq_err_count);
7115+ atomic_inc_unchecked(&irq_err_count);
7116 return;
7117 }
7118
7119@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7120 ret = cascade->get_irq(irq);
7121 irq = ret;
7122 if (ret < 0)
7123- atomic_inc(&irq_err_count);
7124+ atomic_inc_unchecked(&irq_err_count);
7125 else
7126 irq_dispatch(irq);
7127 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7128diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7129index 967d144..db12197 100644
7130--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7131+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7132@@ -11,12 +11,14 @@
7133 #ifndef _ASM_PROC_CACHE_H
7134 #define _ASM_PROC_CACHE_H
7135
7136+#include <linux/const.h>
7137+
7138 /* L1 cache */
7139
7140 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7141 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7142-#define L1_CACHE_BYTES 16 /* bytes per entry */
7143 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7144+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7145 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7146
7147 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7148diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7149index bcb5df2..84fabd2 100644
7150--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7151+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7152@@ -16,13 +16,15 @@
7153 #ifndef _ASM_PROC_CACHE_H
7154 #define _ASM_PROC_CACHE_H
7155
7156+#include <linux/const.h>
7157+
7158 /*
7159 * L1 cache
7160 */
7161 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7162 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7163-#define L1_CACHE_BYTES 32 /* bytes per entry */
7164 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7165+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7166 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7167
7168 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7169diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7170index 4ce7a01..449202a 100644
7171--- a/arch/openrisc/include/asm/cache.h
7172+++ b/arch/openrisc/include/asm/cache.h
7173@@ -19,11 +19,13 @@
7174 #ifndef __ASM_OPENRISC_CACHE_H
7175 #define __ASM_OPENRISC_CACHE_H
7176
7177+#include <linux/const.h>
7178+
7179 /* FIXME: How can we replace these with values from the CPU...
7180 * they shouldn't be hard-coded!
7181 */
7182
7183-#define L1_CACHE_BYTES 16
7184 #define L1_CACHE_SHIFT 4
7185+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7186
7187 #endif /* __ASM_OPENRISC_CACHE_H */
7188diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7189index 226f8ca..9d9b87d 100644
7190--- a/arch/parisc/include/asm/atomic.h
7191+++ b/arch/parisc/include/asm/atomic.h
7192@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7193 return dec;
7194 }
7195
7196+#define atomic64_read_unchecked(v) atomic64_read(v)
7197+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7198+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7199+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7200+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7201+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7202+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7203+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7204+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7205+
7206 #endif /* !CONFIG_64BIT */
7207
7208
7209diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7210index 47f11c7..3420df2 100644
7211--- a/arch/parisc/include/asm/cache.h
7212+++ b/arch/parisc/include/asm/cache.h
7213@@ -5,6 +5,7 @@
7214 #ifndef __ARCH_PARISC_CACHE_H
7215 #define __ARCH_PARISC_CACHE_H
7216
7217+#include <linux/const.h>
7218
7219 /*
7220 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7221@@ -15,13 +16,13 @@
7222 * just ruin performance.
7223 */
7224 #ifdef CONFIG_PA20
7225-#define L1_CACHE_BYTES 64
7226 #define L1_CACHE_SHIFT 6
7227 #else
7228-#define L1_CACHE_BYTES 32
7229 #define L1_CACHE_SHIFT 5
7230 #endif
7231
7232+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7233+
7234 #ifndef __ASSEMBLY__
7235
7236 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7237diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7238index 78c9fd3..42fa66a 100644
7239--- a/arch/parisc/include/asm/elf.h
7240+++ b/arch/parisc/include/asm/elf.h
7241@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7242
7243 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7244
7245+#ifdef CONFIG_PAX_ASLR
7246+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7247+
7248+#define PAX_DELTA_MMAP_LEN 16
7249+#define PAX_DELTA_STACK_LEN 16
7250+#endif
7251+
7252 /* This yields a mask that user programs can use to figure out what
7253 instruction set this CPU supports. This could be done in user space,
7254 but it's not easy, and we've already done it here. */
7255diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7256index d174372..f27fe5c 100644
7257--- a/arch/parisc/include/asm/pgalloc.h
7258+++ b/arch/parisc/include/asm/pgalloc.h
7259@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7260 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7261 }
7262
7263+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7264+{
7265+ pgd_populate(mm, pgd, pmd);
7266+}
7267+
7268 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7269 {
7270 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7271@@ -96,6 +101,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7272 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7273 #define pmd_free(mm, x) do { } while (0)
7274 #define pgd_populate(mm, pmd, pte) BUG()
7275+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7276
7277 #endif
7278
7279diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7280index 15207b9..3209e65 100644
7281--- a/arch/parisc/include/asm/pgtable.h
7282+++ b/arch/parisc/include/asm/pgtable.h
7283@@ -215,6 +215,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7284 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7285 #define PAGE_COPY PAGE_EXECREAD
7286 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7287+
7288+#ifdef CONFIG_PAX_PAGEEXEC
7289+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7290+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7291+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7292+#else
7293+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7294+# define PAGE_COPY_NOEXEC PAGE_COPY
7295+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7296+#endif
7297+
7298 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7299 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7300 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7301diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7302index 0abdd4c..1af92f0 100644
7303--- a/arch/parisc/include/asm/uaccess.h
7304+++ b/arch/parisc/include/asm/uaccess.h
7305@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7306 const void __user *from,
7307 unsigned long n)
7308 {
7309- int sz = __compiletime_object_size(to);
7310+ size_t sz = __compiletime_object_size(to);
7311 int ret = -EFAULT;
7312
7313- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7314+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7315 ret = __copy_from_user(to, from, n);
7316 else
7317 copy_from_user_overflow();
7318diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7319index 3c63a82..b1d6ee9 100644
7320--- a/arch/parisc/kernel/module.c
7321+++ b/arch/parisc/kernel/module.c
7322@@ -98,16 +98,38 @@
7323
7324 /* three functions to determine where in the module core
7325 * or init pieces the location is */
7326+static inline int in_init_rx(struct module *me, void *loc)
7327+{
7328+ return (loc >= me->module_init_rx &&
7329+ loc < (me->module_init_rx + me->init_size_rx));
7330+}
7331+
7332+static inline int in_init_rw(struct module *me, void *loc)
7333+{
7334+ return (loc >= me->module_init_rw &&
7335+ loc < (me->module_init_rw + me->init_size_rw));
7336+}
7337+
7338 static inline int in_init(struct module *me, void *loc)
7339 {
7340- return (loc >= me->module_init &&
7341- loc <= (me->module_init + me->init_size));
7342+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7343+}
7344+
7345+static inline int in_core_rx(struct module *me, void *loc)
7346+{
7347+ return (loc >= me->module_core_rx &&
7348+ loc < (me->module_core_rx + me->core_size_rx));
7349+}
7350+
7351+static inline int in_core_rw(struct module *me, void *loc)
7352+{
7353+ return (loc >= me->module_core_rw &&
7354+ loc < (me->module_core_rw + me->core_size_rw));
7355 }
7356
7357 static inline int in_core(struct module *me, void *loc)
7358 {
7359- return (loc >= me->module_core &&
7360- loc <= (me->module_core + me->core_size));
7361+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7362 }
7363
7364 static inline int in_local(struct module *me, void *loc)
7365@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7366 }
7367
7368 /* align things a bit */
7369- me->core_size = ALIGN(me->core_size, 16);
7370- me->arch.got_offset = me->core_size;
7371- me->core_size += gots * sizeof(struct got_entry);
7372+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7373+ me->arch.got_offset = me->core_size_rw;
7374+ me->core_size_rw += gots * sizeof(struct got_entry);
7375
7376- me->core_size = ALIGN(me->core_size, 16);
7377- me->arch.fdesc_offset = me->core_size;
7378- me->core_size += fdescs * sizeof(Elf_Fdesc);
7379+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7380+ me->arch.fdesc_offset = me->core_size_rw;
7381+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7382
7383 me->arch.got_max = gots;
7384 me->arch.fdesc_max = fdescs;
7385@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7386
7387 BUG_ON(value == 0);
7388
7389- got = me->module_core + me->arch.got_offset;
7390+ got = me->module_core_rw + me->arch.got_offset;
7391 for (i = 0; got[i].addr; i++)
7392 if (got[i].addr == value)
7393 goto out;
7394@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7395 #ifdef CONFIG_64BIT
7396 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7397 {
7398- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7399+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7400
7401 if (!value) {
7402 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7403@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7404
7405 /* Create new one */
7406 fdesc->addr = value;
7407- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7408+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7409 return (Elf_Addr)fdesc;
7410 }
7411 #endif /* CONFIG_64BIT */
7412@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7413
7414 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7415 end = table + sechdrs[me->arch.unwind_section].sh_size;
7416- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7417+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7418
7419 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7420 me->arch.unwind_section, table, end, gp);
7421diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7422index 5aba01a..47cdd5a 100644
7423--- a/arch/parisc/kernel/sys_parisc.c
7424+++ b/arch/parisc/kernel/sys_parisc.c
7425@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7426 unsigned long task_size = TASK_SIZE;
7427 int do_color_align, last_mmap;
7428 struct vm_unmapped_area_info info;
7429+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7430
7431 if (len > task_size)
7432 return -ENOMEM;
7433@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7434 goto found_addr;
7435 }
7436
7437+#ifdef CONFIG_PAX_RANDMMAP
7438+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7439+#endif
7440+
7441 if (addr) {
7442 if (do_color_align && last_mmap)
7443 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7444@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7445 info.high_limit = mmap_upper_limit();
7446 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7447 info.align_offset = shared_align_offset(last_mmap, pgoff);
7448+ info.threadstack_offset = offset;
7449 addr = vm_unmapped_area(&info);
7450
7451 found_addr:
7452@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7453 unsigned long addr = addr0;
7454 int do_color_align, last_mmap;
7455 struct vm_unmapped_area_info info;
7456+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7457
7458 #ifdef CONFIG_64BIT
7459 /* This should only ever run for 32-bit processes. */
7460@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7461 }
7462
7463 /* requesting a specific address */
7464+#ifdef CONFIG_PAX_RANDMMAP
7465+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7466+#endif
7467+
7468 if (addr) {
7469 if (do_color_align && last_mmap)
7470 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7471@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7472 info.high_limit = mm->mmap_base;
7473 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7474 info.align_offset = shared_align_offset(last_mmap, pgoff);
7475+ info.threadstack_offset = offset;
7476 addr = vm_unmapped_area(&info);
7477 if (!(addr & ~PAGE_MASK))
7478 goto found_addr;
7479@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7480 mm->mmap_legacy_base = mmap_legacy_base();
7481 mm->mmap_base = mmap_upper_limit();
7482
7483+#ifdef CONFIG_PAX_RANDMMAP
7484+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7485+ mm->mmap_legacy_base += mm->delta_mmap;
7486+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7487+ }
7488+#endif
7489+
7490 if (mmap_is_legacy()) {
7491 mm->mmap_base = mm->mmap_legacy_base;
7492 mm->get_unmapped_area = arch_get_unmapped_area;
7493diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7494index 47ee620..1107387 100644
7495--- a/arch/parisc/kernel/traps.c
7496+++ b/arch/parisc/kernel/traps.c
7497@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7498
7499 down_read(&current->mm->mmap_sem);
7500 vma = find_vma(current->mm,regs->iaoq[0]);
7501- if (vma && (regs->iaoq[0] >= vma->vm_start)
7502- && (vma->vm_flags & VM_EXEC)) {
7503-
7504+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7505 fault_address = regs->iaoq[0];
7506 fault_space = regs->iasq[0];
7507
7508diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7509index e5120e6..8ddb5cc 100644
7510--- a/arch/parisc/mm/fault.c
7511+++ b/arch/parisc/mm/fault.c
7512@@ -15,6 +15,7 @@
7513 #include <linux/sched.h>
7514 #include <linux/interrupt.h>
7515 #include <linux/module.h>
7516+#include <linux/unistd.h>
7517
7518 #include <asm/uaccess.h>
7519 #include <asm/traps.h>
7520@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7521 static unsigned long
7522 parisc_acctyp(unsigned long code, unsigned int inst)
7523 {
7524- if (code == 6 || code == 16)
7525+ if (code == 6 || code == 7 || code == 16)
7526 return VM_EXEC;
7527
7528 switch (inst & 0xf0000000) {
7529@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7530 }
7531 #endif
7532
7533+#ifdef CONFIG_PAX_PAGEEXEC
7534+/*
7535+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7536+ *
7537+ * returns 1 when task should be killed
7538+ * 2 when rt_sigreturn trampoline was detected
7539+ * 3 when unpatched PLT trampoline was detected
7540+ */
7541+static int pax_handle_fetch_fault(struct pt_regs *regs)
7542+{
7543+
7544+#ifdef CONFIG_PAX_EMUPLT
7545+ int err;
7546+
7547+ do { /* PaX: unpatched PLT emulation */
7548+ unsigned int bl, depwi;
7549+
7550+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7551+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7552+
7553+ if (err)
7554+ break;
7555+
7556+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7557+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7558+
7559+ err = get_user(ldw, (unsigned int *)addr);
7560+ err |= get_user(bv, (unsigned int *)(addr+4));
7561+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7562+
7563+ if (err)
7564+ break;
7565+
7566+ if (ldw == 0x0E801096U &&
7567+ bv == 0xEAC0C000U &&
7568+ ldw2 == 0x0E881095U)
7569+ {
7570+ unsigned int resolver, map;
7571+
7572+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7573+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7574+ if (err)
7575+ break;
7576+
7577+ regs->gr[20] = instruction_pointer(regs)+8;
7578+ regs->gr[21] = map;
7579+ regs->gr[22] = resolver;
7580+ regs->iaoq[0] = resolver | 3UL;
7581+ regs->iaoq[1] = regs->iaoq[0] + 4;
7582+ return 3;
7583+ }
7584+ }
7585+ } while (0);
7586+#endif
7587+
7588+#ifdef CONFIG_PAX_EMUTRAMP
7589+
7590+#ifndef CONFIG_PAX_EMUSIGRT
7591+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7592+ return 1;
7593+#endif
7594+
7595+ do { /* PaX: rt_sigreturn emulation */
7596+ unsigned int ldi1, ldi2, bel, nop;
7597+
7598+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7599+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7600+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7601+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7602+
7603+ if (err)
7604+ break;
7605+
7606+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7607+ ldi2 == 0x3414015AU &&
7608+ bel == 0xE4008200U &&
7609+ nop == 0x08000240U)
7610+ {
7611+ regs->gr[25] = (ldi1 & 2) >> 1;
7612+ regs->gr[20] = __NR_rt_sigreturn;
7613+ regs->gr[31] = regs->iaoq[1] + 16;
7614+ regs->sr[0] = regs->iasq[1];
7615+ regs->iaoq[0] = 0x100UL;
7616+ regs->iaoq[1] = regs->iaoq[0] + 4;
7617+ regs->iasq[0] = regs->sr[2];
7618+ regs->iasq[1] = regs->sr[2];
7619+ return 2;
7620+ }
7621+ } while (0);
7622+#endif
7623+
7624+ return 1;
7625+}
7626+
7627+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7628+{
7629+ unsigned long i;
7630+
7631+ printk(KERN_ERR "PAX: bytes at PC: ");
7632+ for (i = 0; i < 5; i++) {
7633+ unsigned int c;
7634+ if (get_user(c, (unsigned int *)pc+i))
7635+ printk(KERN_CONT "???????? ");
7636+ else
7637+ printk(KERN_CONT "%08x ", c);
7638+ }
7639+ printk("\n");
7640+}
7641+#endif
7642+
7643 int fixup_exception(struct pt_regs *regs)
7644 {
7645 const struct exception_table_entry *fix;
7646@@ -234,8 +345,33 @@ retry:
7647
7648 good_area:
7649
7650- if ((vma->vm_flags & acc_type) != acc_type)
7651+ if ((vma->vm_flags & acc_type) != acc_type) {
7652+
7653+#ifdef CONFIG_PAX_PAGEEXEC
7654+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7655+ (address & ~3UL) == instruction_pointer(regs))
7656+ {
7657+ up_read(&mm->mmap_sem);
7658+ switch (pax_handle_fetch_fault(regs)) {
7659+
7660+#ifdef CONFIG_PAX_EMUPLT
7661+ case 3:
7662+ return;
7663+#endif
7664+
7665+#ifdef CONFIG_PAX_EMUTRAMP
7666+ case 2:
7667+ return;
7668+#endif
7669+
7670+ }
7671+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7672+ do_group_exit(SIGKILL);
7673+ }
7674+#endif
7675+
7676 goto bad_area;
7677+ }
7678
7679 /*
7680 * If for any reason at all we couldn't handle the fault, make
7681diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7682index 22b0940..309f790 100644
7683--- a/arch/powerpc/Kconfig
7684+++ b/arch/powerpc/Kconfig
7685@@ -409,6 +409,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7686 config KEXEC
7687 bool "kexec system call"
7688 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7689+ depends on !GRKERNSEC_KMEM
7690 help
7691 kexec is a system call that implements the ability to shutdown your
7692 current kernel, and to start another kernel. It is like a reboot
7693diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7694index 512d278..d31fadd 100644
7695--- a/arch/powerpc/include/asm/atomic.h
7696+++ b/arch/powerpc/include/asm/atomic.h
7697@@ -12,6 +12,11 @@
7698
7699 #define ATOMIC_INIT(i) { (i) }
7700
7701+#define _ASM_EXTABLE(from, to) \
7702+" .section __ex_table,\"a\"\n" \
7703+ PPC_LONG" " #from ", " #to"\n" \
7704+" .previous\n"
7705+
7706 static __inline__ int atomic_read(const atomic_t *v)
7707 {
7708 int t;
7709@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7710 return t;
7711 }
7712
7713+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7714+{
7715+ int t;
7716+
7717+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7718+
7719+ return t;
7720+}
7721+
7722 static __inline__ void atomic_set(atomic_t *v, int i)
7723 {
7724 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7725 }
7726
7727-#define ATOMIC_OP(op, asm_op) \
7728-static __inline__ void atomic_##op(int a, atomic_t *v) \
7729+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7730+{
7731+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7732+}
7733+
7734+#ifdef CONFIG_PAX_REFCOUNT
7735+#define __REFCOUNT_OP(op) op##o.
7736+#define __OVERFLOW_PRE \
7737+ " mcrxr cr0\n"
7738+#define __OVERFLOW_POST \
7739+ " bf 4*cr0+so, 3f\n" \
7740+ "2: .long 0x00c00b00\n" \
7741+ "3:\n"
7742+#define __OVERFLOW_EXTABLE \
7743+ "\n4:\n"
7744+ _ASM_EXTABLE(2b, 4b)
7745+#else
7746+#define __REFCOUNT_OP(op) op
7747+#define __OVERFLOW_PRE
7748+#define __OVERFLOW_POST
7749+#define __OVERFLOW_EXTABLE
7750+#endif
7751+
7752+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7753+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7754 { \
7755 int t; \
7756 \
7757 __asm__ __volatile__( \
7758-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7759+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7760+ pre_op \
7761 #asm_op " %0,%2,%0\n" \
7762+ post_op \
7763 PPC405_ERR77(0,%3) \
7764 " stwcx. %0,0,%3 \n" \
7765 " bne- 1b\n" \
7766+ extable \
7767 : "=&r" (t), "+m" (v->counter) \
7768 : "r" (a), "r" (&v->counter) \
7769 : "cc"); \
7770 } \
7771
7772-#define ATOMIC_OP_RETURN(op, asm_op) \
7773-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7774+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7775+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7776+
7777+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7778+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7779 { \
7780 int t; \
7781 \
7782 __asm__ __volatile__( \
7783 PPC_ATOMIC_ENTRY_BARRIER \
7784-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7785+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7786+ pre_op \
7787 #asm_op " %0,%1,%0\n" \
7788+ post_op \
7789 PPC405_ERR77(0,%2) \
7790 " stwcx. %0,0,%2 \n" \
7791 " bne- 1b\n" \
7792+ extable \
7793 PPC_ATOMIC_EXIT_BARRIER \
7794 : "=&r" (t) \
7795 : "r" (a), "r" (&v->counter) \
7796@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7797 return t; \
7798 }
7799
7800+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7801+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7802+
7803 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7804
7805 ATOMIC_OPS(add, add)
7806@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7807
7808 #undef ATOMIC_OPS
7809 #undef ATOMIC_OP_RETURN
7810+#undef __ATOMIC_OP_RETURN
7811 #undef ATOMIC_OP
7812+#undef __ATOMIC_OP
7813
7814 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7815
7816-static __inline__ void atomic_inc(atomic_t *v)
7817-{
7818- int t;
7819+/*
7820+ * atomic_inc - increment atomic variable
7821+ * @v: pointer of type atomic_t
7822+ *
7823+ * Automatically increments @v by 1
7824+ */
7825+#define atomic_inc(v) atomic_add(1, (v))
7826+#define atomic_inc_return(v) atomic_add_return(1, (v))
7827
7828- __asm__ __volatile__(
7829-"1: lwarx %0,0,%2 # atomic_inc\n\
7830- addic %0,%0,1\n"
7831- PPC405_ERR77(0,%2)
7832-" stwcx. %0,0,%2 \n\
7833- bne- 1b"
7834- : "=&r" (t), "+m" (v->counter)
7835- : "r" (&v->counter)
7836- : "cc", "xer");
7837+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7838+{
7839+ atomic_add_unchecked(1, v);
7840 }
7841
7842-static __inline__ int atomic_inc_return(atomic_t *v)
7843+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7844 {
7845- int t;
7846-
7847- __asm__ __volatile__(
7848- PPC_ATOMIC_ENTRY_BARRIER
7849-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7850- addic %0,%0,1\n"
7851- PPC405_ERR77(0,%1)
7852-" stwcx. %0,0,%1 \n\
7853- bne- 1b"
7854- PPC_ATOMIC_EXIT_BARRIER
7855- : "=&r" (t)
7856- : "r" (&v->counter)
7857- : "cc", "xer", "memory");
7858-
7859- return t;
7860+ return atomic_add_return_unchecked(1, v);
7861 }
7862
7863 /*
7864@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7865 */
7866 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7867
7868-static __inline__ void atomic_dec(atomic_t *v)
7869+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7870 {
7871- int t;
7872-
7873- __asm__ __volatile__(
7874-"1: lwarx %0,0,%2 # atomic_dec\n\
7875- addic %0,%0,-1\n"
7876- PPC405_ERR77(0,%2)\
7877-" stwcx. %0,0,%2\n\
7878- bne- 1b"
7879- : "=&r" (t), "+m" (v->counter)
7880- : "r" (&v->counter)
7881- : "cc", "xer");
7882+ return atomic_add_return_unchecked(1, v) == 0;
7883 }
7884
7885-static __inline__ int atomic_dec_return(atomic_t *v)
7886+/*
7887+ * atomic_dec - decrement atomic variable
7888+ * @v: pointer of type atomic_t
7889+ *
7890+ * Atomically decrements @v by 1
7891+ */
7892+#define atomic_dec(v) atomic_sub(1, (v))
7893+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7894+
7895+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7896 {
7897- int t;
7898-
7899- __asm__ __volatile__(
7900- PPC_ATOMIC_ENTRY_BARRIER
7901-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7902- addic %0,%0,-1\n"
7903- PPC405_ERR77(0,%1)
7904-" stwcx. %0,0,%1\n\
7905- bne- 1b"
7906- PPC_ATOMIC_EXIT_BARRIER
7907- : "=&r" (t)
7908- : "r" (&v->counter)
7909- : "cc", "xer", "memory");
7910-
7911- return t;
7912+ atomic_sub_unchecked(1, v);
7913 }
7914
7915 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7916 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7917
7918+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7919+{
7920+ return cmpxchg(&(v->counter), old, new);
7921+}
7922+
7923+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7924+{
7925+ return xchg(&(v->counter), new);
7926+}
7927+
7928 /**
7929 * __atomic_add_unless - add unless the number is a given value
7930 * @v: pointer of type atomic_t
7931@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7932 PPC_ATOMIC_ENTRY_BARRIER
7933 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7934 cmpw 0,%0,%3 \n\
7935- beq- 2f \n\
7936- add %0,%2,%0 \n"
7937+ beq- 2f \n"
7938+
7939+#ifdef CONFIG_PAX_REFCOUNT
7940+" mcrxr cr0\n"
7941+" addo. %0,%2,%0\n"
7942+" bf 4*cr0+so, 4f\n"
7943+"3:.long " "0x00c00b00""\n"
7944+"4:\n"
7945+#else
7946+ "add %0,%2,%0 \n"
7947+#endif
7948+
7949 PPC405_ERR77(0,%2)
7950 " stwcx. %0,0,%1 \n\
7951 bne- 1b \n"
7952+"5:"
7953+
7954+#ifdef CONFIG_PAX_REFCOUNT
7955+ _ASM_EXTABLE(3b, 5b)
7956+#endif
7957+
7958 PPC_ATOMIC_EXIT_BARRIER
7959 " subf %0,%2,%0 \n\
7960 2:"
7961@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7962 }
7963 #define atomic_dec_if_positive atomic_dec_if_positive
7964
7965+#define smp_mb__before_atomic_dec() smp_mb()
7966+#define smp_mb__after_atomic_dec() smp_mb()
7967+#define smp_mb__before_atomic_inc() smp_mb()
7968+#define smp_mb__after_atomic_inc() smp_mb()
7969+
7970 #ifdef __powerpc64__
7971
7972 #define ATOMIC64_INIT(i) { (i) }
7973@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7974 return t;
7975 }
7976
7977+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7978+{
7979+ long t;
7980+
7981+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7982+
7983+ return t;
7984+}
7985+
7986 static __inline__ void atomic64_set(atomic64_t *v, long i)
7987 {
7988 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7989 }
7990
7991-#define ATOMIC64_OP(op, asm_op) \
7992-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7993+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7994+{
7995+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7996+}
7997+
7998+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7999+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8000 { \
8001 long t; \
8002 \
8003 __asm__ __volatile__( \
8004 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8005+ pre_op \
8006 #asm_op " %0,%2,%0\n" \
8007+ post_op \
8008 " stdcx. %0,0,%3 \n" \
8009 " bne- 1b\n" \
8010+ extable \
8011 : "=&r" (t), "+m" (v->counter) \
8012 : "r" (a), "r" (&v->counter) \
8013 : "cc"); \
8014 }
8015
8016-#define ATOMIC64_OP_RETURN(op, asm_op) \
8017-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8018+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8019+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8020+
8021+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8022+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8023 { \
8024 long t; \
8025 \
8026 __asm__ __volatile__( \
8027 PPC_ATOMIC_ENTRY_BARRIER \
8028 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8029+ pre_op \
8030 #asm_op " %0,%1,%0\n" \
8031+ post_op \
8032 " stdcx. %0,0,%2 \n" \
8033 " bne- 1b\n" \
8034+ extable \
8035 PPC_ATOMIC_EXIT_BARRIER \
8036 : "=&r" (t) \
8037 : "r" (a), "r" (&v->counter) \
8038@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8039 return t; \
8040 }
8041
8042+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8043+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8044+
8045 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8046
8047 ATOMIC64_OPS(add, add)
8048@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8049
8050 #undef ATOMIC64_OPS
8051 #undef ATOMIC64_OP_RETURN
8052+#undef __ATOMIC64_OP_RETURN
8053 #undef ATOMIC64_OP
8054+#undef __ATOMIC64_OP
8055+#undef __OVERFLOW_EXTABLE
8056+#undef __OVERFLOW_POST
8057+#undef __OVERFLOW_PRE
8058+#undef __REFCOUNT_OP
8059
8060 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8061
8062-static __inline__ void atomic64_inc(atomic64_t *v)
8063-{
8064- long t;
8065+/*
8066+ * atomic64_inc - increment atomic variable
8067+ * @v: pointer of type atomic64_t
8068+ *
8069+ * Automatically increments @v by 1
8070+ */
8071+#define atomic64_inc(v) atomic64_add(1, (v))
8072+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8073
8074- __asm__ __volatile__(
8075-"1: ldarx %0,0,%2 # atomic64_inc\n\
8076- addic %0,%0,1\n\
8077- stdcx. %0,0,%2 \n\
8078- bne- 1b"
8079- : "=&r" (t), "+m" (v->counter)
8080- : "r" (&v->counter)
8081- : "cc", "xer");
8082+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8083+{
8084+ atomic64_add_unchecked(1, v);
8085 }
8086
8087-static __inline__ long atomic64_inc_return(atomic64_t *v)
8088+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8089 {
8090- long t;
8091-
8092- __asm__ __volatile__(
8093- PPC_ATOMIC_ENTRY_BARRIER
8094-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8095- addic %0,%0,1\n\
8096- stdcx. %0,0,%1 \n\
8097- bne- 1b"
8098- PPC_ATOMIC_EXIT_BARRIER
8099- : "=&r" (t)
8100- : "r" (&v->counter)
8101- : "cc", "xer", "memory");
8102-
8103- return t;
8104+ return atomic64_add_return_unchecked(1, v);
8105 }
8106
8107 /*
8108@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8109 */
8110 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8111
8112-static __inline__ void atomic64_dec(atomic64_t *v)
8113+/*
8114+ * atomic64_dec - decrement atomic variable
8115+ * @v: pointer of type atomic64_t
8116+ *
8117+ * Atomically decrements @v by 1
8118+ */
8119+#define atomic64_dec(v) atomic64_sub(1, (v))
8120+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8121+
8122+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8123 {
8124- long t;
8125-
8126- __asm__ __volatile__(
8127-"1: ldarx %0,0,%2 # atomic64_dec\n\
8128- addic %0,%0,-1\n\
8129- stdcx. %0,0,%2\n\
8130- bne- 1b"
8131- : "=&r" (t), "+m" (v->counter)
8132- : "r" (&v->counter)
8133- : "cc", "xer");
8134-}
8135-
8136-static __inline__ long atomic64_dec_return(atomic64_t *v)
8137-{
8138- long t;
8139-
8140- __asm__ __volatile__(
8141- PPC_ATOMIC_ENTRY_BARRIER
8142-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8143- addic %0,%0,-1\n\
8144- stdcx. %0,0,%1\n\
8145- bne- 1b"
8146- PPC_ATOMIC_EXIT_BARRIER
8147- : "=&r" (t)
8148- : "r" (&v->counter)
8149- : "cc", "xer", "memory");
8150-
8151- return t;
8152+ atomic64_sub_unchecked(1, v);
8153 }
8154
8155 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8156@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8157 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8158 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8159
8160+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8161+{
8162+ return cmpxchg(&(v->counter), old, new);
8163+}
8164+
8165+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8166+{
8167+ return xchg(&(v->counter), new);
8168+}
8169+
8170 /**
8171 * atomic64_add_unless - add unless the number is a given value
8172 * @v: pointer of type atomic64_t
8173@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8174
8175 __asm__ __volatile__ (
8176 PPC_ATOMIC_ENTRY_BARRIER
8177-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8178+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8179 cmpd 0,%0,%3 \n\
8180- beq- 2f \n\
8181- add %0,%2,%0 \n"
8182+ beq- 2f \n"
8183+
8184+#ifdef CONFIG_PAX_REFCOUNT
8185+" mcrxr cr0\n"
8186+" addo. %0,%2,%0\n"
8187+" bf 4*cr0+so, 4f\n"
8188+"3:.long " "0x00c00b00""\n"
8189+"4:\n"
8190+#else
8191+ "add %0,%2,%0 \n"
8192+#endif
8193+
8194 " stdcx. %0,0,%1 \n\
8195 bne- 1b \n"
8196 PPC_ATOMIC_EXIT_BARRIER
8197+"5:"
8198+
8199+#ifdef CONFIG_PAX_REFCOUNT
8200+ _ASM_EXTABLE(3b, 5b)
8201+#endif
8202+
8203 " subf %0,%2,%0 \n\
8204 2:"
8205 : "=&r" (t)
8206diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8207index a3bf5be..e03ba81 100644
8208--- a/arch/powerpc/include/asm/barrier.h
8209+++ b/arch/powerpc/include/asm/barrier.h
8210@@ -76,7 +76,7 @@
8211 do { \
8212 compiletime_assert_atomic_type(*p); \
8213 smp_lwsync(); \
8214- ACCESS_ONCE(*p) = (v); \
8215+ ACCESS_ONCE_RW(*p) = (v); \
8216 } while (0)
8217
8218 #define smp_load_acquire(p) \
8219diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8220index 34a05a1..a1f2c67 100644
8221--- a/arch/powerpc/include/asm/cache.h
8222+++ b/arch/powerpc/include/asm/cache.h
8223@@ -4,6 +4,7 @@
8224 #ifdef __KERNEL__
8225
8226 #include <asm/reg.h>
8227+#include <linux/const.h>
8228
8229 /* bytes per L1 cache line */
8230 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8231@@ -23,7 +24,7 @@
8232 #define L1_CACHE_SHIFT 7
8233 #endif
8234
8235-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8236+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8237
8238 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8239
8240diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8241index 57d289a..b36c98c 100644
8242--- a/arch/powerpc/include/asm/elf.h
8243+++ b/arch/powerpc/include/asm/elf.h
8244@@ -30,6 +30,18 @@
8245
8246 #define ELF_ET_DYN_BASE 0x20000000
8247
8248+#ifdef CONFIG_PAX_ASLR
8249+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8250+
8251+#ifdef __powerpc64__
8252+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8253+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8254+#else
8255+#define PAX_DELTA_MMAP_LEN 15
8256+#define PAX_DELTA_STACK_LEN 15
8257+#endif
8258+#endif
8259+
8260 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8261
8262 /*
8263@@ -128,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8264 (0x7ff >> (PAGE_SHIFT - 12)) : \
8265 (0x3ffff >> (PAGE_SHIFT - 12)))
8266
8267-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8268-#define arch_randomize_brk arch_randomize_brk
8269-
8270-
8271 #ifdef CONFIG_SPU_BASE
8272 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8273 #define NT_SPU 1
8274diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8275index 8196e9c..d83a9f3 100644
8276--- a/arch/powerpc/include/asm/exec.h
8277+++ b/arch/powerpc/include/asm/exec.h
8278@@ -4,6 +4,6 @@
8279 #ifndef _ASM_POWERPC_EXEC_H
8280 #define _ASM_POWERPC_EXEC_H
8281
8282-extern unsigned long arch_align_stack(unsigned long sp);
8283+#define arch_align_stack(x) ((x) & ~0xfUL)
8284
8285 #endif /* _ASM_POWERPC_EXEC_H */
8286diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8287index 5acabbd..7ea14fa 100644
8288--- a/arch/powerpc/include/asm/kmap_types.h
8289+++ b/arch/powerpc/include/asm/kmap_types.h
8290@@ -10,7 +10,7 @@
8291 * 2 of the License, or (at your option) any later version.
8292 */
8293
8294-#define KM_TYPE_NR 16
8295+#define KM_TYPE_NR 17
8296
8297 #endif /* __KERNEL__ */
8298 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8299diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8300index b8da913..c02b593 100644
8301--- a/arch/powerpc/include/asm/local.h
8302+++ b/arch/powerpc/include/asm/local.h
8303@@ -9,21 +9,65 @@ typedef struct
8304 atomic_long_t a;
8305 } local_t;
8306
8307+typedef struct
8308+{
8309+ atomic_long_unchecked_t a;
8310+} local_unchecked_t;
8311+
8312 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8313
8314 #define local_read(l) atomic_long_read(&(l)->a)
8315+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8316 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8317+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8318
8319 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8320+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8321 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8322+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8323 #define local_inc(l) atomic_long_inc(&(l)->a)
8324+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8325 #define local_dec(l) atomic_long_dec(&(l)->a)
8326+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8327
8328 static __inline__ long local_add_return(long a, local_t *l)
8329 {
8330 long t;
8331
8332 __asm__ __volatile__(
8333+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8334+
8335+#ifdef CONFIG_PAX_REFCOUNT
8336+" mcrxr cr0\n"
8337+" addo. %0,%1,%0\n"
8338+" bf 4*cr0+so, 3f\n"
8339+"2:.long " "0x00c00b00""\n"
8340+#else
8341+" add %0,%1,%0\n"
8342+#endif
8343+
8344+"3:\n"
8345+ PPC405_ERR77(0,%2)
8346+ PPC_STLCX "%0,0,%2 \n\
8347+ bne- 1b"
8348+
8349+#ifdef CONFIG_PAX_REFCOUNT
8350+"\n4:\n"
8351+ _ASM_EXTABLE(2b, 4b)
8352+#endif
8353+
8354+ : "=&r" (t)
8355+ : "r" (a), "r" (&(l->a.counter))
8356+ : "cc", "memory");
8357+
8358+ return t;
8359+}
8360+
8361+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8362+{
8363+ long t;
8364+
8365+ __asm__ __volatile__(
8366 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8367 add %0,%1,%0\n"
8368 PPC405_ERR77(0,%2)
8369@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8370
8371 #define local_cmpxchg(l, o, n) \
8372 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8373+#define local_cmpxchg_unchecked(l, o, n) \
8374+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8375 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8376
8377 /**
8378diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8379index 8565c25..2865190 100644
8380--- a/arch/powerpc/include/asm/mman.h
8381+++ b/arch/powerpc/include/asm/mman.h
8382@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8383 }
8384 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8385
8386-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8387+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8388 {
8389 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8390 }
8391diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8392index 69c0598..2c56964 100644
8393--- a/arch/powerpc/include/asm/page.h
8394+++ b/arch/powerpc/include/asm/page.h
8395@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8396 * and needs to be executable. This means the whole heap ends
8397 * up being executable.
8398 */
8399-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8400- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8401+#define VM_DATA_DEFAULT_FLAGS32 \
8402+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8403+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8404
8405 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8406 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8407@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8408 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8409 #endif
8410
8411+#define ktla_ktva(addr) (addr)
8412+#define ktva_ktla(addr) (addr)
8413+
8414 #ifndef CONFIG_PPC_BOOK3S_64
8415 /*
8416 * Use the top bit of the higher-level page table entries to indicate whether
8417diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8418index d908a46..3753f71 100644
8419--- a/arch/powerpc/include/asm/page_64.h
8420+++ b/arch/powerpc/include/asm/page_64.h
8421@@ -172,15 +172,18 @@ do { \
8422 * stack by default, so in the absence of a PT_GNU_STACK program header
8423 * we turn execute permission off.
8424 */
8425-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8426- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8427+#define VM_STACK_DEFAULT_FLAGS32 \
8428+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8429+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8430
8431 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8432 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8433
8434+#ifndef CONFIG_PAX_PAGEEXEC
8435 #define VM_STACK_DEFAULT_FLAGS \
8436 (is_32bit_task() ? \
8437 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8438+#endif
8439
8440 #include <asm-generic/getorder.h>
8441
8442diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8443index 4b0be20..c15a27d 100644
8444--- a/arch/powerpc/include/asm/pgalloc-64.h
8445+++ b/arch/powerpc/include/asm/pgalloc-64.h
8446@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8447 #ifndef CONFIG_PPC_64K_PAGES
8448
8449 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8450+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8451
8452 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8453 {
8454@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8455 pud_set(pud, (unsigned long)pmd);
8456 }
8457
8458+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8459+{
8460+ pud_populate(mm, pud, pmd);
8461+}
8462+
8463 #define pmd_populate(mm, pmd, pte_page) \
8464 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8465 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8466@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8467 #endif
8468
8469 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8470+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8471
8472 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8473 pte_t *pte)
8474diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8475index 9835ac4..900430f 100644
8476--- a/arch/powerpc/include/asm/pgtable.h
8477+++ b/arch/powerpc/include/asm/pgtable.h
8478@@ -2,6 +2,7 @@
8479 #define _ASM_POWERPC_PGTABLE_H
8480 #ifdef __KERNEL__
8481
8482+#include <linux/const.h>
8483 #ifndef __ASSEMBLY__
8484 #include <linux/mmdebug.h>
8485 #include <linux/mmzone.h>
8486diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8487index 62cfb0c..50c6402 100644
8488--- a/arch/powerpc/include/asm/pte-hash32.h
8489+++ b/arch/powerpc/include/asm/pte-hash32.h
8490@@ -20,6 +20,7 @@
8491 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8492 #define _PAGE_USER 0x004 /* usermode access allowed */
8493 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8494+#define _PAGE_EXEC _PAGE_GUARDED
8495 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8496 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8497 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8498diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8499index af56b5c..f86f3f6 100644
8500--- a/arch/powerpc/include/asm/reg.h
8501+++ b/arch/powerpc/include/asm/reg.h
8502@@ -253,6 +253,7 @@
8503 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8504 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8505 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8506+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8507 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8508 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8509 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8510diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8511index d607df5..08dc9ae 100644
8512--- a/arch/powerpc/include/asm/smp.h
8513+++ b/arch/powerpc/include/asm/smp.h
8514@@ -51,7 +51,7 @@ struct smp_ops_t {
8515 int (*cpu_disable)(void);
8516 void (*cpu_die)(unsigned int nr);
8517 int (*cpu_bootable)(unsigned int nr);
8518-};
8519+} __no_const;
8520
8521 extern void smp_send_debugger_break(void);
8522 extern void start_secondary_resume(void);
8523diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8524index 4dbe072..b803275 100644
8525--- a/arch/powerpc/include/asm/spinlock.h
8526+++ b/arch/powerpc/include/asm/spinlock.h
8527@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8528 __asm__ __volatile__(
8529 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8530 __DO_SIGN_EXTEND
8531-" addic. %0,%0,1\n\
8532- ble- 2f\n"
8533+
8534+#ifdef CONFIG_PAX_REFCOUNT
8535+" mcrxr cr0\n"
8536+" addico. %0,%0,1\n"
8537+" bf 4*cr0+so, 3f\n"
8538+"2:.long " "0x00c00b00""\n"
8539+#else
8540+" addic. %0,%0,1\n"
8541+#endif
8542+
8543+"3:\n"
8544+ "ble- 4f\n"
8545 PPC405_ERR77(0,%1)
8546 " stwcx. %0,0,%1\n\
8547 bne- 1b\n"
8548 PPC_ACQUIRE_BARRIER
8549-"2:" : "=&r" (tmp)
8550+"4:"
8551+
8552+#ifdef CONFIG_PAX_REFCOUNT
8553+ _ASM_EXTABLE(2b,4b)
8554+#endif
8555+
8556+ : "=&r" (tmp)
8557 : "r" (&rw->lock)
8558 : "cr0", "xer", "memory");
8559
8560@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8561 __asm__ __volatile__(
8562 "# read_unlock\n\t"
8563 PPC_RELEASE_BARRIER
8564-"1: lwarx %0,0,%1\n\
8565- addic %0,%0,-1\n"
8566+"1: lwarx %0,0,%1\n"
8567+
8568+#ifdef CONFIG_PAX_REFCOUNT
8569+" mcrxr cr0\n"
8570+" addico. %0,%0,-1\n"
8571+" bf 4*cr0+so, 3f\n"
8572+"2:.long " "0x00c00b00""\n"
8573+#else
8574+" addic. %0,%0,-1\n"
8575+#endif
8576+
8577+"3:\n"
8578 PPC405_ERR77(0,%1)
8579 " stwcx. %0,0,%1\n\
8580 bne- 1b"
8581+
8582+#ifdef CONFIG_PAX_REFCOUNT
8583+"\n4:\n"
8584+ _ASM_EXTABLE(2b, 4b)
8585+#endif
8586+
8587 : "=&r"(tmp)
8588 : "r"(&rw->lock)
8589 : "cr0", "xer", "memory");
8590diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8591index 7248979..80b75de 100644
8592--- a/arch/powerpc/include/asm/thread_info.h
8593+++ b/arch/powerpc/include/asm/thread_info.h
8594@@ -103,6 +103,8 @@ static inline struct thread_info *current_thread_info(void)
8595 #if defined(CONFIG_PPC64)
8596 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8597 #endif
8598+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8599+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8600
8601 /* as above, but as bit values */
8602 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8603@@ -121,9 +123,10 @@ static inline struct thread_info *current_thread_info(void)
8604 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8605 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8606 #define _TIF_NOHZ (1<<TIF_NOHZ)
8607+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8608 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8609 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8610- _TIF_NOHZ)
8611+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8612
8613 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8614 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8615diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8616index a0c071d..49cdc7f 100644
8617--- a/arch/powerpc/include/asm/uaccess.h
8618+++ b/arch/powerpc/include/asm/uaccess.h
8619@@ -58,6 +58,7 @@
8620
8621 #endif
8622
8623+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8624 #define access_ok(type, addr, size) \
8625 (__chk_user_ptr(addr), \
8626 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8627@@ -318,52 +319,6 @@ do { \
8628 extern unsigned long __copy_tofrom_user(void __user *to,
8629 const void __user *from, unsigned long size);
8630
8631-#ifndef __powerpc64__
8632-
8633-static inline unsigned long copy_from_user(void *to,
8634- const void __user *from, unsigned long n)
8635-{
8636- unsigned long over;
8637-
8638- if (access_ok(VERIFY_READ, from, n))
8639- return __copy_tofrom_user((__force void __user *)to, from, n);
8640- if ((unsigned long)from < TASK_SIZE) {
8641- over = (unsigned long)from + n - TASK_SIZE;
8642- return __copy_tofrom_user((__force void __user *)to, from,
8643- n - over) + over;
8644- }
8645- return n;
8646-}
8647-
8648-static inline unsigned long copy_to_user(void __user *to,
8649- const void *from, unsigned long n)
8650-{
8651- unsigned long over;
8652-
8653- if (access_ok(VERIFY_WRITE, to, n))
8654- return __copy_tofrom_user(to, (__force void __user *)from, n);
8655- if ((unsigned long)to < TASK_SIZE) {
8656- over = (unsigned long)to + n - TASK_SIZE;
8657- return __copy_tofrom_user(to, (__force void __user *)from,
8658- n - over) + over;
8659- }
8660- return n;
8661-}
8662-
8663-#else /* __powerpc64__ */
8664-
8665-#define __copy_in_user(to, from, size) \
8666- __copy_tofrom_user((to), (from), (size))
8667-
8668-extern unsigned long copy_from_user(void *to, const void __user *from,
8669- unsigned long n);
8670-extern unsigned long copy_to_user(void __user *to, const void *from,
8671- unsigned long n);
8672-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8673- unsigned long n);
8674-
8675-#endif /* __powerpc64__ */
8676-
8677 static inline unsigned long __copy_from_user_inatomic(void *to,
8678 const void __user *from, unsigned long n)
8679 {
8680@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8681 if (ret == 0)
8682 return 0;
8683 }
8684+
8685+ if (!__builtin_constant_p(n))
8686+ check_object_size(to, n, false);
8687+
8688 return __copy_tofrom_user((__force void __user *)to, from, n);
8689 }
8690
8691@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8692 if (ret == 0)
8693 return 0;
8694 }
8695+
8696+ if (!__builtin_constant_p(n))
8697+ check_object_size(from, n, true);
8698+
8699 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8700 }
8701
8702@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8703 return __copy_to_user_inatomic(to, from, size);
8704 }
8705
8706+#ifndef __powerpc64__
8707+
8708+static inline unsigned long __must_check copy_from_user(void *to,
8709+ const void __user *from, unsigned long n)
8710+{
8711+ unsigned long over;
8712+
8713+ if ((long)n < 0)
8714+ return n;
8715+
8716+ if (access_ok(VERIFY_READ, from, n)) {
8717+ if (!__builtin_constant_p(n))
8718+ check_object_size(to, n, false);
8719+ return __copy_tofrom_user((__force void __user *)to, from, n);
8720+ }
8721+ if ((unsigned long)from < TASK_SIZE) {
8722+ over = (unsigned long)from + n - TASK_SIZE;
8723+ if (!__builtin_constant_p(n - over))
8724+ check_object_size(to, n - over, false);
8725+ return __copy_tofrom_user((__force void __user *)to, from,
8726+ n - over) + over;
8727+ }
8728+ return n;
8729+}
8730+
8731+static inline unsigned long __must_check copy_to_user(void __user *to,
8732+ const void *from, unsigned long n)
8733+{
8734+ unsigned long over;
8735+
8736+ if ((long)n < 0)
8737+ return n;
8738+
8739+ if (access_ok(VERIFY_WRITE, to, n)) {
8740+ if (!__builtin_constant_p(n))
8741+ check_object_size(from, n, true);
8742+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8743+ }
8744+ if ((unsigned long)to < TASK_SIZE) {
8745+ over = (unsigned long)to + n - TASK_SIZE;
8746+ if (!__builtin_constant_p(n))
8747+ check_object_size(from, n - over, true);
8748+ return __copy_tofrom_user(to, (__force void __user *)from,
8749+ n - over) + over;
8750+ }
8751+ return n;
8752+}
8753+
8754+#else /* __powerpc64__ */
8755+
8756+#define __copy_in_user(to, from, size) \
8757+ __copy_tofrom_user((to), (from), (size))
8758+
8759+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8760+{
8761+ if ((long)n < 0 || n > INT_MAX)
8762+ return n;
8763+
8764+ if (!__builtin_constant_p(n))
8765+ check_object_size(to, n, false);
8766+
8767+ if (likely(access_ok(VERIFY_READ, from, n)))
8768+ n = __copy_from_user(to, from, n);
8769+ else
8770+ memset(to, 0, n);
8771+ return n;
8772+}
8773+
8774+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8775+{
8776+ if ((long)n < 0 || n > INT_MAX)
8777+ return n;
8778+
8779+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8780+ if (!__builtin_constant_p(n))
8781+ check_object_size(from, n, true);
8782+ n = __copy_to_user(to, from, n);
8783+ }
8784+ return n;
8785+}
8786+
8787+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8788+ unsigned long n);
8789+
8790+#endif /* __powerpc64__ */
8791+
8792 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8793
8794 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8795diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8796index 502cf69..53936a1 100644
8797--- a/arch/powerpc/kernel/Makefile
8798+++ b/arch/powerpc/kernel/Makefile
8799@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8800 CFLAGS_btext.o += -fPIC
8801 endif
8802
8803+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8804+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8805+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8806+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8807+
8808 ifdef CONFIG_FUNCTION_TRACER
8809 # Do not trace early boot code
8810 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8811@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8812 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8813 endif
8814
8815+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8816+
8817 obj-y := cputable.o ptrace.o syscalls.o \
8818 irq.o align.o signal_32.o pmc.o vdso.o \
8819 process.o systbl.o idle.o \
8820diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8821index 3e68d1c..72a5ee6 100644
8822--- a/arch/powerpc/kernel/exceptions-64e.S
8823+++ b/arch/powerpc/kernel/exceptions-64e.S
8824@@ -1010,6 +1010,7 @@ storage_fault_common:
8825 std r14,_DAR(r1)
8826 std r15,_DSISR(r1)
8827 addi r3,r1,STACK_FRAME_OVERHEAD
8828+ bl save_nvgprs
8829 mr r4,r14
8830 mr r5,r15
8831 ld r14,PACA_EXGEN+EX_R14(r13)
8832@@ -1018,8 +1019,7 @@ storage_fault_common:
8833 cmpdi r3,0
8834 bne- 1f
8835 b ret_from_except_lite
8836-1: bl save_nvgprs
8837- mr r5,r3
8838+1: mr r5,r3
8839 addi r3,r1,STACK_FRAME_OVERHEAD
8840 ld r4,_DAR(r1)
8841 bl bad_page_fault
8842diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8843index 9519e6b..13f6c38 100644
8844--- a/arch/powerpc/kernel/exceptions-64s.S
8845+++ b/arch/powerpc/kernel/exceptions-64s.S
8846@@ -1599,10 +1599,10 @@ handle_page_fault:
8847 11: ld r4,_DAR(r1)
8848 ld r5,_DSISR(r1)
8849 addi r3,r1,STACK_FRAME_OVERHEAD
8850+ bl save_nvgprs
8851 bl do_page_fault
8852 cmpdi r3,0
8853 beq+ 12f
8854- bl save_nvgprs
8855 mr r5,r3
8856 addi r3,r1,STACK_FRAME_OVERHEAD
8857 lwz r4,_DAR(r1)
8858diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8859index 4509603..cdb491f 100644
8860--- a/arch/powerpc/kernel/irq.c
8861+++ b/arch/powerpc/kernel/irq.c
8862@@ -460,6 +460,8 @@ void migrate_irqs(void)
8863 }
8864 #endif
8865
8866+extern void gr_handle_kernel_exploit(void);
8867+
8868 static inline void check_stack_overflow(void)
8869 {
8870 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8871@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8872 pr_err("do_IRQ: stack overflow: %ld\n",
8873 sp - sizeof(struct thread_info));
8874 dump_stack();
8875+ gr_handle_kernel_exploit();
8876 }
8877 #endif
8878 }
8879diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8880index c94d2e0..992a9ce 100644
8881--- a/arch/powerpc/kernel/module_32.c
8882+++ b/arch/powerpc/kernel/module_32.c
8883@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8884 me->arch.core_plt_section = i;
8885 }
8886 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8887- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8888+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8889 return -ENOEXEC;
8890 }
8891
8892@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8893
8894 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8895 /* Init, or core PLT? */
8896- if (location >= mod->module_core
8897- && location < mod->module_core + mod->core_size)
8898+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8899+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8900 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8901- else
8902+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8903+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8904 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8905+ else {
8906+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8907+ return ~0UL;
8908+ }
8909
8910 /* Find this entry, or if that fails, the next avail. entry */
8911 while (entry->jump[0]) {
8912@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8913 }
8914 #ifdef CONFIG_DYNAMIC_FTRACE
8915 module->arch.tramp =
8916- do_plt_call(module->module_core,
8917+ do_plt_call(module->module_core_rx,
8918 (unsigned long)ftrace_caller,
8919 sechdrs, module);
8920 #endif
8921diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8922index b4cc7be..1fe8bb3 100644
8923--- a/arch/powerpc/kernel/process.c
8924+++ b/arch/powerpc/kernel/process.c
8925@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8926 * Lookup NIP late so we have the best change of getting the
8927 * above info out without failing
8928 */
8929- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8930- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8931+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8932+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8933 #endif
8934 show_stack(current, (unsigned long *) regs->gpr[1]);
8935 if (!user_mode(regs))
8936@@ -1549,10 +1549,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8937 newsp = stack[0];
8938 ip = stack[STACK_FRAME_LR_SAVE];
8939 if (!firstframe || ip != lr) {
8940- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8941+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8942 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8943 if ((ip == rth) && curr_frame >= 0) {
8944- printk(" (%pS)",
8945+ printk(" (%pA)",
8946 (void *)current->ret_stack[curr_frame].ret);
8947 curr_frame--;
8948 }
8949@@ -1572,7 +1572,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8950 struct pt_regs *regs = (struct pt_regs *)
8951 (sp + STACK_FRAME_OVERHEAD);
8952 lr = regs->link;
8953- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8954+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8955 regs->trap, (void *)regs->nip, (void *)lr);
8956 firstframe = 1;
8957 }
8958@@ -1608,49 +1608,3 @@ void notrace __ppc64_runlatch_off(void)
8959 mtspr(SPRN_CTRLT, ctrl);
8960 }
8961 #endif /* CONFIG_PPC64 */
8962-
8963-unsigned long arch_align_stack(unsigned long sp)
8964-{
8965- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8966- sp -= get_random_int() & ~PAGE_MASK;
8967- return sp & ~0xf;
8968-}
8969-
8970-static inline unsigned long brk_rnd(void)
8971-{
8972- unsigned long rnd = 0;
8973-
8974- /* 8MB for 32bit, 1GB for 64bit */
8975- if (is_32bit_task())
8976- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8977- else
8978- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8979-
8980- return rnd << PAGE_SHIFT;
8981-}
8982-
8983-unsigned long arch_randomize_brk(struct mm_struct *mm)
8984-{
8985- unsigned long base = mm->brk;
8986- unsigned long ret;
8987-
8988-#ifdef CONFIG_PPC_STD_MMU_64
8989- /*
8990- * If we are using 1TB segments and we are allowed to randomise
8991- * the heap, we can put it above 1TB so it is backed by a 1TB
8992- * segment. Otherwise the heap will be in the bottom 1TB
8993- * which always uses 256MB segments and this may result in a
8994- * performance penalty.
8995- */
8996- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8997- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8998-#endif
8999-
9000- ret = PAGE_ALIGN(base + brk_rnd());
9001-
9002- if (ret < mm->brk)
9003- return mm->brk;
9004-
9005- return ret;
9006-}
9007-
9008diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9009index f21897b..28c0428 100644
9010--- a/arch/powerpc/kernel/ptrace.c
9011+++ b/arch/powerpc/kernel/ptrace.c
9012@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9013 return ret;
9014 }
9015
9016+#ifdef CONFIG_GRKERNSEC_SETXID
9017+extern void gr_delayed_cred_worker(void);
9018+#endif
9019+
9020 /*
9021 * We must return the syscall number to actually look up in the table.
9022 * This can be -1L to skip running any syscall at all.
9023@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9024
9025 secure_computing_strict(regs->gpr[0]);
9026
9027+#ifdef CONFIG_GRKERNSEC_SETXID
9028+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9029+ gr_delayed_cred_worker();
9030+#endif
9031+
9032 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9033 tracehook_report_syscall_entry(regs))
9034 /*
9035@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9036 {
9037 int step;
9038
9039+#ifdef CONFIG_GRKERNSEC_SETXID
9040+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9041+ gr_delayed_cred_worker();
9042+#endif
9043+
9044 audit_syscall_exit(regs);
9045
9046 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9047diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9048index d3a831a..3a33123 100644
9049--- a/arch/powerpc/kernel/signal_32.c
9050+++ b/arch/powerpc/kernel/signal_32.c
9051@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9052 /* Save user registers on the stack */
9053 frame = &rt_sf->uc.uc_mcontext;
9054 addr = frame;
9055- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9056+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9057 sigret = 0;
9058 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9059 } else {
9060diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9061index c7c24d2..1bf7039 100644
9062--- a/arch/powerpc/kernel/signal_64.c
9063+++ b/arch/powerpc/kernel/signal_64.c
9064@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9065 current->thread.fp_state.fpscr = 0;
9066
9067 /* Set up to return from userspace. */
9068- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9069+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9070 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9071 } else {
9072 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9073diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9074index 19e4744..28a8d7b 100644
9075--- a/arch/powerpc/kernel/traps.c
9076+++ b/arch/powerpc/kernel/traps.c
9077@@ -36,6 +36,7 @@
9078 #include <linux/debugfs.h>
9079 #include <linux/ratelimit.h>
9080 #include <linux/context_tracking.h>
9081+#include <linux/uaccess.h>
9082
9083 #include <asm/emulated_ops.h>
9084 #include <asm/pgtable.h>
9085@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9086 return flags;
9087 }
9088
9089+extern void gr_handle_kernel_exploit(void);
9090+
9091 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9092 int signr)
9093 {
9094@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9095 panic("Fatal exception in interrupt");
9096 if (panic_on_oops)
9097 panic("Fatal exception");
9098+
9099+ gr_handle_kernel_exploit();
9100+
9101 do_exit(signr);
9102 }
9103
9104@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9105 enum ctx_state prev_state = exception_enter();
9106 unsigned int reason = get_reason(regs);
9107
9108+#ifdef CONFIG_PAX_REFCOUNT
9109+ unsigned int bkpt;
9110+ const struct exception_table_entry *entry;
9111+
9112+ if (reason & REASON_ILLEGAL) {
9113+ /* Check if PaX bad instruction */
9114+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9115+ current->thread.trap_nr = 0;
9116+ pax_report_refcount_overflow(regs);
9117+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9118+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9119+ regs->nip = entry->fixup;
9120+ return;
9121+ }
9122+ /* fixup_exception() could not handle */
9123+ goto bail;
9124+ }
9125+ }
9126+#endif
9127+
9128 /* We can now get here via a FP Unavailable exception if the core
9129 * has no FPU, in that case the reason flags will be 0 */
9130
9131diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9132index 305eb0d..accc5b40 100644
9133--- a/arch/powerpc/kernel/vdso.c
9134+++ b/arch/powerpc/kernel/vdso.c
9135@@ -34,6 +34,7 @@
9136 #include <asm/vdso.h>
9137 #include <asm/vdso_datapage.h>
9138 #include <asm/setup.h>
9139+#include <asm/mman.h>
9140
9141 #undef DEBUG
9142
9143@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9144 vdso_base = VDSO32_MBASE;
9145 #endif
9146
9147- current->mm->context.vdso_base = 0;
9148+ current->mm->context.vdso_base = ~0UL;
9149
9150 /* vDSO has a problem and was disabled, just don't "enable" it for the
9151 * process
9152@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9153 vdso_base = get_unmapped_area(NULL, vdso_base,
9154 (vdso_pages << PAGE_SHIFT) +
9155 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9156- 0, 0);
9157+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9158 if (IS_ERR_VALUE(vdso_base)) {
9159 rc = vdso_base;
9160 goto fail_mmapsem;
9161diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9162index 27c0fac..6ec4a32 100644
9163--- a/arch/powerpc/kvm/powerpc.c
9164+++ b/arch/powerpc/kvm/powerpc.c
9165@@ -1402,7 +1402,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9166 }
9167 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9168
9169-int kvm_arch_init(void *opaque)
9170+int kvm_arch_init(const void *opaque)
9171 {
9172 return 0;
9173 }
9174diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9175index 5eea6f3..5d10396 100644
9176--- a/arch/powerpc/lib/usercopy_64.c
9177+++ b/arch/powerpc/lib/usercopy_64.c
9178@@ -9,22 +9,6 @@
9179 #include <linux/module.h>
9180 #include <asm/uaccess.h>
9181
9182-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9183-{
9184- if (likely(access_ok(VERIFY_READ, from, n)))
9185- n = __copy_from_user(to, from, n);
9186- else
9187- memset(to, 0, n);
9188- return n;
9189-}
9190-
9191-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9192-{
9193- if (likely(access_ok(VERIFY_WRITE, to, n)))
9194- n = __copy_to_user(to, from, n);
9195- return n;
9196-}
9197-
9198 unsigned long copy_in_user(void __user *to, const void __user *from,
9199 unsigned long n)
9200 {
9201@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9202 return n;
9203 }
9204
9205-EXPORT_SYMBOL(copy_from_user);
9206-EXPORT_SYMBOL(copy_to_user);
9207 EXPORT_SYMBOL(copy_in_user);
9208
9209diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9210index b396868..3eb6b9f 100644
9211--- a/arch/powerpc/mm/fault.c
9212+++ b/arch/powerpc/mm/fault.c
9213@@ -33,6 +33,10 @@
9214 #include <linux/ratelimit.h>
9215 #include <linux/context_tracking.h>
9216 #include <linux/hugetlb.h>
9217+#include <linux/slab.h>
9218+#include <linux/pagemap.h>
9219+#include <linux/compiler.h>
9220+#include <linux/unistd.h>
9221
9222 #include <asm/firmware.h>
9223 #include <asm/page.h>
9224@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9225 }
9226 #endif
9227
9228+#ifdef CONFIG_PAX_PAGEEXEC
9229+/*
9230+ * PaX: decide what to do with offenders (regs->nip = fault address)
9231+ *
9232+ * returns 1 when task should be killed
9233+ */
9234+static int pax_handle_fetch_fault(struct pt_regs *regs)
9235+{
9236+ return 1;
9237+}
9238+
9239+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9240+{
9241+ unsigned long i;
9242+
9243+ printk(KERN_ERR "PAX: bytes at PC: ");
9244+ for (i = 0; i < 5; i++) {
9245+ unsigned int c;
9246+ if (get_user(c, (unsigned int __user *)pc+i))
9247+ printk(KERN_CONT "???????? ");
9248+ else
9249+ printk(KERN_CONT "%08x ", c);
9250+ }
9251+ printk("\n");
9252+}
9253+#endif
9254+
9255 /*
9256 * Check whether the instruction at regs->nip is a store using
9257 * an update addressing form which will update r1.
9258@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9259 * indicate errors in DSISR but can validly be set in SRR1.
9260 */
9261 if (trap == 0x400)
9262- error_code &= 0x48200000;
9263+ error_code &= 0x58200000;
9264 else
9265 is_write = error_code & DSISR_ISSTORE;
9266 #else
9267@@ -383,12 +414,16 @@ good_area:
9268 * "undefined". Of those that can be set, this is the only
9269 * one which seems bad.
9270 */
9271- if (error_code & 0x10000000)
9272+ if (error_code & DSISR_GUARDED)
9273 /* Guarded storage error. */
9274 goto bad_area;
9275 #endif /* CONFIG_8xx */
9276
9277 if (is_exec) {
9278+#ifdef CONFIG_PPC_STD_MMU
9279+ if (error_code & DSISR_GUARDED)
9280+ goto bad_area;
9281+#endif
9282 /*
9283 * Allow execution from readable areas if the MMU does not
9284 * provide separate controls over reading and executing.
9285@@ -483,6 +518,23 @@ bad_area:
9286 bad_area_nosemaphore:
9287 /* User mode accesses cause a SIGSEGV */
9288 if (user_mode(regs)) {
9289+
9290+#ifdef CONFIG_PAX_PAGEEXEC
9291+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9292+#ifdef CONFIG_PPC_STD_MMU
9293+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9294+#else
9295+ if (is_exec && regs->nip == address) {
9296+#endif
9297+ switch (pax_handle_fetch_fault(regs)) {
9298+ }
9299+
9300+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9301+ do_group_exit(SIGKILL);
9302+ }
9303+ }
9304+#endif
9305+
9306 _exception(SIGSEGV, regs, code, address);
9307 goto bail;
9308 }
9309diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9310index cb8bdbe..cde4bc7 100644
9311--- a/arch/powerpc/mm/mmap.c
9312+++ b/arch/powerpc/mm/mmap.c
9313@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9314 return sysctl_legacy_va_layout;
9315 }
9316
9317-static unsigned long mmap_rnd(void)
9318+static unsigned long mmap_rnd(struct mm_struct *mm)
9319 {
9320 unsigned long rnd = 0;
9321
9322+#ifdef CONFIG_PAX_RANDMMAP
9323+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9324+#endif
9325+
9326 if (current->flags & PF_RANDOMIZE) {
9327 /* 8MB for 32bit, 1GB for 64bit */
9328 if (is_32bit_task())
9329@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9330 return rnd << PAGE_SHIFT;
9331 }
9332
9333-static inline unsigned long mmap_base(void)
9334+static inline unsigned long mmap_base(struct mm_struct *mm)
9335 {
9336 unsigned long gap = rlimit(RLIMIT_STACK);
9337
9338@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9339 else if (gap > MAX_GAP)
9340 gap = MAX_GAP;
9341
9342- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9343+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9344 }
9345
9346 /*
9347@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9348 */
9349 if (mmap_is_legacy()) {
9350 mm->mmap_base = TASK_UNMAPPED_BASE;
9351+
9352+#ifdef CONFIG_PAX_RANDMMAP
9353+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9354+ mm->mmap_base += mm->delta_mmap;
9355+#endif
9356+
9357 mm->get_unmapped_area = arch_get_unmapped_area;
9358 } else {
9359- mm->mmap_base = mmap_base();
9360+ mm->mmap_base = mmap_base(mm);
9361+
9362+#ifdef CONFIG_PAX_RANDMMAP
9363+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9364+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9365+#endif
9366+
9367 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9368 }
9369 }
9370diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9371index 0f432a7..abfe841 100644
9372--- a/arch/powerpc/mm/slice.c
9373+++ b/arch/powerpc/mm/slice.c
9374@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9375 if ((mm->task_size - len) < addr)
9376 return 0;
9377 vma = find_vma(mm, addr);
9378- return (!vma || (addr + len) <= vma->vm_start);
9379+ return check_heap_stack_gap(vma, addr, len, 0);
9380 }
9381
9382 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9383@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9384 info.align_offset = 0;
9385
9386 addr = TASK_UNMAPPED_BASE;
9387+
9388+#ifdef CONFIG_PAX_RANDMMAP
9389+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9390+ addr += mm->delta_mmap;
9391+#endif
9392+
9393 while (addr < TASK_SIZE) {
9394 info.low_limit = addr;
9395 if (!slice_scan_available(addr, available, 1, &addr))
9396@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9397 if (fixed && addr > (mm->task_size - len))
9398 return -ENOMEM;
9399
9400+#ifdef CONFIG_PAX_RANDMMAP
9401+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9402+ addr = 0;
9403+#endif
9404+
9405 /* If hint, make sure it matches our alignment restrictions */
9406 if (!fixed && addr) {
9407 addr = _ALIGN_UP(addr, 1ul << pshift);
9408diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9409index d966bbe..372124a 100644
9410--- a/arch/powerpc/platforms/cell/spufs/file.c
9411+++ b/arch/powerpc/platforms/cell/spufs/file.c
9412@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9413 return VM_FAULT_NOPAGE;
9414 }
9415
9416-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9417+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9418 unsigned long address,
9419- void *buf, int len, int write)
9420+ void *buf, size_t len, int write)
9421 {
9422 struct spu_context *ctx = vma->vm_file->private_data;
9423 unsigned long offset = address - vma->vm_start;
9424diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9425index fa934fe..c296056 100644
9426--- a/arch/s390/include/asm/atomic.h
9427+++ b/arch/s390/include/asm/atomic.h
9428@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9429 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9430 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9431
9432+#define atomic64_read_unchecked(v) atomic64_read(v)
9433+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9434+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9435+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9436+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9437+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9438+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9439+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9440+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9441+
9442 #endif /* __ARCH_S390_ATOMIC__ */
9443diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9444index 8d72471..5322500 100644
9445--- a/arch/s390/include/asm/barrier.h
9446+++ b/arch/s390/include/asm/barrier.h
9447@@ -42,7 +42,7 @@
9448 do { \
9449 compiletime_assert_atomic_type(*p); \
9450 barrier(); \
9451- ACCESS_ONCE(*p) = (v); \
9452+ ACCESS_ONCE_RW(*p) = (v); \
9453 } while (0)
9454
9455 #define smp_load_acquire(p) \
9456diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9457index 4d7ccac..d03d0ad 100644
9458--- a/arch/s390/include/asm/cache.h
9459+++ b/arch/s390/include/asm/cache.h
9460@@ -9,8 +9,10 @@
9461 #ifndef __ARCH_S390_CACHE_H
9462 #define __ARCH_S390_CACHE_H
9463
9464-#define L1_CACHE_BYTES 256
9465+#include <linux/const.h>
9466+
9467 #define L1_CACHE_SHIFT 8
9468+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9469 #define NET_SKB_PAD 32
9470
9471 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9472diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9473index c9c875d..b4b0e4c 100644
9474--- a/arch/s390/include/asm/elf.h
9475+++ b/arch/s390/include/asm/elf.h
9476@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9477 the loader. We need to make sure that it is out of the way of the program
9478 that it will "exec", and that there is sufficient room for the brk. */
9479
9480-extern unsigned long randomize_et_dyn(void);
9481-#define ELF_ET_DYN_BASE randomize_et_dyn()
9482+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9483+
9484+#ifdef CONFIG_PAX_ASLR
9485+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9486+
9487+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9488+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9489+#endif
9490
9491 /* This yields a mask that user programs can use to figure out what
9492 instruction set this CPU supports. */
9493@@ -225,9 +231,6 @@ struct linux_binprm;
9494 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9495 int arch_setup_additional_pages(struct linux_binprm *, int);
9496
9497-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9498-#define arch_randomize_brk arch_randomize_brk
9499-
9500 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9501
9502 #endif
9503diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9504index c4a93d6..4d2a9b4 100644
9505--- a/arch/s390/include/asm/exec.h
9506+++ b/arch/s390/include/asm/exec.h
9507@@ -7,6 +7,6 @@
9508 #ifndef __ASM_EXEC_H
9509 #define __ASM_EXEC_H
9510
9511-extern unsigned long arch_align_stack(unsigned long sp);
9512+#define arch_align_stack(x) ((x) & ~0xfUL)
9513
9514 #endif /* __ASM_EXEC_H */
9515diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9516index cd4c68e..6764641 100644
9517--- a/arch/s390/include/asm/uaccess.h
9518+++ b/arch/s390/include/asm/uaccess.h
9519@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9520 __range_ok((unsigned long)(addr), (size)); \
9521 })
9522
9523+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9524 #define access_ok(type, addr, size) __access_ok(addr, size)
9525
9526 /*
9527@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9528 copy_to_user(void __user *to, const void *from, unsigned long n)
9529 {
9530 might_fault();
9531+
9532+ if ((long)n < 0)
9533+ return n;
9534+
9535 return __copy_to_user(to, from, n);
9536 }
9537
9538@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9539 static inline unsigned long __must_check
9540 copy_from_user(void *to, const void __user *from, unsigned long n)
9541 {
9542- unsigned int sz = __compiletime_object_size(to);
9543+ size_t sz = __compiletime_object_size(to);
9544
9545 might_fault();
9546- if (unlikely(sz != -1 && sz < n)) {
9547+
9548+ if ((long)n < 0)
9549+ return n;
9550+
9551+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9552 copy_from_user_overflow();
9553 return n;
9554 }
9555diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9556index 2ca9586..55682a9 100644
9557--- a/arch/s390/kernel/module.c
9558+++ b/arch/s390/kernel/module.c
9559@@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9560
9561 /* Increase core size by size of got & plt and set start
9562 offsets for got and plt. */
9563- me->core_size = ALIGN(me->core_size, 4);
9564- me->arch.got_offset = me->core_size;
9565- me->core_size += me->arch.got_size;
9566- me->arch.plt_offset = me->core_size;
9567- me->core_size += me->arch.plt_size;
9568+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9569+ me->arch.got_offset = me->core_size_rw;
9570+ me->core_size_rw += me->arch.got_size;
9571+ me->arch.plt_offset = me->core_size_rx;
9572+ me->core_size_rx += me->arch.plt_size;
9573 return 0;
9574 }
9575
9576@@ -285,7 +285,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9577 if (info->got_initialized == 0) {
9578 Elf_Addr *gotent;
9579
9580- gotent = me->module_core + me->arch.got_offset +
9581+ gotent = me->module_core_rw + me->arch.got_offset +
9582 info->got_offset;
9583 *gotent = val;
9584 info->got_initialized = 1;
9585@@ -308,7 +308,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9586 rc = apply_rela_bits(loc, val, 0, 64, 0);
9587 else if (r_type == R_390_GOTENT ||
9588 r_type == R_390_GOTPLTENT) {
9589- val += (Elf_Addr) me->module_core - loc;
9590+ val += (Elf_Addr) me->module_core_rw - loc;
9591 rc = apply_rela_bits(loc, val, 1, 32, 1);
9592 }
9593 break;
9594@@ -321,7 +321,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9595 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9596 if (info->plt_initialized == 0) {
9597 unsigned int *ip;
9598- ip = me->module_core + me->arch.plt_offset +
9599+ ip = me->module_core_rx + me->arch.plt_offset +
9600 info->plt_offset;
9601 #ifndef CONFIG_64BIT
9602 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9603@@ -346,7 +346,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9604 val - loc + 0xffffUL < 0x1ffffeUL) ||
9605 (r_type == R_390_PLT32DBL &&
9606 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9607- val = (Elf_Addr) me->module_core +
9608+ val = (Elf_Addr) me->module_core_rx +
9609 me->arch.plt_offset +
9610 info->plt_offset;
9611 val += rela->r_addend - loc;
9612@@ -368,7 +368,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9613 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9614 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9615 val = val + rela->r_addend -
9616- ((Elf_Addr) me->module_core + me->arch.got_offset);
9617+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9618 if (r_type == R_390_GOTOFF16)
9619 rc = apply_rela_bits(loc, val, 0, 16, 0);
9620 else if (r_type == R_390_GOTOFF32)
9621@@ -378,7 +378,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9622 break;
9623 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9624 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9625- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9626+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9627 rela->r_addend - loc;
9628 if (r_type == R_390_GOTPC)
9629 rc = apply_rela_bits(loc, val, 1, 32, 0);
9630diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9631index 13fc097..84d375f 100644
9632--- a/arch/s390/kernel/process.c
9633+++ b/arch/s390/kernel/process.c
9634@@ -227,27 +227,3 @@ unsigned long get_wchan(struct task_struct *p)
9635 }
9636 return 0;
9637 }
9638-
9639-unsigned long arch_align_stack(unsigned long sp)
9640-{
9641- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9642- sp -= get_random_int() & ~PAGE_MASK;
9643- return sp & ~0xf;
9644-}
9645-
9646-static inline unsigned long brk_rnd(void)
9647-{
9648- /* 8MB for 32bit, 1GB for 64bit */
9649- if (is_32bit_task())
9650- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9651- else
9652- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9653-}
9654-
9655-unsigned long arch_randomize_brk(struct mm_struct *mm)
9656-{
9657- unsigned long ret;
9658-
9659- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9660- return (ret > mm->brk) ? ret : mm->brk;
9661-}
9662diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9663index 179a2c2..371e85c 100644
9664--- a/arch/s390/mm/mmap.c
9665+++ b/arch/s390/mm/mmap.c
9666@@ -204,9 +204,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9667 */
9668 if (mmap_is_legacy()) {
9669 mm->mmap_base = mmap_base_legacy();
9670+
9671+#ifdef CONFIG_PAX_RANDMMAP
9672+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9673+ mm->mmap_base += mm->delta_mmap;
9674+#endif
9675+
9676 mm->get_unmapped_area = arch_get_unmapped_area;
9677 } else {
9678 mm->mmap_base = mmap_base();
9679+
9680+#ifdef CONFIG_PAX_RANDMMAP
9681+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9682+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9683+#endif
9684+
9685 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9686 }
9687 }
9688@@ -279,9 +291,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9689 */
9690 if (mmap_is_legacy()) {
9691 mm->mmap_base = mmap_base_legacy();
9692+
9693+#ifdef CONFIG_PAX_RANDMMAP
9694+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9695+ mm->mmap_base += mm->delta_mmap;
9696+#endif
9697+
9698 mm->get_unmapped_area = s390_get_unmapped_area;
9699 } else {
9700 mm->mmap_base = mmap_base();
9701+
9702+#ifdef CONFIG_PAX_RANDMMAP
9703+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9704+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9705+#endif
9706+
9707 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9708 }
9709 }
9710diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9711index ae3d59f..f65f075 100644
9712--- a/arch/score/include/asm/cache.h
9713+++ b/arch/score/include/asm/cache.h
9714@@ -1,7 +1,9 @@
9715 #ifndef _ASM_SCORE_CACHE_H
9716 #define _ASM_SCORE_CACHE_H
9717
9718+#include <linux/const.h>
9719+
9720 #define L1_CACHE_SHIFT 4
9721-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9722+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9723
9724 #endif /* _ASM_SCORE_CACHE_H */
9725diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9726index f9f3cd5..58ff438 100644
9727--- a/arch/score/include/asm/exec.h
9728+++ b/arch/score/include/asm/exec.h
9729@@ -1,6 +1,6 @@
9730 #ifndef _ASM_SCORE_EXEC_H
9731 #define _ASM_SCORE_EXEC_H
9732
9733-extern unsigned long arch_align_stack(unsigned long sp);
9734+#define arch_align_stack(x) (x)
9735
9736 #endif /* _ASM_SCORE_EXEC_H */
9737diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9738index a1519ad3..e8ac1ff 100644
9739--- a/arch/score/kernel/process.c
9740+++ b/arch/score/kernel/process.c
9741@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9742
9743 return task_pt_regs(task)->cp0_epc;
9744 }
9745-
9746-unsigned long arch_align_stack(unsigned long sp)
9747-{
9748- return sp;
9749-}
9750diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9751index ef9e555..331bd29 100644
9752--- a/arch/sh/include/asm/cache.h
9753+++ b/arch/sh/include/asm/cache.h
9754@@ -9,10 +9,11 @@
9755 #define __ASM_SH_CACHE_H
9756 #ifdef __KERNEL__
9757
9758+#include <linux/const.h>
9759 #include <linux/init.h>
9760 #include <cpu/cache.h>
9761
9762-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9763+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9764
9765 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9766
9767diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9768index 6777177..cb5e44f 100644
9769--- a/arch/sh/mm/mmap.c
9770+++ b/arch/sh/mm/mmap.c
9771@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9772 struct mm_struct *mm = current->mm;
9773 struct vm_area_struct *vma;
9774 int do_colour_align;
9775+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9776 struct vm_unmapped_area_info info;
9777
9778 if (flags & MAP_FIXED) {
9779@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9780 if (filp || (flags & MAP_SHARED))
9781 do_colour_align = 1;
9782
9783+#ifdef CONFIG_PAX_RANDMMAP
9784+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9785+#endif
9786+
9787 if (addr) {
9788 if (do_colour_align)
9789 addr = COLOUR_ALIGN(addr, pgoff);
9790@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9791 addr = PAGE_ALIGN(addr);
9792
9793 vma = find_vma(mm, addr);
9794- if (TASK_SIZE - len >= addr &&
9795- (!vma || addr + len <= vma->vm_start))
9796+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9797 return addr;
9798 }
9799
9800 info.flags = 0;
9801 info.length = len;
9802- info.low_limit = TASK_UNMAPPED_BASE;
9803+ info.low_limit = mm->mmap_base;
9804 info.high_limit = TASK_SIZE;
9805 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9806 info.align_offset = pgoff << PAGE_SHIFT;
9807@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9808 struct mm_struct *mm = current->mm;
9809 unsigned long addr = addr0;
9810 int do_colour_align;
9811+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9812 struct vm_unmapped_area_info info;
9813
9814 if (flags & MAP_FIXED) {
9815@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9816 if (filp || (flags & MAP_SHARED))
9817 do_colour_align = 1;
9818
9819+#ifdef CONFIG_PAX_RANDMMAP
9820+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9821+#endif
9822+
9823 /* requesting a specific address */
9824 if (addr) {
9825 if (do_colour_align)
9826@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9827 addr = PAGE_ALIGN(addr);
9828
9829 vma = find_vma(mm, addr);
9830- if (TASK_SIZE - len >= addr &&
9831- (!vma || addr + len <= vma->vm_start))
9832+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9833 return addr;
9834 }
9835
9836@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9837 VM_BUG_ON(addr != -ENOMEM);
9838 info.flags = 0;
9839 info.low_limit = TASK_UNMAPPED_BASE;
9840+
9841+#ifdef CONFIG_PAX_RANDMMAP
9842+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9843+ info.low_limit += mm->delta_mmap;
9844+#endif
9845+
9846 info.high_limit = TASK_SIZE;
9847 addr = vm_unmapped_area(&info);
9848 }
9849diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9850index 4082749..fd97781 100644
9851--- a/arch/sparc/include/asm/atomic_64.h
9852+++ b/arch/sparc/include/asm/atomic_64.h
9853@@ -15,18 +15,38 @@
9854 #define ATOMIC64_INIT(i) { (i) }
9855
9856 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9857+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9858+{
9859+ return ACCESS_ONCE(v->counter);
9860+}
9861 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9862+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9863+{
9864+ return ACCESS_ONCE(v->counter);
9865+}
9866
9867 #define atomic_set(v, i) (((v)->counter) = i)
9868+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9869+{
9870+ v->counter = i;
9871+}
9872 #define atomic64_set(v, i) (((v)->counter) = i)
9873+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9874+{
9875+ v->counter = i;
9876+}
9877
9878-#define ATOMIC_OP(op) \
9879-void atomic_##op(int, atomic_t *); \
9880-void atomic64_##op(long, atomic64_t *);
9881+#define __ATOMIC_OP(op, suffix) \
9882+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9883+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9884
9885-#define ATOMIC_OP_RETURN(op) \
9886-int atomic_##op##_return(int, atomic_t *); \
9887-long atomic64_##op##_return(long, atomic64_t *);
9888+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9889+
9890+#define __ATOMIC_OP_RETURN(op, suffix) \
9891+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9892+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9893+
9894+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9895
9896 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9897
9898@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9899
9900 #undef ATOMIC_OPS
9901 #undef ATOMIC_OP_RETURN
9902+#undef __ATOMIC_OP_RETURN
9903 #undef ATOMIC_OP
9904+#undef __ATOMIC_OP
9905
9906 #define atomic_dec_return(v) atomic_sub_return(1, v)
9907 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9908
9909 #define atomic_inc_return(v) atomic_add_return(1, v)
9910+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9911+{
9912+ return atomic_add_return_unchecked(1, v);
9913+}
9914 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9915+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9916+{
9917+ return atomic64_add_return_unchecked(1, v);
9918+}
9919
9920 /*
9921 * atomic_inc_and_test - increment and test
9922@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9923 * other cases.
9924 */
9925 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9926+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9927+{
9928+ return atomic_inc_return_unchecked(v) == 0;
9929+}
9930 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9931
9932 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9933@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9934 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9935
9936 #define atomic_inc(v) atomic_add(1, v)
9937+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9938+{
9939+ atomic_add_unchecked(1, v);
9940+}
9941 #define atomic64_inc(v) atomic64_add(1, v)
9942+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9943+{
9944+ atomic64_add_unchecked(1, v);
9945+}
9946
9947 #define atomic_dec(v) atomic_sub(1, v)
9948+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9949+{
9950+ atomic_sub_unchecked(1, v);
9951+}
9952 #define atomic64_dec(v) atomic64_sub(1, v)
9953+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9954+{
9955+ atomic64_sub_unchecked(1, v);
9956+}
9957
9958 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9959 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9960
9961 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9962+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9963+{
9964+ return cmpxchg(&v->counter, old, new);
9965+}
9966 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9967+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9968+{
9969+ return xchg(&v->counter, new);
9970+}
9971
9972 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9973 {
9974- int c, old;
9975+ int c, old, new;
9976 c = atomic_read(v);
9977 for (;;) {
9978- if (unlikely(c == (u)))
9979+ if (unlikely(c == u))
9980 break;
9981- old = atomic_cmpxchg((v), c, c + (a));
9982+
9983+ asm volatile("addcc %2, %0, %0\n"
9984+
9985+#ifdef CONFIG_PAX_REFCOUNT
9986+ "tvs %%icc, 6\n"
9987+#endif
9988+
9989+ : "=r" (new)
9990+ : "0" (c), "ir" (a)
9991+ : "cc");
9992+
9993+ old = atomic_cmpxchg(v, c, new);
9994 if (likely(old == c))
9995 break;
9996 c = old;
9997@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9998 #define atomic64_cmpxchg(v, o, n) \
9999 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10000 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10001+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10002+{
10003+ return xchg(&v->counter, new);
10004+}
10005
10006 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10007 {
10008- long c, old;
10009+ long c, old, new;
10010 c = atomic64_read(v);
10011 for (;;) {
10012- if (unlikely(c == (u)))
10013+ if (unlikely(c == u))
10014 break;
10015- old = atomic64_cmpxchg((v), c, c + (a));
10016+
10017+ asm volatile("addcc %2, %0, %0\n"
10018+
10019+#ifdef CONFIG_PAX_REFCOUNT
10020+ "tvs %%xcc, 6\n"
10021+#endif
10022+
10023+ : "=r" (new)
10024+ : "0" (c), "ir" (a)
10025+ : "cc");
10026+
10027+ old = atomic64_cmpxchg(v, c, new);
10028 if (likely(old == c))
10029 break;
10030 c = old;
10031 }
10032- return c != (u);
10033+ return c != u;
10034 }
10035
10036 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10037diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10038index 7664894..45a974b 100644
10039--- a/arch/sparc/include/asm/barrier_64.h
10040+++ b/arch/sparc/include/asm/barrier_64.h
10041@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10042 do { \
10043 compiletime_assert_atomic_type(*p); \
10044 barrier(); \
10045- ACCESS_ONCE(*p) = (v); \
10046+ ACCESS_ONCE_RW(*p) = (v); \
10047 } while (0)
10048
10049 #define smp_load_acquire(p) \
10050diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10051index 5bb6991..5c2132e 100644
10052--- a/arch/sparc/include/asm/cache.h
10053+++ b/arch/sparc/include/asm/cache.h
10054@@ -7,10 +7,12 @@
10055 #ifndef _SPARC_CACHE_H
10056 #define _SPARC_CACHE_H
10057
10058+#include <linux/const.h>
10059+
10060 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10061
10062 #define L1_CACHE_SHIFT 5
10063-#define L1_CACHE_BYTES 32
10064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10065
10066 #ifdef CONFIG_SPARC32
10067 #define SMP_CACHE_BYTES_SHIFT 5
10068diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10069index a24e41f..47677ff 100644
10070--- a/arch/sparc/include/asm/elf_32.h
10071+++ b/arch/sparc/include/asm/elf_32.h
10072@@ -114,6 +114,13 @@ typedef struct {
10073
10074 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10075
10076+#ifdef CONFIG_PAX_ASLR
10077+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10078+
10079+#define PAX_DELTA_MMAP_LEN 16
10080+#define PAX_DELTA_STACK_LEN 16
10081+#endif
10082+
10083 /* This yields a mask that user programs can use to figure out what
10084 instruction set this cpu supports. This can NOT be done in userspace
10085 on Sparc. */
10086diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10087index 370ca1e..d4f4a98 100644
10088--- a/arch/sparc/include/asm/elf_64.h
10089+++ b/arch/sparc/include/asm/elf_64.h
10090@@ -189,6 +189,13 @@ typedef struct {
10091 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10092 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10093
10094+#ifdef CONFIG_PAX_ASLR
10095+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10096+
10097+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10098+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10099+#endif
10100+
10101 extern unsigned long sparc64_elf_hwcap;
10102 #define ELF_HWCAP sparc64_elf_hwcap
10103
10104diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10105index a3890da..f6a408e 100644
10106--- a/arch/sparc/include/asm/pgalloc_32.h
10107+++ b/arch/sparc/include/asm/pgalloc_32.h
10108@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10109 }
10110
10111 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10112+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10113
10114 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10115 unsigned long address)
10116diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10117index 5e31871..13469c6 100644
10118--- a/arch/sparc/include/asm/pgalloc_64.h
10119+++ b/arch/sparc/include/asm/pgalloc_64.h
10120@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10121 }
10122
10123 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10124+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10125
10126 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10127 {
10128@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10129 }
10130
10131 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10132+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10133
10134 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10135 {
10136diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10137index 59ba6f6..4518128 100644
10138--- a/arch/sparc/include/asm/pgtable.h
10139+++ b/arch/sparc/include/asm/pgtable.h
10140@@ -5,4 +5,8 @@
10141 #else
10142 #include <asm/pgtable_32.h>
10143 #endif
10144+
10145+#define ktla_ktva(addr) (addr)
10146+#define ktva_ktla(addr) (addr)
10147+
10148 #endif
10149diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10150index f06b36a..bca3189 100644
10151--- a/arch/sparc/include/asm/pgtable_32.h
10152+++ b/arch/sparc/include/asm/pgtable_32.h
10153@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10154 #define PAGE_SHARED SRMMU_PAGE_SHARED
10155 #define PAGE_COPY SRMMU_PAGE_COPY
10156 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10157+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10158+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10159+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10160 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10161
10162 /* Top-level page directory - dummy used by init-mm.
10163@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10164
10165 /* xwr */
10166 #define __P000 PAGE_NONE
10167-#define __P001 PAGE_READONLY
10168-#define __P010 PAGE_COPY
10169-#define __P011 PAGE_COPY
10170+#define __P001 PAGE_READONLY_NOEXEC
10171+#define __P010 PAGE_COPY_NOEXEC
10172+#define __P011 PAGE_COPY_NOEXEC
10173 #define __P100 PAGE_READONLY
10174 #define __P101 PAGE_READONLY
10175 #define __P110 PAGE_COPY
10176 #define __P111 PAGE_COPY
10177
10178 #define __S000 PAGE_NONE
10179-#define __S001 PAGE_READONLY
10180-#define __S010 PAGE_SHARED
10181-#define __S011 PAGE_SHARED
10182+#define __S001 PAGE_READONLY_NOEXEC
10183+#define __S010 PAGE_SHARED_NOEXEC
10184+#define __S011 PAGE_SHARED_NOEXEC
10185 #define __S100 PAGE_READONLY
10186 #define __S101 PAGE_READONLY
10187 #define __S110 PAGE_SHARED
10188diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10189index ae51a11..eadfd03 100644
10190--- a/arch/sparc/include/asm/pgtsrmmu.h
10191+++ b/arch/sparc/include/asm/pgtsrmmu.h
10192@@ -111,6 +111,11 @@
10193 SRMMU_EXEC | SRMMU_REF)
10194 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10195 SRMMU_EXEC | SRMMU_REF)
10196+
10197+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10198+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10199+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10200+
10201 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10202 SRMMU_DIRTY | SRMMU_REF)
10203
10204diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10205index 29d64b1..4272fe8 100644
10206--- a/arch/sparc/include/asm/setup.h
10207+++ b/arch/sparc/include/asm/setup.h
10208@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10209 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10210
10211 /* init_64.c */
10212-extern atomic_t dcpage_flushes;
10213-extern atomic_t dcpage_flushes_xcall;
10214+extern atomic_unchecked_t dcpage_flushes;
10215+extern atomic_unchecked_t dcpage_flushes_xcall;
10216
10217 extern int sysctl_tsb_ratio;
10218 #endif
10219diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10220index 9689176..63c18ea 100644
10221--- a/arch/sparc/include/asm/spinlock_64.h
10222+++ b/arch/sparc/include/asm/spinlock_64.h
10223@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10224
10225 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10226
10227-static void inline arch_read_lock(arch_rwlock_t *lock)
10228+static inline void arch_read_lock(arch_rwlock_t *lock)
10229 {
10230 unsigned long tmp1, tmp2;
10231
10232 __asm__ __volatile__ (
10233 "1: ldsw [%2], %0\n"
10234 " brlz,pn %0, 2f\n"
10235-"4: add %0, 1, %1\n"
10236+"4: addcc %0, 1, %1\n"
10237+
10238+#ifdef CONFIG_PAX_REFCOUNT
10239+" tvs %%icc, 6\n"
10240+#endif
10241+
10242 " cas [%2], %0, %1\n"
10243 " cmp %0, %1\n"
10244 " bne,pn %%icc, 1b\n"
10245@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10246 " .previous"
10247 : "=&r" (tmp1), "=&r" (tmp2)
10248 : "r" (lock)
10249- : "memory");
10250+ : "memory", "cc");
10251 }
10252
10253-static int inline arch_read_trylock(arch_rwlock_t *lock)
10254+static inline int arch_read_trylock(arch_rwlock_t *lock)
10255 {
10256 int tmp1, tmp2;
10257
10258@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10259 "1: ldsw [%2], %0\n"
10260 " brlz,a,pn %0, 2f\n"
10261 " mov 0, %0\n"
10262-" add %0, 1, %1\n"
10263+" addcc %0, 1, %1\n"
10264+
10265+#ifdef CONFIG_PAX_REFCOUNT
10266+" tvs %%icc, 6\n"
10267+#endif
10268+
10269 " cas [%2], %0, %1\n"
10270 " cmp %0, %1\n"
10271 " bne,pn %%icc, 1b\n"
10272@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10273 return tmp1;
10274 }
10275
10276-static void inline arch_read_unlock(arch_rwlock_t *lock)
10277+static inline void arch_read_unlock(arch_rwlock_t *lock)
10278 {
10279 unsigned long tmp1, tmp2;
10280
10281 __asm__ __volatile__(
10282 "1: lduw [%2], %0\n"
10283-" sub %0, 1, %1\n"
10284+" subcc %0, 1, %1\n"
10285+
10286+#ifdef CONFIG_PAX_REFCOUNT
10287+" tvs %%icc, 6\n"
10288+#endif
10289+
10290 " cas [%2], %0, %1\n"
10291 " cmp %0, %1\n"
10292 " bne,pn %%xcc, 1b\n"
10293@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10294 : "memory");
10295 }
10296
10297-static void inline arch_write_lock(arch_rwlock_t *lock)
10298+static inline void arch_write_lock(arch_rwlock_t *lock)
10299 {
10300 unsigned long mask, tmp1, tmp2;
10301
10302@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10303 : "memory");
10304 }
10305
10306-static void inline arch_write_unlock(arch_rwlock_t *lock)
10307+static inline void arch_write_unlock(arch_rwlock_t *lock)
10308 {
10309 __asm__ __volatile__(
10310 " stw %%g0, [%0]"
10311@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10312 : "memory");
10313 }
10314
10315-static int inline arch_write_trylock(arch_rwlock_t *lock)
10316+static inline int arch_write_trylock(arch_rwlock_t *lock)
10317 {
10318 unsigned long mask, tmp1, tmp2, result;
10319
10320diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10321index fd7bd0a..2e2fa7a 100644
10322--- a/arch/sparc/include/asm/thread_info_32.h
10323+++ b/arch/sparc/include/asm/thread_info_32.h
10324@@ -47,6 +47,7 @@ struct thread_info {
10325 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10326 unsigned long rwbuf_stkptrs[NSWINS];
10327 unsigned long w_saved;
10328+ unsigned long lowest_stack;
10329 };
10330
10331 /*
10332diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10333index ff45516..73001ab 100644
10334--- a/arch/sparc/include/asm/thread_info_64.h
10335+++ b/arch/sparc/include/asm/thread_info_64.h
10336@@ -61,6 +61,8 @@ struct thread_info {
10337 struct pt_regs *kern_una_regs;
10338 unsigned int kern_una_insn;
10339
10340+ unsigned long lowest_stack;
10341+
10342 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10343 __attribute__ ((aligned(64)));
10344 };
10345@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10346 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10347 /* flag bit 4 is available */
10348 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10349-/* flag bit 6 is available */
10350+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10351 #define TIF_32BIT 7 /* 32-bit binary */
10352 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10353 #define TIF_SECCOMP 9 /* secure computing */
10354 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10355 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10356+
10357 /* NOTE: Thread flags >= 12 should be ones we have no interest
10358 * in using in assembly, else we can't use the mask as
10359 * an immediate value in instructions such as andcc.
10360@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10361 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10362 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10363 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10364+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10365
10366 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10367 _TIF_DO_NOTIFY_RESUME_MASK | \
10368 _TIF_NEED_RESCHED)
10369 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10370
10371+#define _TIF_WORK_SYSCALL \
10372+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10373+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10374+
10375 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10376
10377 /*
10378diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10379index bd56c28..4b63d83 100644
10380--- a/arch/sparc/include/asm/uaccess.h
10381+++ b/arch/sparc/include/asm/uaccess.h
10382@@ -1,5 +1,6 @@
10383 #ifndef ___ASM_SPARC_UACCESS_H
10384 #define ___ASM_SPARC_UACCESS_H
10385+
10386 #if defined(__sparc__) && defined(__arch64__)
10387 #include <asm/uaccess_64.h>
10388 #else
10389diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10390index 64ee103..388aef0 100644
10391--- a/arch/sparc/include/asm/uaccess_32.h
10392+++ b/arch/sparc/include/asm/uaccess_32.h
10393@@ -47,6 +47,7 @@
10394 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10395 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10396 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10397+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10398 #define access_ok(type, addr, size) \
10399 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10400
10401@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10402
10403 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10404 {
10405- if (n && __access_ok((unsigned long) to, n))
10406+ if ((long)n < 0)
10407+ return n;
10408+
10409+ if (n && __access_ok((unsigned long) to, n)) {
10410+ if (!__builtin_constant_p(n))
10411+ check_object_size(from, n, true);
10412 return __copy_user(to, (__force void __user *) from, n);
10413- else
10414+ } else
10415 return n;
10416 }
10417
10418 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10419 {
10420+ if ((long)n < 0)
10421+ return n;
10422+
10423+ if (!__builtin_constant_p(n))
10424+ check_object_size(from, n, true);
10425+
10426 return __copy_user(to, (__force void __user *) from, n);
10427 }
10428
10429 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10430 {
10431- if (n && __access_ok((unsigned long) from, n))
10432+ if ((long)n < 0)
10433+ return n;
10434+
10435+ if (n && __access_ok((unsigned long) from, n)) {
10436+ if (!__builtin_constant_p(n))
10437+ check_object_size(to, n, false);
10438 return __copy_user((__force void __user *) to, from, n);
10439- else
10440+ } else
10441 return n;
10442 }
10443
10444 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10445 {
10446+ if ((long)n < 0)
10447+ return n;
10448+
10449 return __copy_user((__force void __user *) to, from, n);
10450 }
10451
10452diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10453index a35194b..47dabc0d 100644
10454--- a/arch/sparc/include/asm/uaccess_64.h
10455+++ b/arch/sparc/include/asm/uaccess_64.h
10456@@ -10,6 +10,7 @@
10457 #include <linux/compiler.h>
10458 #include <linux/string.h>
10459 #include <linux/thread_info.h>
10460+#include <linux/kernel.h>
10461 #include <asm/asi.h>
10462 #include <asm/spitfire.h>
10463 #include <asm-generic/uaccess-unaligned.h>
10464@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10465 return 1;
10466 }
10467
10468+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10469+{
10470+ return 1;
10471+}
10472+
10473 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10474 {
10475 return 1;
10476@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10477 static inline unsigned long __must_check
10478 copy_from_user(void *to, const void __user *from, unsigned long size)
10479 {
10480- unsigned long ret = ___copy_from_user(to, from, size);
10481+ unsigned long ret;
10482
10483+ if ((long)size < 0 || size > INT_MAX)
10484+ return size;
10485+
10486+ if (!__builtin_constant_p(size))
10487+ check_object_size(to, size, false);
10488+
10489+ ret = ___copy_from_user(to, from, size);
10490 if (unlikely(ret))
10491 ret = copy_from_user_fixup(to, from, size);
10492
10493@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10494 static inline unsigned long __must_check
10495 copy_to_user(void __user *to, const void *from, unsigned long size)
10496 {
10497- unsigned long ret = ___copy_to_user(to, from, size);
10498+ unsigned long ret;
10499
10500+ if ((long)size < 0 || size > INT_MAX)
10501+ return size;
10502+
10503+ if (!__builtin_constant_p(size))
10504+ check_object_size(from, size, true);
10505+
10506+ ret = ___copy_to_user(to, from, size);
10507 if (unlikely(ret))
10508 ret = copy_to_user_fixup(to, from, size);
10509 return ret;
10510diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10511index 7cf9c6e..6206648 100644
10512--- a/arch/sparc/kernel/Makefile
10513+++ b/arch/sparc/kernel/Makefile
10514@@ -4,7 +4,7 @@
10515 #
10516
10517 asflags-y := -ansi
10518-ccflags-y := -Werror
10519+#ccflags-y := -Werror
10520
10521 extra-y := head_$(BITS).o
10522
10523diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10524index 50e7b62..79fae35 100644
10525--- a/arch/sparc/kernel/process_32.c
10526+++ b/arch/sparc/kernel/process_32.c
10527@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10528
10529 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10530 r->psr, r->pc, r->npc, r->y, print_tainted());
10531- printk("PC: <%pS>\n", (void *) r->pc);
10532+ printk("PC: <%pA>\n", (void *) r->pc);
10533 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10534 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10535 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10536 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10537 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10538 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10539- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10540+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10541
10542 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10543 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10544@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10545 rw = (struct reg_window32 *) fp;
10546 pc = rw->ins[7];
10547 printk("[%08lx : ", pc);
10548- printk("%pS ] ", (void *) pc);
10549+ printk("%pA ] ", (void *) pc);
10550 fp = rw->ins[6];
10551 } while (++count < 16);
10552 printk("\n");
10553diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10554index 46a5964..a35c62c 100644
10555--- a/arch/sparc/kernel/process_64.c
10556+++ b/arch/sparc/kernel/process_64.c
10557@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10558 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10559 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10560 if (regs->tstate & TSTATE_PRIV)
10561- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10562+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10563 }
10564
10565 void show_regs(struct pt_regs *regs)
10566@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10567
10568 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10569 regs->tpc, regs->tnpc, regs->y, print_tainted());
10570- printk("TPC: <%pS>\n", (void *) regs->tpc);
10571+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10572 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10573 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10574 regs->u_regs[3]);
10575@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10576 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10577 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10578 regs->u_regs[15]);
10579- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10580+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10581 show_regwindow(regs);
10582 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10583 }
10584@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10585 ((tp && tp->task) ? tp->task->pid : -1));
10586
10587 if (gp->tstate & TSTATE_PRIV) {
10588- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10589+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10590 (void *) gp->tpc,
10591 (void *) gp->o7,
10592 (void *) gp->i7,
10593diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10594index 79cc0d1..ec62734 100644
10595--- a/arch/sparc/kernel/prom_common.c
10596+++ b/arch/sparc/kernel/prom_common.c
10597@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10598
10599 unsigned int prom_early_allocated __initdata;
10600
10601-static struct of_pdt_ops prom_sparc_ops __initdata = {
10602+static struct of_pdt_ops prom_sparc_ops __initconst = {
10603 .nextprop = prom_common_nextprop,
10604 .getproplen = prom_getproplen,
10605 .getproperty = prom_getproperty,
10606diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10607index 9ddc492..27a5619 100644
10608--- a/arch/sparc/kernel/ptrace_64.c
10609+++ b/arch/sparc/kernel/ptrace_64.c
10610@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10611 return ret;
10612 }
10613
10614+#ifdef CONFIG_GRKERNSEC_SETXID
10615+extern void gr_delayed_cred_worker(void);
10616+#endif
10617+
10618 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10619 {
10620 int ret = 0;
10621@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10622 if (test_thread_flag(TIF_NOHZ))
10623 user_exit();
10624
10625+#ifdef CONFIG_GRKERNSEC_SETXID
10626+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10627+ gr_delayed_cred_worker();
10628+#endif
10629+
10630 if (test_thread_flag(TIF_SYSCALL_TRACE))
10631 ret = tracehook_report_syscall_entry(regs);
10632
10633@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10634 if (test_thread_flag(TIF_NOHZ))
10635 user_exit();
10636
10637+#ifdef CONFIG_GRKERNSEC_SETXID
10638+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10639+ gr_delayed_cred_worker();
10640+#endif
10641+
10642 audit_syscall_exit(regs);
10643
10644 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10645diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10646index 61139d9..c1a5f28 100644
10647--- a/arch/sparc/kernel/smp_64.c
10648+++ b/arch/sparc/kernel/smp_64.c
10649@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10650 return;
10651
10652 #ifdef CONFIG_DEBUG_DCFLUSH
10653- atomic_inc(&dcpage_flushes);
10654+ atomic_inc_unchecked(&dcpage_flushes);
10655 #endif
10656
10657 this_cpu = get_cpu();
10658@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10659 xcall_deliver(data0, __pa(pg_addr),
10660 (u64) pg_addr, cpumask_of(cpu));
10661 #ifdef CONFIG_DEBUG_DCFLUSH
10662- atomic_inc(&dcpage_flushes_xcall);
10663+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10664 #endif
10665 }
10666 }
10667@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10668 preempt_disable();
10669
10670 #ifdef CONFIG_DEBUG_DCFLUSH
10671- atomic_inc(&dcpage_flushes);
10672+ atomic_inc_unchecked(&dcpage_flushes);
10673 #endif
10674 data0 = 0;
10675 pg_addr = page_address(page);
10676@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10677 xcall_deliver(data0, __pa(pg_addr),
10678 (u64) pg_addr, cpu_online_mask);
10679 #ifdef CONFIG_DEBUG_DCFLUSH
10680- atomic_inc(&dcpage_flushes_xcall);
10681+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10682 #endif
10683 }
10684 __local_flush_dcache_page(page);
10685diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10686index 646988d..b88905f 100644
10687--- a/arch/sparc/kernel/sys_sparc_32.c
10688+++ b/arch/sparc/kernel/sys_sparc_32.c
10689@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10690 if (len > TASK_SIZE - PAGE_SIZE)
10691 return -ENOMEM;
10692 if (!addr)
10693- addr = TASK_UNMAPPED_BASE;
10694+ addr = current->mm->mmap_base;
10695
10696 info.flags = 0;
10697 info.length = len;
10698diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10699index 30e7ddb..266a3b0 100644
10700--- a/arch/sparc/kernel/sys_sparc_64.c
10701+++ b/arch/sparc/kernel/sys_sparc_64.c
10702@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10703 struct vm_area_struct * vma;
10704 unsigned long task_size = TASK_SIZE;
10705 int do_color_align;
10706+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10707 struct vm_unmapped_area_info info;
10708
10709 if (flags & MAP_FIXED) {
10710 /* We do not accept a shared mapping if it would violate
10711 * cache aliasing constraints.
10712 */
10713- if ((flags & MAP_SHARED) &&
10714+ if ((filp || (flags & MAP_SHARED)) &&
10715 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10716 return -EINVAL;
10717 return addr;
10718@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10719 if (filp || (flags & MAP_SHARED))
10720 do_color_align = 1;
10721
10722+#ifdef CONFIG_PAX_RANDMMAP
10723+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10724+#endif
10725+
10726 if (addr) {
10727 if (do_color_align)
10728 addr = COLOR_ALIGN(addr, pgoff);
10729@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10730 addr = PAGE_ALIGN(addr);
10731
10732 vma = find_vma(mm, addr);
10733- if (task_size - len >= addr &&
10734- (!vma || addr + len <= vma->vm_start))
10735+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10736 return addr;
10737 }
10738
10739 info.flags = 0;
10740 info.length = len;
10741- info.low_limit = TASK_UNMAPPED_BASE;
10742+ info.low_limit = mm->mmap_base;
10743 info.high_limit = min(task_size, VA_EXCLUDE_START);
10744 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10745 info.align_offset = pgoff << PAGE_SHIFT;
10746+ info.threadstack_offset = offset;
10747 addr = vm_unmapped_area(&info);
10748
10749 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10750 VM_BUG_ON(addr != -ENOMEM);
10751 info.low_limit = VA_EXCLUDE_END;
10752+
10753+#ifdef CONFIG_PAX_RANDMMAP
10754+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10755+ info.low_limit += mm->delta_mmap;
10756+#endif
10757+
10758 info.high_limit = task_size;
10759 addr = vm_unmapped_area(&info);
10760 }
10761@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10762 unsigned long task_size = STACK_TOP32;
10763 unsigned long addr = addr0;
10764 int do_color_align;
10765+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10766 struct vm_unmapped_area_info info;
10767
10768 /* This should only ever run for 32-bit processes. */
10769@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10770 /* We do not accept a shared mapping if it would violate
10771 * cache aliasing constraints.
10772 */
10773- if ((flags & MAP_SHARED) &&
10774+ if ((filp || (flags & MAP_SHARED)) &&
10775 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10776 return -EINVAL;
10777 return addr;
10778@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10779 if (filp || (flags & MAP_SHARED))
10780 do_color_align = 1;
10781
10782+#ifdef CONFIG_PAX_RANDMMAP
10783+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10784+#endif
10785+
10786 /* requesting a specific address */
10787 if (addr) {
10788 if (do_color_align)
10789@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10790 addr = PAGE_ALIGN(addr);
10791
10792 vma = find_vma(mm, addr);
10793- if (task_size - len >= addr &&
10794- (!vma || addr + len <= vma->vm_start))
10795+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10796 return addr;
10797 }
10798
10799@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10800 info.high_limit = mm->mmap_base;
10801 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10802 info.align_offset = pgoff << PAGE_SHIFT;
10803+ info.threadstack_offset = offset;
10804 addr = vm_unmapped_area(&info);
10805
10806 /*
10807@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10808 VM_BUG_ON(addr != -ENOMEM);
10809 info.flags = 0;
10810 info.low_limit = TASK_UNMAPPED_BASE;
10811+
10812+#ifdef CONFIG_PAX_RANDMMAP
10813+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10814+ info.low_limit += mm->delta_mmap;
10815+#endif
10816+
10817 info.high_limit = STACK_TOP32;
10818 addr = vm_unmapped_area(&info);
10819 }
10820@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10821 EXPORT_SYMBOL(get_fb_unmapped_area);
10822
10823 /* Essentially the same as PowerPC. */
10824-static unsigned long mmap_rnd(void)
10825+static unsigned long mmap_rnd(struct mm_struct *mm)
10826 {
10827 unsigned long rnd = 0UL;
10828
10829+#ifdef CONFIG_PAX_RANDMMAP
10830+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10831+#endif
10832+
10833 if (current->flags & PF_RANDOMIZE) {
10834 unsigned long val = get_random_int();
10835 if (test_thread_flag(TIF_32BIT))
10836@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10837
10838 void arch_pick_mmap_layout(struct mm_struct *mm)
10839 {
10840- unsigned long random_factor = mmap_rnd();
10841+ unsigned long random_factor = mmap_rnd(mm);
10842 unsigned long gap;
10843
10844 /*
10845@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10846 gap == RLIM_INFINITY ||
10847 sysctl_legacy_va_layout) {
10848 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10849+
10850+#ifdef CONFIG_PAX_RANDMMAP
10851+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10852+ mm->mmap_base += mm->delta_mmap;
10853+#endif
10854+
10855 mm->get_unmapped_area = arch_get_unmapped_area;
10856 } else {
10857 /* We know it's 32-bit */
10858@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10859 gap = (task_size / 6 * 5);
10860
10861 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10862+
10863+#ifdef CONFIG_PAX_RANDMMAP
10864+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10865+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10866+#endif
10867+
10868 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10869 }
10870 }
10871diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10872index bb00089..e0ea580 100644
10873--- a/arch/sparc/kernel/syscalls.S
10874+++ b/arch/sparc/kernel/syscalls.S
10875@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10876 #endif
10877 .align 32
10878 1: ldx [%g6 + TI_FLAGS], %l5
10879- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10880+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10881 be,pt %icc, rtrap
10882 nop
10883 call syscall_trace_leave
10884@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10885
10886 srl %i3, 0, %o3 ! IEU0
10887 srl %i2, 0, %o2 ! IEU0 Group
10888- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10889+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10890 bne,pn %icc, linux_syscall_trace32 ! CTI
10891 mov %i0, %l5 ! IEU1
10892 5: call %l7 ! CTI Group brk forced
10893@@ -218,7 +218,7 @@ linux_sparc_syscall:
10894
10895 mov %i3, %o3 ! IEU1
10896 mov %i4, %o4 ! IEU0 Group
10897- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10898+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10899 bne,pn %icc, linux_syscall_trace ! CTI Group
10900 mov %i0, %l5 ! IEU0
10901 2: call %l7 ! CTI Group brk forced
10902@@ -233,7 +233,7 @@ ret_sys_call:
10903
10904 cmp %o0, -ERESTART_RESTARTBLOCK
10905 bgeu,pn %xcc, 1f
10906- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10907+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10908 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10909
10910 2:
10911diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10912index 6fd386c5..6907d81 100644
10913--- a/arch/sparc/kernel/traps_32.c
10914+++ b/arch/sparc/kernel/traps_32.c
10915@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10916 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10917 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10918
10919+extern void gr_handle_kernel_exploit(void);
10920+
10921 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10922 {
10923 static int die_counter;
10924@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10925 count++ < 30 &&
10926 (((unsigned long) rw) >= PAGE_OFFSET) &&
10927 !(((unsigned long) rw) & 0x7)) {
10928- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10929+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10930 (void *) rw->ins[7]);
10931 rw = (struct reg_window32 *)rw->ins[6];
10932 }
10933 }
10934 printk("Instruction DUMP:");
10935 instruction_dump ((unsigned long *) regs->pc);
10936- if(regs->psr & PSR_PS)
10937+ if(regs->psr & PSR_PS) {
10938+ gr_handle_kernel_exploit();
10939 do_exit(SIGKILL);
10940+ }
10941 do_exit(SIGSEGV);
10942 }
10943
10944diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10945index 0e69974..0c15a6e 100644
10946--- a/arch/sparc/kernel/traps_64.c
10947+++ b/arch/sparc/kernel/traps_64.c
10948@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10949 i + 1,
10950 p->trapstack[i].tstate, p->trapstack[i].tpc,
10951 p->trapstack[i].tnpc, p->trapstack[i].tt);
10952- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10953+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10954 }
10955 }
10956
10957@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10958
10959 lvl -= 0x100;
10960 if (regs->tstate & TSTATE_PRIV) {
10961+
10962+#ifdef CONFIG_PAX_REFCOUNT
10963+ if (lvl == 6)
10964+ pax_report_refcount_overflow(regs);
10965+#endif
10966+
10967 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10968 die_if_kernel(buffer, regs);
10969 }
10970@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10971 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10972 {
10973 char buffer[32];
10974-
10975+
10976 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10977 0, lvl, SIGTRAP) == NOTIFY_STOP)
10978 return;
10979
10980+#ifdef CONFIG_PAX_REFCOUNT
10981+ if (lvl == 6)
10982+ pax_report_refcount_overflow(regs);
10983+#endif
10984+
10985 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10986
10987 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10988@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10989 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10990 printk("%s" "ERROR(%d): ",
10991 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10992- printk("TPC<%pS>\n", (void *) regs->tpc);
10993+ printk("TPC<%pA>\n", (void *) regs->tpc);
10994 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10995 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10996 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10997@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10998 smp_processor_id(),
10999 (type & 0x1) ? 'I' : 'D',
11000 regs->tpc);
11001- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11002+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11003 panic("Irrecoverable Cheetah+ parity error.");
11004 }
11005
11006@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11007 smp_processor_id(),
11008 (type & 0x1) ? 'I' : 'D',
11009 regs->tpc);
11010- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11011+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11012 }
11013
11014 struct sun4v_error_entry {
11015@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11016 /*0x38*/u64 reserved_5;
11017 };
11018
11019-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11020-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11021+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11022+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11023
11024 static const char *sun4v_err_type_to_str(u8 type)
11025 {
11026@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11027 }
11028
11029 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11030- int cpu, const char *pfx, atomic_t *ocnt)
11031+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11032 {
11033 u64 *raw_ptr = (u64 *) ent;
11034 u32 attrs;
11035@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11036
11037 show_regs(regs);
11038
11039- if ((cnt = atomic_read(ocnt)) != 0) {
11040- atomic_set(ocnt, 0);
11041+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11042+ atomic_set_unchecked(ocnt, 0);
11043 wmb();
11044 printk("%s: Queue overflowed %d times.\n",
11045 pfx, cnt);
11046@@ -2048,7 +2059,7 @@ out:
11047 */
11048 void sun4v_resum_overflow(struct pt_regs *regs)
11049 {
11050- atomic_inc(&sun4v_resum_oflow_cnt);
11051+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11052 }
11053
11054 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11055@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11056 /* XXX Actually even this can make not that much sense. Perhaps
11057 * XXX we should just pull the plug and panic directly from here?
11058 */
11059- atomic_inc(&sun4v_nonresum_oflow_cnt);
11060+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11061 }
11062
11063 static void sun4v_tlb_error(struct pt_regs *regs)
11064@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11065
11066 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11067 regs->tpc, tl);
11068- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11069+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11070 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11071- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11072+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11073 (void *) regs->u_regs[UREG_I7]);
11074 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11075 "pte[%lx] error[%lx]\n",
11076@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11077
11078 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11079 regs->tpc, tl);
11080- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11081+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11082 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11083- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11084+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11085 (void *) regs->u_regs[UREG_I7]);
11086 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11087 "pte[%lx] error[%lx]\n",
11088@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11089 fp = (unsigned long)sf->fp + STACK_BIAS;
11090 }
11091
11092- printk(" [%016lx] %pS\n", pc, (void *) pc);
11093+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11094 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11095 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11096 int index = tsk->curr_ret_stack;
11097 if (tsk->ret_stack && index >= graph) {
11098 pc = tsk->ret_stack[index - graph].ret;
11099- printk(" [%016lx] %pS\n", pc, (void *) pc);
11100+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11101 graph++;
11102 }
11103 }
11104@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11105 return (struct reg_window *) (fp + STACK_BIAS);
11106 }
11107
11108+extern void gr_handle_kernel_exploit(void);
11109+
11110 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11111 {
11112 static int die_counter;
11113@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11114 while (rw &&
11115 count++ < 30 &&
11116 kstack_valid(tp, (unsigned long) rw)) {
11117- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11118+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11119 (void *) rw->ins[7]);
11120
11121 rw = kernel_stack_up(rw);
11122@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11123 }
11124 if (panic_on_oops)
11125 panic("Fatal exception");
11126- if (regs->tstate & TSTATE_PRIV)
11127+ if (regs->tstate & TSTATE_PRIV) {
11128+ gr_handle_kernel_exploit();
11129 do_exit(SIGKILL);
11130+ }
11131 do_exit(SIGSEGV);
11132 }
11133 EXPORT_SYMBOL(die_if_kernel);
11134diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11135index 62098a8..547ab2c 100644
11136--- a/arch/sparc/kernel/unaligned_64.c
11137+++ b/arch/sparc/kernel/unaligned_64.c
11138@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11139 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11140
11141 if (__ratelimit(&ratelimit)) {
11142- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11143+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11144 regs->tpc, (void *) regs->tpc);
11145 }
11146 }
11147diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11148index 3269b02..64f5231 100644
11149--- a/arch/sparc/lib/Makefile
11150+++ b/arch/sparc/lib/Makefile
11151@@ -2,7 +2,7 @@
11152 #
11153
11154 asflags-y := -ansi -DST_DIV0=0x02
11155-ccflags-y := -Werror
11156+#ccflags-y := -Werror
11157
11158 lib-$(CONFIG_SPARC32) += ashrdi3.o
11159 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11160diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11161index 05dac43..76f8ed4 100644
11162--- a/arch/sparc/lib/atomic_64.S
11163+++ b/arch/sparc/lib/atomic_64.S
11164@@ -15,11 +15,22 @@
11165 * a value and does the barriers.
11166 */
11167
11168-#define ATOMIC_OP(op) \
11169-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11170+#ifdef CONFIG_PAX_REFCOUNT
11171+#define __REFCOUNT_OP(op) op##cc
11172+#define __OVERFLOW_IOP tvs %icc, 6;
11173+#define __OVERFLOW_XOP tvs %xcc, 6;
11174+#else
11175+#define __REFCOUNT_OP(op) op
11176+#define __OVERFLOW_IOP
11177+#define __OVERFLOW_XOP
11178+#endif
11179+
11180+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11181+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11182 BACKOFF_SETUP(%o2); \
11183 1: lduw [%o1], %g1; \
11184- op %g1, %o0, %g7; \
11185+ asm_op %g1, %o0, %g7; \
11186+ post_op \
11187 cas [%o1], %g1, %g7; \
11188 cmp %g1, %g7; \
11189 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11190@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11191 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11192 ENDPROC(atomic_##op); \
11193
11194-#define ATOMIC_OP_RETURN(op) \
11195-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11196+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11197+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11198+
11199+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11200+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11201 BACKOFF_SETUP(%o2); \
11202 1: lduw [%o1], %g1; \
11203- op %g1, %o0, %g7; \
11204+ asm_op %g1, %o0, %g7; \
11205+ post_op \
11206 cas [%o1], %g1, %g7; \
11207 cmp %g1, %g7; \
11208 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11209@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11210 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11211 ENDPROC(atomic_##op##_return);
11212
11213+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11214+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11215+
11216 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11217
11218 ATOMIC_OPS(add)
11219@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11220
11221 #undef ATOMIC_OPS
11222 #undef ATOMIC_OP_RETURN
11223+#undef __ATOMIC_OP_RETURN
11224 #undef ATOMIC_OP
11225+#undef __ATOMIC_OP
11226
11227-#define ATOMIC64_OP(op) \
11228-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11229+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11230+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11231 BACKOFF_SETUP(%o2); \
11232 1: ldx [%o1], %g1; \
11233- op %g1, %o0, %g7; \
11234+ asm_op %g1, %o0, %g7; \
11235+ post_op \
11236 casx [%o1], %g1, %g7; \
11237 cmp %g1, %g7; \
11238 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11239@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11240 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11241 ENDPROC(atomic64_##op); \
11242
11243-#define ATOMIC64_OP_RETURN(op) \
11244-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11245+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11246+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11247+
11248+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11249+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11250 BACKOFF_SETUP(%o2); \
11251 1: ldx [%o1], %g1; \
11252- op %g1, %o0, %g7; \
11253+ asm_op %g1, %o0, %g7; \
11254+ post_op \
11255 casx [%o1], %g1, %g7; \
11256 cmp %g1, %g7; \
11257 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11258@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11259 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11260 ENDPROC(atomic64_##op##_return);
11261
11262+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11263+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11264+
11265 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11266
11267 ATOMIC64_OPS(add)
11268@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11269
11270 #undef ATOMIC64_OPS
11271 #undef ATOMIC64_OP_RETURN
11272+#undef __ATOMIC64_OP_RETURN
11273 #undef ATOMIC64_OP
11274+#undef __ATOMIC64_OP
11275+#undef __OVERFLOW_XOP
11276+#undef __OVERFLOW_IOP
11277+#undef __REFCOUNT_OP
11278
11279 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11280 BACKOFF_SETUP(%o2)
11281diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11282index 1d649a9..fbc5bfc 100644
11283--- a/arch/sparc/lib/ksyms.c
11284+++ b/arch/sparc/lib/ksyms.c
11285@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11286 /* Atomic counter implementation. */
11287 #define ATOMIC_OP(op) \
11288 EXPORT_SYMBOL(atomic_##op); \
11289-EXPORT_SYMBOL(atomic64_##op);
11290+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11291+EXPORT_SYMBOL(atomic64_##op); \
11292+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11293
11294 #define ATOMIC_OP_RETURN(op) \
11295 EXPORT_SYMBOL(atomic_##op##_return); \
11296@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11297 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11298
11299 ATOMIC_OPS(add)
11300+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11301+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11302 ATOMIC_OPS(sub)
11303
11304 #undef ATOMIC_OPS
11305diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11306index 30c3ecc..736f015 100644
11307--- a/arch/sparc/mm/Makefile
11308+++ b/arch/sparc/mm/Makefile
11309@@ -2,7 +2,7 @@
11310 #
11311
11312 asflags-y := -ansi
11313-ccflags-y := -Werror
11314+#ccflags-y := -Werror
11315
11316 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11317 obj-y += fault_$(BITS).o
11318diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11319index 70d8171..274c6c0 100644
11320--- a/arch/sparc/mm/fault_32.c
11321+++ b/arch/sparc/mm/fault_32.c
11322@@ -21,6 +21,9 @@
11323 #include <linux/perf_event.h>
11324 #include <linux/interrupt.h>
11325 #include <linux/kdebug.h>
11326+#include <linux/slab.h>
11327+#include <linux/pagemap.h>
11328+#include <linux/compiler.h>
11329
11330 #include <asm/page.h>
11331 #include <asm/pgtable.h>
11332@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11333 return safe_compute_effective_address(regs, insn);
11334 }
11335
11336+#ifdef CONFIG_PAX_PAGEEXEC
11337+#ifdef CONFIG_PAX_DLRESOLVE
11338+static void pax_emuplt_close(struct vm_area_struct *vma)
11339+{
11340+ vma->vm_mm->call_dl_resolve = 0UL;
11341+}
11342+
11343+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11344+{
11345+ unsigned int *kaddr;
11346+
11347+ vmf->page = alloc_page(GFP_HIGHUSER);
11348+ if (!vmf->page)
11349+ return VM_FAULT_OOM;
11350+
11351+ kaddr = kmap(vmf->page);
11352+ memset(kaddr, 0, PAGE_SIZE);
11353+ kaddr[0] = 0x9DE3BFA8U; /* save */
11354+ flush_dcache_page(vmf->page);
11355+ kunmap(vmf->page);
11356+ return VM_FAULT_MAJOR;
11357+}
11358+
11359+static const struct vm_operations_struct pax_vm_ops = {
11360+ .close = pax_emuplt_close,
11361+ .fault = pax_emuplt_fault
11362+};
11363+
11364+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11365+{
11366+ int ret;
11367+
11368+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11369+ vma->vm_mm = current->mm;
11370+ vma->vm_start = addr;
11371+ vma->vm_end = addr + PAGE_SIZE;
11372+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11373+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11374+ vma->vm_ops = &pax_vm_ops;
11375+
11376+ ret = insert_vm_struct(current->mm, vma);
11377+ if (ret)
11378+ return ret;
11379+
11380+ ++current->mm->total_vm;
11381+ return 0;
11382+}
11383+#endif
11384+
11385+/*
11386+ * PaX: decide what to do with offenders (regs->pc = fault address)
11387+ *
11388+ * returns 1 when task should be killed
11389+ * 2 when patched PLT trampoline was detected
11390+ * 3 when unpatched PLT trampoline was detected
11391+ */
11392+static int pax_handle_fetch_fault(struct pt_regs *regs)
11393+{
11394+
11395+#ifdef CONFIG_PAX_EMUPLT
11396+ int err;
11397+
11398+ do { /* PaX: patched PLT emulation #1 */
11399+ unsigned int sethi1, sethi2, jmpl;
11400+
11401+ err = get_user(sethi1, (unsigned int *)regs->pc);
11402+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11403+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11404+
11405+ if (err)
11406+ break;
11407+
11408+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11409+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11410+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11411+ {
11412+ unsigned int addr;
11413+
11414+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11415+ addr = regs->u_regs[UREG_G1];
11416+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11417+ regs->pc = addr;
11418+ regs->npc = addr+4;
11419+ return 2;
11420+ }
11421+ } while (0);
11422+
11423+ do { /* PaX: patched PLT emulation #2 */
11424+ unsigned int ba;
11425+
11426+ err = get_user(ba, (unsigned int *)regs->pc);
11427+
11428+ if (err)
11429+ break;
11430+
11431+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11432+ unsigned int addr;
11433+
11434+ if ((ba & 0xFFC00000U) == 0x30800000U)
11435+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11436+ else
11437+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11438+ regs->pc = addr;
11439+ regs->npc = addr+4;
11440+ return 2;
11441+ }
11442+ } while (0);
11443+
11444+ do { /* PaX: patched PLT emulation #3 */
11445+ unsigned int sethi, bajmpl, nop;
11446+
11447+ err = get_user(sethi, (unsigned int *)regs->pc);
11448+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11449+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11450+
11451+ if (err)
11452+ break;
11453+
11454+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11455+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11456+ nop == 0x01000000U)
11457+ {
11458+ unsigned int addr;
11459+
11460+ addr = (sethi & 0x003FFFFFU) << 10;
11461+ regs->u_regs[UREG_G1] = addr;
11462+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11463+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11464+ else
11465+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11466+ regs->pc = addr;
11467+ regs->npc = addr+4;
11468+ return 2;
11469+ }
11470+ } while (0);
11471+
11472+ do { /* PaX: unpatched PLT emulation step 1 */
11473+ unsigned int sethi, ba, nop;
11474+
11475+ err = get_user(sethi, (unsigned int *)regs->pc);
11476+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11477+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11478+
11479+ if (err)
11480+ break;
11481+
11482+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11483+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11484+ nop == 0x01000000U)
11485+ {
11486+ unsigned int addr, save, call;
11487+
11488+ if ((ba & 0xFFC00000U) == 0x30800000U)
11489+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11490+ else
11491+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11492+
11493+ err = get_user(save, (unsigned int *)addr);
11494+ err |= get_user(call, (unsigned int *)(addr+4));
11495+ err |= get_user(nop, (unsigned int *)(addr+8));
11496+ if (err)
11497+ break;
11498+
11499+#ifdef CONFIG_PAX_DLRESOLVE
11500+ if (save == 0x9DE3BFA8U &&
11501+ (call & 0xC0000000U) == 0x40000000U &&
11502+ nop == 0x01000000U)
11503+ {
11504+ struct vm_area_struct *vma;
11505+ unsigned long call_dl_resolve;
11506+
11507+ down_read(&current->mm->mmap_sem);
11508+ call_dl_resolve = current->mm->call_dl_resolve;
11509+ up_read(&current->mm->mmap_sem);
11510+ if (likely(call_dl_resolve))
11511+ goto emulate;
11512+
11513+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11514+
11515+ down_write(&current->mm->mmap_sem);
11516+ if (current->mm->call_dl_resolve) {
11517+ call_dl_resolve = current->mm->call_dl_resolve;
11518+ up_write(&current->mm->mmap_sem);
11519+ if (vma)
11520+ kmem_cache_free(vm_area_cachep, vma);
11521+ goto emulate;
11522+ }
11523+
11524+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11525+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11526+ up_write(&current->mm->mmap_sem);
11527+ if (vma)
11528+ kmem_cache_free(vm_area_cachep, vma);
11529+ return 1;
11530+ }
11531+
11532+ if (pax_insert_vma(vma, call_dl_resolve)) {
11533+ up_write(&current->mm->mmap_sem);
11534+ kmem_cache_free(vm_area_cachep, vma);
11535+ return 1;
11536+ }
11537+
11538+ current->mm->call_dl_resolve = call_dl_resolve;
11539+ up_write(&current->mm->mmap_sem);
11540+
11541+emulate:
11542+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11543+ regs->pc = call_dl_resolve;
11544+ regs->npc = addr+4;
11545+ return 3;
11546+ }
11547+#endif
11548+
11549+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11550+ if ((save & 0xFFC00000U) == 0x05000000U &&
11551+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11552+ nop == 0x01000000U)
11553+ {
11554+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11555+ regs->u_regs[UREG_G2] = addr + 4;
11556+ addr = (save & 0x003FFFFFU) << 10;
11557+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11558+ regs->pc = addr;
11559+ regs->npc = addr+4;
11560+ return 3;
11561+ }
11562+ }
11563+ } while (0);
11564+
11565+ do { /* PaX: unpatched PLT emulation step 2 */
11566+ unsigned int save, call, nop;
11567+
11568+ err = get_user(save, (unsigned int *)(regs->pc-4));
11569+ err |= get_user(call, (unsigned int *)regs->pc);
11570+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11571+ if (err)
11572+ break;
11573+
11574+ if (save == 0x9DE3BFA8U &&
11575+ (call & 0xC0000000U) == 0x40000000U &&
11576+ nop == 0x01000000U)
11577+ {
11578+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11579+
11580+ regs->u_regs[UREG_RETPC] = regs->pc;
11581+ regs->pc = dl_resolve;
11582+ regs->npc = dl_resolve+4;
11583+ return 3;
11584+ }
11585+ } while (0);
11586+#endif
11587+
11588+ return 1;
11589+}
11590+
11591+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11592+{
11593+ unsigned long i;
11594+
11595+ printk(KERN_ERR "PAX: bytes at PC: ");
11596+ for (i = 0; i < 8; i++) {
11597+ unsigned int c;
11598+ if (get_user(c, (unsigned int *)pc+i))
11599+ printk(KERN_CONT "???????? ");
11600+ else
11601+ printk(KERN_CONT "%08x ", c);
11602+ }
11603+ printk("\n");
11604+}
11605+#endif
11606+
11607 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11608 int text_fault)
11609 {
11610@@ -226,6 +500,24 @@ good_area:
11611 if (!(vma->vm_flags & VM_WRITE))
11612 goto bad_area;
11613 } else {
11614+
11615+#ifdef CONFIG_PAX_PAGEEXEC
11616+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11617+ up_read(&mm->mmap_sem);
11618+ switch (pax_handle_fetch_fault(regs)) {
11619+
11620+#ifdef CONFIG_PAX_EMUPLT
11621+ case 2:
11622+ case 3:
11623+ return;
11624+#endif
11625+
11626+ }
11627+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11628+ do_group_exit(SIGKILL);
11629+ }
11630+#endif
11631+
11632 /* Allow reads even for write-only mappings */
11633 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11634 goto bad_area;
11635diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11636index 4798232..f76e3aa 100644
11637--- a/arch/sparc/mm/fault_64.c
11638+++ b/arch/sparc/mm/fault_64.c
11639@@ -22,6 +22,9 @@
11640 #include <linux/kdebug.h>
11641 #include <linux/percpu.h>
11642 #include <linux/context_tracking.h>
11643+#include <linux/slab.h>
11644+#include <linux/pagemap.h>
11645+#include <linux/compiler.h>
11646
11647 #include <asm/page.h>
11648 #include <asm/pgtable.h>
11649@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11650 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11651 regs->tpc);
11652 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11653- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11654+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11655 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11656 dump_stack();
11657 unhandled_fault(regs->tpc, current, regs);
11658@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11659 show_regs(regs);
11660 }
11661
11662+#ifdef CONFIG_PAX_PAGEEXEC
11663+#ifdef CONFIG_PAX_DLRESOLVE
11664+static void pax_emuplt_close(struct vm_area_struct *vma)
11665+{
11666+ vma->vm_mm->call_dl_resolve = 0UL;
11667+}
11668+
11669+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11670+{
11671+ unsigned int *kaddr;
11672+
11673+ vmf->page = alloc_page(GFP_HIGHUSER);
11674+ if (!vmf->page)
11675+ return VM_FAULT_OOM;
11676+
11677+ kaddr = kmap(vmf->page);
11678+ memset(kaddr, 0, PAGE_SIZE);
11679+ kaddr[0] = 0x9DE3BFA8U; /* save */
11680+ flush_dcache_page(vmf->page);
11681+ kunmap(vmf->page);
11682+ return VM_FAULT_MAJOR;
11683+}
11684+
11685+static const struct vm_operations_struct pax_vm_ops = {
11686+ .close = pax_emuplt_close,
11687+ .fault = pax_emuplt_fault
11688+};
11689+
11690+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11691+{
11692+ int ret;
11693+
11694+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11695+ vma->vm_mm = current->mm;
11696+ vma->vm_start = addr;
11697+ vma->vm_end = addr + PAGE_SIZE;
11698+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11699+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11700+ vma->vm_ops = &pax_vm_ops;
11701+
11702+ ret = insert_vm_struct(current->mm, vma);
11703+ if (ret)
11704+ return ret;
11705+
11706+ ++current->mm->total_vm;
11707+ return 0;
11708+}
11709+#endif
11710+
11711+/*
11712+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11713+ *
11714+ * returns 1 when task should be killed
11715+ * 2 when patched PLT trampoline was detected
11716+ * 3 when unpatched PLT trampoline was detected
11717+ */
11718+static int pax_handle_fetch_fault(struct pt_regs *regs)
11719+{
11720+
11721+#ifdef CONFIG_PAX_EMUPLT
11722+ int err;
11723+
11724+ do { /* PaX: patched PLT emulation #1 */
11725+ unsigned int sethi1, sethi2, jmpl;
11726+
11727+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11728+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11729+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11730+
11731+ if (err)
11732+ break;
11733+
11734+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11735+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11736+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11737+ {
11738+ unsigned long addr;
11739+
11740+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11741+ addr = regs->u_regs[UREG_G1];
11742+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11743+
11744+ if (test_thread_flag(TIF_32BIT))
11745+ addr &= 0xFFFFFFFFUL;
11746+
11747+ regs->tpc = addr;
11748+ regs->tnpc = addr+4;
11749+ return 2;
11750+ }
11751+ } while (0);
11752+
11753+ do { /* PaX: patched PLT emulation #2 */
11754+ unsigned int ba;
11755+
11756+ err = get_user(ba, (unsigned int *)regs->tpc);
11757+
11758+ if (err)
11759+ break;
11760+
11761+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11762+ unsigned long addr;
11763+
11764+ if ((ba & 0xFFC00000U) == 0x30800000U)
11765+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11766+ else
11767+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11768+
11769+ if (test_thread_flag(TIF_32BIT))
11770+ addr &= 0xFFFFFFFFUL;
11771+
11772+ regs->tpc = addr;
11773+ regs->tnpc = addr+4;
11774+ return 2;
11775+ }
11776+ } while (0);
11777+
11778+ do { /* PaX: patched PLT emulation #3 */
11779+ unsigned int sethi, bajmpl, nop;
11780+
11781+ err = get_user(sethi, (unsigned int *)regs->tpc);
11782+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11783+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11784+
11785+ if (err)
11786+ break;
11787+
11788+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11789+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11790+ nop == 0x01000000U)
11791+ {
11792+ unsigned long addr;
11793+
11794+ addr = (sethi & 0x003FFFFFU) << 10;
11795+ regs->u_regs[UREG_G1] = addr;
11796+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11797+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11798+ else
11799+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11800+
11801+ if (test_thread_flag(TIF_32BIT))
11802+ addr &= 0xFFFFFFFFUL;
11803+
11804+ regs->tpc = addr;
11805+ regs->tnpc = addr+4;
11806+ return 2;
11807+ }
11808+ } while (0);
11809+
11810+ do { /* PaX: patched PLT emulation #4 */
11811+ unsigned int sethi, mov1, call, mov2;
11812+
11813+ err = get_user(sethi, (unsigned int *)regs->tpc);
11814+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11815+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11816+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11817+
11818+ if (err)
11819+ break;
11820+
11821+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11822+ mov1 == 0x8210000FU &&
11823+ (call & 0xC0000000U) == 0x40000000U &&
11824+ mov2 == 0x9E100001U)
11825+ {
11826+ unsigned long addr;
11827+
11828+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11829+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11830+
11831+ if (test_thread_flag(TIF_32BIT))
11832+ addr &= 0xFFFFFFFFUL;
11833+
11834+ regs->tpc = addr;
11835+ regs->tnpc = addr+4;
11836+ return 2;
11837+ }
11838+ } while (0);
11839+
11840+ do { /* PaX: patched PLT emulation #5 */
11841+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11842+
11843+ err = get_user(sethi, (unsigned int *)regs->tpc);
11844+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11845+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11846+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11847+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11848+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11849+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11850+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11851+
11852+ if (err)
11853+ break;
11854+
11855+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11856+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11857+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11858+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11859+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11860+ sllx == 0x83287020U &&
11861+ jmpl == 0x81C04005U &&
11862+ nop == 0x01000000U)
11863+ {
11864+ unsigned long addr;
11865+
11866+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11867+ regs->u_regs[UREG_G1] <<= 32;
11868+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11869+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11870+ regs->tpc = addr;
11871+ regs->tnpc = addr+4;
11872+ return 2;
11873+ }
11874+ } while (0);
11875+
11876+ do { /* PaX: patched PLT emulation #6 */
11877+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11878+
11879+ err = get_user(sethi, (unsigned int *)regs->tpc);
11880+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11881+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11882+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11883+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11884+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11885+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11886+
11887+ if (err)
11888+ break;
11889+
11890+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11891+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11892+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11893+ sllx == 0x83287020U &&
11894+ (or & 0xFFFFE000U) == 0x8A116000U &&
11895+ jmpl == 0x81C04005U &&
11896+ nop == 0x01000000U)
11897+ {
11898+ unsigned long addr;
11899+
11900+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11901+ regs->u_regs[UREG_G1] <<= 32;
11902+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11903+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11904+ regs->tpc = addr;
11905+ regs->tnpc = addr+4;
11906+ return 2;
11907+ }
11908+ } while (0);
11909+
11910+ do { /* PaX: unpatched PLT emulation step 1 */
11911+ unsigned int sethi, ba, nop;
11912+
11913+ err = get_user(sethi, (unsigned int *)regs->tpc);
11914+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11915+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11916+
11917+ if (err)
11918+ break;
11919+
11920+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11921+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11922+ nop == 0x01000000U)
11923+ {
11924+ unsigned long addr;
11925+ unsigned int save, call;
11926+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11927+
11928+ if ((ba & 0xFFC00000U) == 0x30800000U)
11929+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11930+ else
11931+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11932+
11933+ if (test_thread_flag(TIF_32BIT))
11934+ addr &= 0xFFFFFFFFUL;
11935+
11936+ err = get_user(save, (unsigned int *)addr);
11937+ err |= get_user(call, (unsigned int *)(addr+4));
11938+ err |= get_user(nop, (unsigned int *)(addr+8));
11939+ if (err)
11940+ break;
11941+
11942+#ifdef CONFIG_PAX_DLRESOLVE
11943+ if (save == 0x9DE3BFA8U &&
11944+ (call & 0xC0000000U) == 0x40000000U &&
11945+ nop == 0x01000000U)
11946+ {
11947+ struct vm_area_struct *vma;
11948+ unsigned long call_dl_resolve;
11949+
11950+ down_read(&current->mm->mmap_sem);
11951+ call_dl_resolve = current->mm->call_dl_resolve;
11952+ up_read(&current->mm->mmap_sem);
11953+ if (likely(call_dl_resolve))
11954+ goto emulate;
11955+
11956+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11957+
11958+ down_write(&current->mm->mmap_sem);
11959+ if (current->mm->call_dl_resolve) {
11960+ call_dl_resolve = current->mm->call_dl_resolve;
11961+ up_write(&current->mm->mmap_sem);
11962+ if (vma)
11963+ kmem_cache_free(vm_area_cachep, vma);
11964+ goto emulate;
11965+ }
11966+
11967+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11968+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11969+ up_write(&current->mm->mmap_sem);
11970+ if (vma)
11971+ kmem_cache_free(vm_area_cachep, vma);
11972+ return 1;
11973+ }
11974+
11975+ if (pax_insert_vma(vma, call_dl_resolve)) {
11976+ up_write(&current->mm->mmap_sem);
11977+ kmem_cache_free(vm_area_cachep, vma);
11978+ return 1;
11979+ }
11980+
11981+ current->mm->call_dl_resolve = call_dl_resolve;
11982+ up_write(&current->mm->mmap_sem);
11983+
11984+emulate:
11985+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11986+ regs->tpc = call_dl_resolve;
11987+ regs->tnpc = addr+4;
11988+ return 3;
11989+ }
11990+#endif
11991+
11992+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11993+ if ((save & 0xFFC00000U) == 0x05000000U &&
11994+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11995+ nop == 0x01000000U)
11996+ {
11997+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11998+ regs->u_regs[UREG_G2] = addr + 4;
11999+ addr = (save & 0x003FFFFFU) << 10;
12000+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12001+
12002+ if (test_thread_flag(TIF_32BIT))
12003+ addr &= 0xFFFFFFFFUL;
12004+
12005+ regs->tpc = addr;
12006+ regs->tnpc = addr+4;
12007+ return 3;
12008+ }
12009+
12010+ /* PaX: 64-bit PLT stub */
12011+ err = get_user(sethi1, (unsigned int *)addr);
12012+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12013+ err |= get_user(or1, (unsigned int *)(addr+8));
12014+ err |= get_user(or2, (unsigned int *)(addr+12));
12015+ err |= get_user(sllx, (unsigned int *)(addr+16));
12016+ err |= get_user(add, (unsigned int *)(addr+20));
12017+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12018+ err |= get_user(nop, (unsigned int *)(addr+28));
12019+ if (err)
12020+ break;
12021+
12022+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12023+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12024+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12025+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12026+ sllx == 0x89293020U &&
12027+ add == 0x8A010005U &&
12028+ jmpl == 0x89C14000U &&
12029+ nop == 0x01000000U)
12030+ {
12031+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12032+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12033+ regs->u_regs[UREG_G4] <<= 32;
12034+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12035+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12036+ regs->u_regs[UREG_G4] = addr + 24;
12037+ addr = regs->u_regs[UREG_G5];
12038+ regs->tpc = addr;
12039+ regs->tnpc = addr+4;
12040+ return 3;
12041+ }
12042+ }
12043+ } while (0);
12044+
12045+#ifdef CONFIG_PAX_DLRESOLVE
12046+ do { /* PaX: unpatched PLT emulation step 2 */
12047+ unsigned int save, call, nop;
12048+
12049+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12050+ err |= get_user(call, (unsigned int *)regs->tpc);
12051+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12052+ if (err)
12053+ break;
12054+
12055+ if (save == 0x9DE3BFA8U &&
12056+ (call & 0xC0000000U) == 0x40000000U &&
12057+ nop == 0x01000000U)
12058+ {
12059+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12060+
12061+ if (test_thread_flag(TIF_32BIT))
12062+ dl_resolve &= 0xFFFFFFFFUL;
12063+
12064+ regs->u_regs[UREG_RETPC] = regs->tpc;
12065+ regs->tpc = dl_resolve;
12066+ regs->tnpc = dl_resolve+4;
12067+ return 3;
12068+ }
12069+ } while (0);
12070+#endif
12071+
12072+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12073+ unsigned int sethi, ba, nop;
12074+
12075+ err = get_user(sethi, (unsigned int *)regs->tpc);
12076+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12077+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12078+
12079+ if (err)
12080+ break;
12081+
12082+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12083+ (ba & 0xFFF00000U) == 0x30600000U &&
12084+ nop == 0x01000000U)
12085+ {
12086+ unsigned long addr;
12087+
12088+ addr = (sethi & 0x003FFFFFU) << 10;
12089+ regs->u_regs[UREG_G1] = addr;
12090+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12091+
12092+ if (test_thread_flag(TIF_32BIT))
12093+ addr &= 0xFFFFFFFFUL;
12094+
12095+ regs->tpc = addr;
12096+ regs->tnpc = addr+4;
12097+ return 2;
12098+ }
12099+ } while (0);
12100+
12101+#endif
12102+
12103+ return 1;
12104+}
12105+
12106+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12107+{
12108+ unsigned long i;
12109+
12110+ printk(KERN_ERR "PAX: bytes at PC: ");
12111+ for (i = 0; i < 8; i++) {
12112+ unsigned int c;
12113+ if (get_user(c, (unsigned int *)pc+i))
12114+ printk(KERN_CONT "???????? ");
12115+ else
12116+ printk(KERN_CONT "%08x ", c);
12117+ }
12118+ printk("\n");
12119+}
12120+#endif
12121+
12122 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12123 {
12124 enum ctx_state prev_state = exception_enter();
12125@@ -353,6 +816,29 @@ retry:
12126 if (!vma)
12127 goto bad_area;
12128
12129+#ifdef CONFIG_PAX_PAGEEXEC
12130+ /* PaX: detect ITLB misses on non-exec pages */
12131+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12132+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12133+ {
12134+ if (address != regs->tpc)
12135+ goto good_area;
12136+
12137+ up_read(&mm->mmap_sem);
12138+ switch (pax_handle_fetch_fault(regs)) {
12139+
12140+#ifdef CONFIG_PAX_EMUPLT
12141+ case 2:
12142+ case 3:
12143+ return;
12144+#endif
12145+
12146+ }
12147+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12148+ do_group_exit(SIGKILL);
12149+ }
12150+#endif
12151+
12152 /* Pure DTLB misses do not tell us whether the fault causing
12153 * load/store/atomic was a write or not, it only says that there
12154 * was no match. So in such a case we (carefully) read the
12155diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12156index 4242eab..9ae6360 100644
12157--- a/arch/sparc/mm/hugetlbpage.c
12158+++ b/arch/sparc/mm/hugetlbpage.c
12159@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12160 unsigned long addr,
12161 unsigned long len,
12162 unsigned long pgoff,
12163- unsigned long flags)
12164+ unsigned long flags,
12165+ unsigned long offset)
12166 {
12167+ struct mm_struct *mm = current->mm;
12168 unsigned long task_size = TASK_SIZE;
12169 struct vm_unmapped_area_info info;
12170
12171@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12172
12173 info.flags = 0;
12174 info.length = len;
12175- info.low_limit = TASK_UNMAPPED_BASE;
12176+ info.low_limit = mm->mmap_base;
12177 info.high_limit = min(task_size, VA_EXCLUDE_START);
12178 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12179 info.align_offset = 0;
12180+ info.threadstack_offset = offset;
12181 addr = vm_unmapped_area(&info);
12182
12183 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12184 VM_BUG_ON(addr != -ENOMEM);
12185 info.low_limit = VA_EXCLUDE_END;
12186+
12187+#ifdef CONFIG_PAX_RANDMMAP
12188+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12189+ info.low_limit += mm->delta_mmap;
12190+#endif
12191+
12192 info.high_limit = task_size;
12193 addr = vm_unmapped_area(&info);
12194 }
12195@@ -55,7 +64,8 @@ static unsigned long
12196 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12197 const unsigned long len,
12198 const unsigned long pgoff,
12199- const unsigned long flags)
12200+ const unsigned long flags,
12201+ const unsigned long offset)
12202 {
12203 struct mm_struct *mm = current->mm;
12204 unsigned long addr = addr0;
12205@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12206 info.high_limit = mm->mmap_base;
12207 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12208 info.align_offset = 0;
12209+ info.threadstack_offset = offset;
12210 addr = vm_unmapped_area(&info);
12211
12212 /*
12213@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12214 VM_BUG_ON(addr != -ENOMEM);
12215 info.flags = 0;
12216 info.low_limit = TASK_UNMAPPED_BASE;
12217+
12218+#ifdef CONFIG_PAX_RANDMMAP
12219+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12220+ info.low_limit += mm->delta_mmap;
12221+#endif
12222+
12223 info.high_limit = STACK_TOP32;
12224 addr = vm_unmapped_area(&info);
12225 }
12226@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12227 struct mm_struct *mm = current->mm;
12228 struct vm_area_struct *vma;
12229 unsigned long task_size = TASK_SIZE;
12230+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12231
12232 if (test_thread_flag(TIF_32BIT))
12233 task_size = STACK_TOP32;
12234@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12235 return addr;
12236 }
12237
12238+#ifdef CONFIG_PAX_RANDMMAP
12239+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12240+#endif
12241+
12242 if (addr) {
12243 addr = ALIGN(addr, HPAGE_SIZE);
12244 vma = find_vma(mm, addr);
12245- if (task_size - len >= addr &&
12246- (!vma || addr + len <= vma->vm_start))
12247+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12248 return addr;
12249 }
12250 if (mm->get_unmapped_area == arch_get_unmapped_area)
12251 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12252- pgoff, flags);
12253+ pgoff, flags, offset);
12254 else
12255 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12256- pgoff, flags);
12257+ pgoff, flags, offset);
12258 }
12259
12260 pte_t *huge_pte_alloc(struct mm_struct *mm,
12261diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12262index 4ca0d6b..e89bca1 100644
12263--- a/arch/sparc/mm/init_64.c
12264+++ b/arch/sparc/mm/init_64.c
12265@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12266 int num_kernel_image_mappings;
12267
12268 #ifdef CONFIG_DEBUG_DCFLUSH
12269-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12270+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12271 #ifdef CONFIG_SMP
12272-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12273+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12274 #endif
12275 #endif
12276
12277@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12278 {
12279 BUG_ON(tlb_type == hypervisor);
12280 #ifdef CONFIG_DEBUG_DCFLUSH
12281- atomic_inc(&dcpage_flushes);
12282+ atomic_inc_unchecked(&dcpage_flushes);
12283 #endif
12284
12285 #ifdef DCACHE_ALIASING_POSSIBLE
12286@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12287
12288 #ifdef CONFIG_DEBUG_DCFLUSH
12289 seq_printf(m, "DCPageFlushes\t: %d\n",
12290- atomic_read(&dcpage_flushes));
12291+ atomic_read_unchecked(&dcpage_flushes));
12292 #ifdef CONFIG_SMP
12293 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12294- atomic_read(&dcpage_flushes_xcall));
12295+ atomic_read_unchecked(&dcpage_flushes_xcall));
12296 #endif /* CONFIG_SMP */
12297 #endif /* CONFIG_DEBUG_DCFLUSH */
12298 }
12299diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12300index 7cca418..53fc030 100644
12301--- a/arch/tile/Kconfig
12302+++ b/arch/tile/Kconfig
12303@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12304
12305 config KEXEC
12306 bool "kexec system call"
12307+ depends on !GRKERNSEC_KMEM
12308 ---help---
12309 kexec is a system call that implements the ability to shutdown your
12310 current kernel, and to start another kernel. It is like a reboot
12311diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12312index 7b11c5f..755a026 100644
12313--- a/arch/tile/include/asm/atomic_64.h
12314+++ b/arch/tile/include/asm/atomic_64.h
12315@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12316
12317 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12318
12319+#define atomic64_read_unchecked(v) atomic64_read(v)
12320+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12321+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12322+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12323+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12324+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12325+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12326+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12327+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12328+
12329 /* Define this to indicate that cmpxchg is an efficient operation. */
12330 #define __HAVE_ARCH_CMPXCHG
12331
12332diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12333index 6160761..00cac88 100644
12334--- a/arch/tile/include/asm/cache.h
12335+++ b/arch/tile/include/asm/cache.h
12336@@ -15,11 +15,12 @@
12337 #ifndef _ASM_TILE_CACHE_H
12338 #define _ASM_TILE_CACHE_H
12339
12340+#include <linux/const.h>
12341 #include <arch/chip.h>
12342
12343 /* bytes per L1 data cache line */
12344 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12345-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12346+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12347
12348 /* bytes per L2 cache line */
12349 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12350diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12351index f41cb53..31d3ab4 100644
12352--- a/arch/tile/include/asm/uaccess.h
12353+++ b/arch/tile/include/asm/uaccess.h
12354@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12355 const void __user *from,
12356 unsigned long n)
12357 {
12358- int sz = __compiletime_object_size(to);
12359+ size_t sz = __compiletime_object_size(to);
12360
12361- if (likely(sz == -1 || sz >= n))
12362+ if (likely(sz == (size_t)-1 || sz >= n))
12363 n = _copy_from_user(to, from, n);
12364 else
12365 copy_from_user_overflow();
12366diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12367index 8416240..a012fb7 100644
12368--- a/arch/tile/mm/hugetlbpage.c
12369+++ b/arch/tile/mm/hugetlbpage.c
12370@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12371 info.high_limit = TASK_SIZE;
12372 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12373 info.align_offset = 0;
12374+ info.threadstack_offset = 0;
12375 return vm_unmapped_area(&info);
12376 }
12377
12378@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12379 info.high_limit = current->mm->mmap_base;
12380 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12381 info.align_offset = 0;
12382+ info.threadstack_offset = 0;
12383 addr = vm_unmapped_area(&info);
12384
12385 /*
12386diff --git a/arch/um/Makefile b/arch/um/Makefile
12387index e4b1a96..16162f8 100644
12388--- a/arch/um/Makefile
12389+++ b/arch/um/Makefile
12390@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12391 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12392 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12393
12394+ifdef CONSTIFY_PLUGIN
12395+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12396+endif
12397+
12398 #This will adjust *FLAGS accordingly to the platform.
12399 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12400
12401diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12402index 19e1bdd..3665b77 100644
12403--- a/arch/um/include/asm/cache.h
12404+++ b/arch/um/include/asm/cache.h
12405@@ -1,6 +1,7 @@
12406 #ifndef __UM_CACHE_H
12407 #define __UM_CACHE_H
12408
12409+#include <linux/const.h>
12410
12411 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12412 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12413@@ -12,6 +13,6 @@
12414 # define L1_CACHE_SHIFT 5
12415 #endif
12416
12417-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12418+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12419
12420 #endif
12421diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12422index 2e0a6b1..a64d0f5 100644
12423--- a/arch/um/include/asm/kmap_types.h
12424+++ b/arch/um/include/asm/kmap_types.h
12425@@ -8,6 +8,6 @@
12426
12427 /* No more #include "asm/arch/kmap_types.h" ! */
12428
12429-#define KM_TYPE_NR 14
12430+#define KM_TYPE_NR 15
12431
12432 #endif
12433diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12434index 71c5d13..4c7b9f1 100644
12435--- a/arch/um/include/asm/page.h
12436+++ b/arch/um/include/asm/page.h
12437@@ -14,6 +14,9 @@
12438 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12439 #define PAGE_MASK (~(PAGE_SIZE-1))
12440
12441+#define ktla_ktva(addr) (addr)
12442+#define ktva_ktla(addr) (addr)
12443+
12444 #ifndef __ASSEMBLY__
12445
12446 struct page;
12447diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12448index 2b4274e..754fe06 100644
12449--- a/arch/um/include/asm/pgtable-3level.h
12450+++ b/arch/um/include/asm/pgtable-3level.h
12451@@ -58,6 +58,7 @@
12452 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12453 #define pud_populate(mm, pud, pmd) \
12454 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12455+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12456
12457 #ifdef CONFIG_64BIT
12458 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12459diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12460index f17bca8..48adb87 100644
12461--- a/arch/um/kernel/process.c
12462+++ b/arch/um/kernel/process.c
12463@@ -356,22 +356,6 @@ int singlestepping(void * t)
12464 return 2;
12465 }
12466
12467-/*
12468- * Only x86 and x86_64 have an arch_align_stack().
12469- * All other arches have "#define arch_align_stack(x) (x)"
12470- * in their asm/exec.h
12471- * As this is included in UML from asm-um/system-generic.h,
12472- * we can use it to behave as the subarch does.
12473- */
12474-#ifndef arch_align_stack
12475-unsigned long arch_align_stack(unsigned long sp)
12476-{
12477- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12478- sp -= get_random_int() % 8192;
12479- return sp & ~0xf;
12480-}
12481-#endif
12482-
12483 unsigned long get_wchan(struct task_struct *p)
12484 {
12485 unsigned long stack_page, sp, ip;
12486diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12487index ad8f795..2c7eec6 100644
12488--- a/arch/unicore32/include/asm/cache.h
12489+++ b/arch/unicore32/include/asm/cache.h
12490@@ -12,8 +12,10 @@
12491 #ifndef __UNICORE_CACHE_H__
12492 #define __UNICORE_CACHE_H__
12493
12494-#define L1_CACHE_SHIFT (5)
12495-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12496+#include <linux/const.h>
12497+
12498+#define L1_CACHE_SHIFT 5
12499+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12500
12501 /*
12502 * Memory returned by kmalloc() may be used for DMA, so we must make
12503diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12504index b7d31ca..9481ec5 100644
12505--- a/arch/x86/Kconfig
12506+++ b/arch/x86/Kconfig
12507@@ -132,7 +132,7 @@ config X86
12508 select RTC_LIB
12509 select HAVE_DEBUG_STACKOVERFLOW
12510 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12511- select HAVE_CC_STACKPROTECTOR
12512+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12513 select GENERIC_CPU_AUTOPROBE
12514 select HAVE_ARCH_AUDITSYSCALL
12515 select ARCH_SUPPORTS_ATOMIC_RMW
12516@@ -266,7 +266,7 @@ config X86_HT
12517
12518 config X86_32_LAZY_GS
12519 def_bool y
12520- depends on X86_32 && !CC_STACKPROTECTOR
12521+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12522
12523 config ARCH_HWEIGHT_CFLAGS
12524 string
12525@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
12526
12527 menuconfig HYPERVISOR_GUEST
12528 bool "Linux guest support"
12529+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12530 ---help---
12531 Say Y here to enable options for running Linux under various hyper-
12532 visors. This option enables basic hypervisor detection and platform
12533@@ -1013,6 +1014,7 @@ config VM86
12534
12535 config X86_16BIT
12536 bool "Enable support for 16-bit segments" if EXPERT
12537+ depends on !GRKERNSEC
12538 default y
12539 ---help---
12540 This option is required by programs like Wine to run 16-bit
12541@@ -1186,6 +1188,7 @@ choice
12542
12543 config NOHIGHMEM
12544 bool "off"
12545+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12546 ---help---
12547 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12548 However, the address space of 32-bit x86 processors is only 4
12549@@ -1222,6 +1225,7 @@ config NOHIGHMEM
12550
12551 config HIGHMEM4G
12552 bool "4GB"
12553+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12554 ---help---
12555 Select this if you have a 32-bit processor and between 1 and 4
12556 gigabytes of physical RAM.
12557@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
12558 hex
12559 default 0xB0000000 if VMSPLIT_3G_OPT
12560 default 0x80000000 if VMSPLIT_2G
12561- default 0x78000000 if VMSPLIT_2G_OPT
12562+ default 0x70000000 if VMSPLIT_2G_OPT
12563 default 0x40000000 if VMSPLIT_1G
12564 default 0xC0000000
12565 depends on X86_32
12566@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
12567
12568 config KEXEC
12569 bool "kexec system call"
12570+ depends on !GRKERNSEC_KMEM
12571 ---help---
12572 kexec is a system call that implements the ability to shutdown your
12573 current kernel, and to start another kernel. It is like a reboot
12574@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
12575
12576 config PHYSICAL_ALIGN
12577 hex "Alignment value to which kernel should be aligned"
12578- default "0x200000"
12579+ default "0x1000000"
12580+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12581+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12582 range 0x2000 0x1000000 if X86_32
12583 range 0x200000 0x1000000 if X86_64
12584 ---help---
12585@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
12586 def_bool n
12587 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12588 depends on X86_32 || IA32_EMULATION
12589+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12590 ---help---
12591 Certain buggy versions of glibc will crash if they are
12592 presented with a 32-bit vDSO that is not mapped at the address
12593diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12594index 6983314..54ad7e8 100644
12595--- a/arch/x86/Kconfig.cpu
12596+++ b/arch/x86/Kconfig.cpu
12597@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12598
12599 config X86_F00F_BUG
12600 def_bool y
12601- depends on M586MMX || M586TSC || M586 || M486
12602+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12603
12604 config X86_INVD_BUG
12605 def_bool y
12606@@ -327,7 +327,7 @@ config X86_INVD_BUG
12607
12608 config X86_ALIGNMENT_16
12609 def_bool y
12610- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12611+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12612
12613 config X86_INTEL_USERCOPY
12614 def_bool y
12615@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12616 # generates cmov.
12617 config X86_CMOV
12618 def_bool y
12619- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12620+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12621
12622 config X86_MINIMUM_CPU_FAMILY
12623 int
12624diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12625index 20028da..88d5946 100644
12626--- a/arch/x86/Kconfig.debug
12627+++ b/arch/x86/Kconfig.debug
12628@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12629 config DEBUG_RODATA
12630 bool "Write protect kernel read-only data structures"
12631 default y
12632- depends on DEBUG_KERNEL
12633+ depends on DEBUG_KERNEL && BROKEN
12634 ---help---
12635 Mark the kernel read-only data as write-protected in the pagetables,
12636 in order to catch accidental (and incorrect) writes to such const
12637@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12638
12639 config DEBUG_SET_MODULE_RONX
12640 bool "Set loadable kernel module data as NX and text as RO"
12641- depends on MODULES
12642+ depends on MODULES && BROKEN
12643 ---help---
12644 This option helps catch unintended modifications to loadable
12645 kernel module's text and read-only data. It also prevents execution
12646diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12647index 5ba2d9c..41e5bb6 100644
12648--- a/arch/x86/Makefile
12649+++ b/arch/x86/Makefile
12650@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12651 # CPU-specific tuning. Anything which can be shared with UML should go here.
12652 include $(srctree)/arch/x86/Makefile_32.cpu
12653 KBUILD_CFLAGS += $(cflags-y)
12654-
12655- # temporary until string.h is fixed
12656- KBUILD_CFLAGS += -ffreestanding
12657 else
12658 BITS := 64
12659 UTS_MACHINE := x86_64
12660@@ -107,6 +104,9 @@ else
12661 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12662 endif
12663
12664+# temporary until string.h is fixed
12665+KBUILD_CFLAGS += -ffreestanding
12666+
12667 # Make sure compiler does not have buggy stack-protector support.
12668 ifdef CONFIG_CC_STACKPROTECTOR
12669 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12670@@ -181,6 +181,7 @@ archheaders:
12671 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12672
12673 archprepare:
12674+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12675 ifeq ($(CONFIG_KEXEC_FILE),y)
12676 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12677 endif
12678@@ -264,3 +265,9 @@ define archhelp
12679 echo ' FDARGS="..." arguments for the booted kernel'
12680 echo ' FDINITRD=file initrd for the booted kernel'
12681 endef
12682+
12683+define OLD_LD
12684+
12685+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12686+*** Please upgrade your binutils to 2.18 or newer
12687+endef
12688diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12689index 57bbf2f..b100fce 100644
12690--- a/arch/x86/boot/Makefile
12691+++ b/arch/x86/boot/Makefile
12692@@ -58,6 +58,9 @@ clean-files += cpustr.h
12693 # ---------------------------------------------------------------------------
12694
12695 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12696+ifdef CONSTIFY_PLUGIN
12697+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12698+endif
12699 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12700 GCOV_PROFILE := n
12701
12702diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12703index 878e4b9..20537ab 100644
12704--- a/arch/x86/boot/bitops.h
12705+++ b/arch/x86/boot/bitops.h
12706@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12707 u8 v;
12708 const u32 *p = (const u32 *)addr;
12709
12710- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12711+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12712 return v;
12713 }
12714
12715@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12716
12717 static inline void set_bit(int nr, void *addr)
12718 {
12719- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12720+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12721 }
12722
12723 #endif /* BOOT_BITOPS_H */
12724diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12725index bd49ec6..94c7f58 100644
12726--- a/arch/x86/boot/boot.h
12727+++ b/arch/x86/boot/boot.h
12728@@ -84,7 +84,7 @@ static inline void io_delay(void)
12729 static inline u16 ds(void)
12730 {
12731 u16 seg;
12732- asm("movw %%ds,%0" : "=rm" (seg));
12733+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12734 return seg;
12735 }
12736
12737diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12738index 0a291cd..9686efc 100644
12739--- a/arch/x86/boot/compressed/Makefile
12740+++ b/arch/x86/boot/compressed/Makefile
12741@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12742 KBUILD_CFLAGS += -mno-mmx -mno-sse
12743 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12744 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12745+ifdef CONSTIFY_PLUGIN
12746+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12747+endif
12748
12749 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12750 GCOV_PROFILE := n
12751diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12752index a53440e..c3dbf1e 100644
12753--- a/arch/x86/boot/compressed/efi_stub_32.S
12754+++ b/arch/x86/boot/compressed/efi_stub_32.S
12755@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12756 * parameter 2, ..., param n. To make things easy, we save the return
12757 * address of efi_call_phys in a global variable.
12758 */
12759- popl %ecx
12760- movl %ecx, saved_return_addr(%edx)
12761- /* get the function pointer into ECX*/
12762- popl %ecx
12763- movl %ecx, efi_rt_function_ptr(%edx)
12764+ popl saved_return_addr(%edx)
12765+ popl efi_rt_function_ptr(%edx)
12766
12767 /*
12768 * 3. Call the physical function.
12769 */
12770- call *%ecx
12771+ call *efi_rt_function_ptr(%edx)
12772
12773 /*
12774 * 4. Balance the stack. And because EAX contain the return value,
12775@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12776 1: popl %edx
12777 subl $1b, %edx
12778
12779- movl efi_rt_function_ptr(%edx), %ecx
12780- pushl %ecx
12781+ pushl efi_rt_function_ptr(%edx)
12782
12783 /*
12784 * 10. Push the saved return address onto the stack and return.
12785 */
12786- movl saved_return_addr(%edx), %ecx
12787- pushl %ecx
12788- ret
12789+ jmpl *saved_return_addr(%edx)
12790 ENDPROC(efi_call_phys)
12791 .previous
12792
12793diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12794index 630384a..278e788 100644
12795--- a/arch/x86/boot/compressed/efi_thunk_64.S
12796+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12797@@ -189,8 +189,8 @@ efi_gdt64:
12798 .long 0 /* Filled out by user */
12799 .word 0
12800 .quad 0x0000000000000000 /* NULL descriptor */
12801- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12802- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12803+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12804+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12805 .quad 0x0080890000000000 /* TS descriptor */
12806 .quad 0x0000000000000000 /* TS continued */
12807 efi_gdt64_end:
12808diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12809index 1d7fbbc..36ecd58 100644
12810--- a/arch/x86/boot/compressed/head_32.S
12811+++ b/arch/x86/boot/compressed/head_32.S
12812@@ -140,10 +140,10 @@ preferred_addr:
12813 addl %eax, %ebx
12814 notl %eax
12815 andl %eax, %ebx
12816- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12817+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12818 jge 1f
12819 #endif
12820- movl $LOAD_PHYSICAL_ADDR, %ebx
12821+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12822 1:
12823
12824 /* Target address to relocate to for decompression */
12825diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12826index 6b1766c..ad465c9 100644
12827--- a/arch/x86/boot/compressed/head_64.S
12828+++ b/arch/x86/boot/compressed/head_64.S
12829@@ -94,10 +94,10 @@ ENTRY(startup_32)
12830 addl %eax, %ebx
12831 notl %eax
12832 andl %eax, %ebx
12833- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12834+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12835 jge 1f
12836 #endif
12837- movl $LOAD_PHYSICAL_ADDR, %ebx
12838+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12839 1:
12840
12841 /* Target address to relocate to for decompression */
12842@@ -322,10 +322,10 @@ preferred_addr:
12843 addq %rax, %rbp
12844 notq %rax
12845 andq %rax, %rbp
12846- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12847+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12848 jge 1f
12849 #endif
12850- movq $LOAD_PHYSICAL_ADDR, %rbp
12851+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12852 1:
12853
12854 /* Target address to relocate to for decompression */
12855@@ -434,8 +434,8 @@ gdt:
12856 .long gdt
12857 .word 0
12858 .quad 0x0000000000000000 /* NULL descriptor */
12859- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12860- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12861+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12862+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12863 .quad 0x0080890000000000 /* TS descriptor */
12864 .quad 0x0000000000000000 /* TS continued */
12865 gdt_end:
12866diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12867index a950864..c710239 100644
12868--- a/arch/x86/boot/compressed/misc.c
12869+++ b/arch/x86/boot/compressed/misc.c
12870@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12871 * Calculate the delta between where vmlinux was linked to load
12872 * and where it was actually loaded.
12873 */
12874- delta = min_addr - LOAD_PHYSICAL_ADDR;
12875+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12876 if (!delta) {
12877 debug_putstr("No relocation needed... ");
12878 return;
12879@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12880 Elf32_Ehdr ehdr;
12881 Elf32_Phdr *phdrs, *phdr;
12882 #endif
12883- void *dest;
12884+ void *dest, *prev;
12885 int i;
12886
12887 memcpy(&ehdr, output, sizeof(ehdr));
12888@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12889 case PT_LOAD:
12890 #ifdef CONFIG_RELOCATABLE
12891 dest = output;
12892- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12893+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12894 #else
12895 dest = (void *)(phdr->p_paddr);
12896 #endif
12897 memcpy(dest,
12898 output + phdr->p_offset,
12899 phdr->p_filesz);
12900+ if (i)
12901+ memset(prev, 0xff, dest - prev);
12902+ prev = dest + phdr->p_filesz;
12903 break;
12904 default: /* Ignore other PT_* */ break;
12905 }
12906@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12907 error("Destination address too large");
12908 #endif
12909 #ifndef CONFIG_RELOCATABLE
12910- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12911+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12912 error("Wrong destination address");
12913 #endif
12914
12915diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12916index 1fd7d57..0f7d096 100644
12917--- a/arch/x86/boot/cpucheck.c
12918+++ b/arch/x86/boot/cpucheck.c
12919@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12920 u32 ecx = MSR_K7_HWCR;
12921 u32 eax, edx;
12922
12923- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12924+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12925 eax &= ~(1 << 15);
12926- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12927+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12928
12929 get_cpuflags(); /* Make sure it really did something */
12930 err = check_cpuflags();
12931@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12932 u32 ecx = MSR_VIA_FCR;
12933 u32 eax, edx;
12934
12935- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12936+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12937 eax |= (1<<1)|(1<<7);
12938- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12939+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12940
12941 set_bit(X86_FEATURE_CX8, cpu.flags);
12942 err = check_cpuflags();
12943@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12944 u32 eax, edx;
12945 u32 level = 1;
12946
12947- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12948- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12949- asm("cpuid"
12950+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12951+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12952+ asm volatile("cpuid"
12953 : "+a" (level), "=d" (cpu.flags[0])
12954 : : "ecx", "ebx");
12955- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12956+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12957
12958 err = check_cpuflags();
12959 } else if (err == 0x01 &&
12960diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12961index 16ef025..91e033b 100644
12962--- a/arch/x86/boot/header.S
12963+++ b/arch/x86/boot/header.S
12964@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12965 # single linked list of
12966 # struct setup_data
12967
12968-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12969+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12970
12971 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12972+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12973+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12974+#else
12975 #define VO_INIT_SIZE (VO__end - VO__text)
12976+#endif
12977 #if ZO_INIT_SIZE > VO_INIT_SIZE
12978 #define INIT_SIZE ZO_INIT_SIZE
12979 #else
12980diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12981index db75d07..8e6d0af 100644
12982--- a/arch/x86/boot/memory.c
12983+++ b/arch/x86/boot/memory.c
12984@@ -19,7 +19,7 @@
12985
12986 static int detect_memory_e820(void)
12987 {
12988- int count = 0;
12989+ unsigned int count = 0;
12990 struct biosregs ireg, oreg;
12991 struct e820entry *desc = boot_params.e820_map;
12992 static struct e820entry buf; /* static so it is zeroed */
12993diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12994index ba3e100..6501b8f 100644
12995--- a/arch/x86/boot/video-vesa.c
12996+++ b/arch/x86/boot/video-vesa.c
12997@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
12998
12999 boot_params.screen_info.vesapm_seg = oreg.es;
13000 boot_params.screen_info.vesapm_off = oreg.di;
13001+ boot_params.screen_info.vesapm_size = oreg.cx;
13002 }
13003
13004 /*
13005diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13006index 43eda28..5ab5fdb 100644
13007--- a/arch/x86/boot/video.c
13008+++ b/arch/x86/boot/video.c
13009@@ -96,7 +96,7 @@ static void store_mode_params(void)
13010 static unsigned int get_entry(void)
13011 {
13012 char entry_buf[4];
13013- int i, len = 0;
13014+ unsigned int i, len = 0;
13015 int key;
13016 unsigned int v;
13017
13018diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13019index 9105655..41779c1 100644
13020--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13021+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13022@@ -8,6 +8,8 @@
13023 * including this sentence is retained in full.
13024 */
13025
13026+#include <asm/alternative-asm.h>
13027+
13028 .extern crypto_ft_tab
13029 .extern crypto_it_tab
13030 .extern crypto_fl_tab
13031@@ -70,6 +72,8 @@
13032 je B192; \
13033 leaq 32(r9),r9;
13034
13035+#define ret pax_force_retaddr; ret
13036+
13037 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13038 movq r1,r2; \
13039 movq r3,r4; \
13040diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13041index 6bd2c6c..368c93e 100644
13042--- a/arch/x86/crypto/aesni-intel_asm.S
13043+++ b/arch/x86/crypto/aesni-intel_asm.S
13044@@ -31,6 +31,7 @@
13045
13046 #include <linux/linkage.h>
13047 #include <asm/inst.h>
13048+#include <asm/alternative-asm.h>
13049
13050 /*
13051 * The following macros are used to move an (un)aligned 16 byte value to/from
13052@@ -217,7 +218,7 @@ enc: .octa 0x2
13053 * num_initial_blocks = b mod 4
13054 * encrypt the initial num_initial_blocks blocks and apply ghash on
13055 * the ciphertext
13056-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13057+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13058 * are clobbered
13059 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13060 */
13061@@ -227,8 +228,8 @@ enc: .octa 0x2
13062 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13063 MOVADQ SHUF_MASK(%rip), %xmm14
13064 mov arg7, %r10 # %r10 = AAD
13065- mov arg8, %r12 # %r12 = aadLen
13066- mov %r12, %r11
13067+ mov arg8, %r15 # %r15 = aadLen
13068+ mov %r15, %r11
13069 pxor %xmm\i, %xmm\i
13070
13071 _get_AAD_loop\num_initial_blocks\operation:
13072@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13073 psrldq $4, %xmm\i
13074 pxor \TMP1, %xmm\i
13075 add $4, %r10
13076- sub $4, %r12
13077+ sub $4, %r15
13078 jne _get_AAD_loop\num_initial_blocks\operation
13079
13080 cmp $16, %r11
13081 je _get_AAD_loop2_done\num_initial_blocks\operation
13082
13083- mov $16, %r12
13084+ mov $16, %r15
13085 _get_AAD_loop2\num_initial_blocks\operation:
13086 psrldq $4, %xmm\i
13087- sub $4, %r12
13088- cmp %r11, %r12
13089+ sub $4, %r15
13090+ cmp %r11, %r15
13091 jne _get_AAD_loop2\num_initial_blocks\operation
13092
13093 _get_AAD_loop2_done\num_initial_blocks\operation:
13094@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13095 * num_initial_blocks = b mod 4
13096 * encrypt the initial num_initial_blocks blocks and apply ghash on
13097 * the ciphertext
13098-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13099+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13100 * are clobbered
13101 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13102 */
13103@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13104 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13105 MOVADQ SHUF_MASK(%rip), %xmm14
13106 mov arg7, %r10 # %r10 = AAD
13107- mov arg8, %r12 # %r12 = aadLen
13108- mov %r12, %r11
13109+ mov arg8, %r15 # %r15 = aadLen
13110+ mov %r15, %r11
13111 pxor %xmm\i, %xmm\i
13112 _get_AAD_loop\num_initial_blocks\operation:
13113 movd (%r10), \TMP1
13114@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13115 psrldq $4, %xmm\i
13116 pxor \TMP1, %xmm\i
13117 add $4, %r10
13118- sub $4, %r12
13119+ sub $4, %r15
13120 jne _get_AAD_loop\num_initial_blocks\operation
13121 cmp $16, %r11
13122 je _get_AAD_loop2_done\num_initial_blocks\operation
13123- mov $16, %r12
13124+ mov $16, %r15
13125 _get_AAD_loop2\num_initial_blocks\operation:
13126 psrldq $4, %xmm\i
13127- sub $4, %r12
13128- cmp %r11, %r12
13129+ sub $4, %r15
13130+ cmp %r11, %r15
13131 jne _get_AAD_loop2\num_initial_blocks\operation
13132 _get_AAD_loop2_done\num_initial_blocks\operation:
13133 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13134@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13135 *
13136 *****************************************************************************/
13137 ENTRY(aesni_gcm_dec)
13138- push %r12
13139+ push %r15
13140 push %r13
13141 push %r14
13142 mov %rsp, %r14
13143@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13144 */
13145 sub $VARIABLE_OFFSET, %rsp
13146 and $~63, %rsp # align rsp to 64 bytes
13147- mov %arg6, %r12
13148- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13149+ mov %arg6, %r15
13150+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13151 movdqa SHUF_MASK(%rip), %xmm2
13152 PSHUFB_XMM %xmm2, %xmm13
13153
13154@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13155 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13156 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13157 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13158- mov %r13, %r12
13159- and $(3<<4), %r12
13160+ mov %r13, %r15
13161+ and $(3<<4), %r15
13162 jz _initial_num_blocks_is_0_decrypt
13163- cmp $(2<<4), %r12
13164+ cmp $(2<<4), %r15
13165 jb _initial_num_blocks_is_1_decrypt
13166 je _initial_num_blocks_is_2_decrypt
13167 _initial_num_blocks_is_3_decrypt:
13168@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13169 sub $16, %r11
13170 add %r13, %r11
13171 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13172- lea SHIFT_MASK+16(%rip), %r12
13173- sub %r13, %r12
13174+ lea SHIFT_MASK+16(%rip), %r15
13175+ sub %r13, %r15
13176 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13177 # (%r13 is the number of bytes in plaintext mod 16)
13178- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13179+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13180 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13181
13182 movdqa %xmm1, %xmm2
13183 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13184- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13185+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13186 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13187 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13188 pand %xmm1, %xmm2
13189@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13190 sub $1, %r13
13191 jne _less_than_8_bytes_left_decrypt
13192 _multiple_of_16_bytes_decrypt:
13193- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13194- shl $3, %r12 # convert into number of bits
13195- movd %r12d, %xmm15 # len(A) in %xmm15
13196+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13197+ shl $3, %r15 # convert into number of bits
13198+ movd %r15d, %xmm15 # len(A) in %xmm15
13199 shl $3, %arg4 # len(C) in bits (*128)
13200 MOVQ_R64_XMM %arg4, %xmm1
13201 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13202@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13203 mov %r14, %rsp
13204 pop %r14
13205 pop %r13
13206- pop %r12
13207+ pop %r15
13208+ pax_force_retaddr
13209 ret
13210 ENDPROC(aesni_gcm_dec)
13211
13212@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13213 * poly = x^128 + x^127 + x^126 + x^121 + 1
13214 ***************************************************************************/
13215 ENTRY(aesni_gcm_enc)
13216- push %r12
13217+ push %r15
13218 push %r13
13219 push %r14
13220 mov %rsp, %r14
13221@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13222 #
13223 sub $VARIABLE_OFFSET, %rsp
13224 and $~63, %rsp
13225- mov %arg6, %r12
13226- movdqu (%r12), %xmm13
13227+ mov %arg6, %r15
13228+ movdqu (%r15), %xmm13
13229 movdqa SHUF_MASK(%rip), %xmm2
13230 PSHUFB_XMM %xmm2, %xmm13
13231
13232@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13233 movdqa %xmm13, HashKey(%rsp)
13234 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13235 and $-16, %r13
13236- mov %r13, %r12
13237+ mov %r13, %r15
13238
13239 # Encrypt first few blocks
13240
13241- and $(3<<4), %r12
13242+ and $(3<<4), %r15
13243 jz _initial_num_blocks_is_0_encrypt
13244- cmp $(2<<4), %r12
13245+ cmp $(2<<4), %r15
13246 jb _initial_num_blocks_is_1_encrypt
13247 je _initial_num_blocks_is_2_encrypt
13248 _initial_num_blocks_is_3_encrypt:
13249@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13250 sub $16, %r11
13251 add %r13, %r11
13252 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13253- lea SHIFT_MASK+16(%rip), %r12
13254- sub %r13, %r12
13255+ lea SHIFT_MASK+16(%rip), %r15
13256+ sub %r13, %r15
13257 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13258 # (%r13 is the number of bytes in plaintext mod 16)
13259- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13260+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13261 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13262 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13263- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13264+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13265 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13266 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13267 movdqa SHUF_MASK(%rip), %xmm10
13268@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13269 sub $1, %r13
13270 jne _less_than_8_bytes_left_encrypt
13271 _multiple_of_16_bytes_encrypt:
13272- mov arg8, %r12 # %r12 = addLen (number of bytes)
13273- shl $3, %r12
13274- movd %r12d, %xmm15 # len(A) in %xmm15
13275+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13276+ shl $3, %r15
13277+ movd %r15d, %xmm15 # len(A) in %xmm15
13278 shl $3, %arg4 # len(C) in bits (*128)
13279 MOVQ_R64_XMM %arg4, %xmm1
13280 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13281@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13282 mov %r14, %rsp
13283 pop %r14
13284 pop %r13
13285- pop %r12
13286+ pop %r15
13287+ pax_force_retaddr
13288 ret
13289 ENDPROC(aesni_gcm_enc)
13290
13291@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13292 pxor %xmm1, %xmm0
13293 movaps %xmm0, (TKEYP)
13294 add $0x10, TKEYP
13295+ pax_force_retaddr
13296 ret
13297 ENDPROC(_key_expansion_128)
13298 ENDPROC(_key_expansion_256a)
13299@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13300 shufps $0b01001110, %xmm2, %xmm1
13301 movaps %xmm1, 0x10(TKEYP)
13302 add $0x20, TKEYP
13303+ pax_force_retaddr
13304 ret
13305 ENDPROC(_key_expansion_192a)
13306
13307@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13308
13309 movaps %xmm0, (TKEYP)
13310 add $0x10, TKEYP
13311+ pax_force_retaddr
13312 ret
13313 ENDPROC(_key_expansion_192b)
13314
13315@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13316 pxor %xmm1, %xmm2
13317 movaps %xmm2, (TKEYP)
13318 add $0x10, TKEYP
13319+ pax_force_retaddr
13320 ret
13321 ENDPROC(_key_expansion_256b)
13322
13323@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13324 #ifndef __x86_64__
13325 popl KEYP
13326 #endif
13327+ pax_force_retaddr
13328 ret
13329 ENDPROC(aesni_set_key)
13330
13331@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13332 popl KLEN
13333 popl KEYP
13334 #endif
13335+ pax_force_retaddr
13336 ret
13337 ENDPROC(aesni_enc)
13338
13339@@ -1985,6 +1994,7 @@ _aesni_enc1:
13340 AESENC KEY STATE
13341 movaps 0x70(TKEYP), KEY
13342 AESENCLAST KEY STATE
13343+ pax_force_retaddr
13344 ret
13345 ENDPROC(_aesni_enc1)
13346
13347@@ -2094,6 +2104,7 @@ _aesni_enc4:
13348 AESENCLAST KEY STATE2
13349 AESENCLAST KEY STATE3
13350 AESENCLAST KEY STATE4
13351+ pax_force_retaddr
13352 ret
13353 ENDPROC(_aesni_enc4)
13354
13355@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13356 popl KLEN
13357 popl KEYP
13358 #endif
13359+ pax_force_retaddr
13360 ret
13361 ENDPROC(aesni_dec)
13362
13363@@ -2175,6 +2187,7 @@ _aesni_dec1:
13364 AESDEC KEY STATE
13365 movaps 0x70(TKEYP), KEY
13366 AESDECLAST KEY STATE
13367+ pax_force_retaddr
13368 ret
13369 ENDPROC(_aesni_dec1)
13370
13371@@ -2284,6 +2297,7 @@ _aesni_dec4:
13372 AESDECLAST KEY STATE2
13373 AESDECLAST KEY STATE3
13374 AESDECLAST KEY STATE4
13375+ pax_force_retaddr
13376 ret
13377 ENDPROC(_aesni_dec4)
13378
13379@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13380 popl KEYP
13381 popl LEN
13382 #endif
13383+ pax_force_retaddr
13384 ret
13385 ENDPROC(aesni_ecb_enc)
13386
13387@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13388 popl KEYP
13389 popl LEN
13390 #endif
13391+ pax_force_retaddr
13392 ret
13393 ENDPROC(aesni_ecb_dec)
13394
13395@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13396 popl LEN
13397 popl IVP
13398 #endif
13399+ pax_force_retaddr
13400 ret
13401 ENDPROC(aesni_cbc_enc)
13402
13403@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13404 popl LEN
13405 popl IVP
13406 #endif
13407+ pax_force_retaddr
13408 ret
13409 ENDPROC(aesni_cbc_dec)
13410
13411@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13412 mov $1, TCTR_LOW
13413 MOVQ_R64_XMM TCTR_LOW INC
13414 MOVQ_R64_XMM CTR TCTR_LOW
13415+ pax_force_retaddr
13416 ret
13417 ENDPROC(_aesni_inc_init)
13418
13419@@ -2590,6 +2609,7 @@ _aesni_inc:
13420 .Linc_low:
13421 movaps CTR, IV
13422 PSHUFB_XMM BSWAP_MASK IV
13423+ pax_force_retaddr
13424 ret
13425 ENDPROC(_aesni_inc)
13426
13427@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13428 .Lctr_enc_ret:
13429 movups IV, (IVP)
13430 .Lctr_enc_just_ret:
13431+ pax_force_retaddr
13432 ret
13433 ENDPROC(aesni_ctr_enc)
13434
13435@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13436 pxor INC, STATE4
13437 movdqu STATE4, 0x70(OUTP)
13438
13439+ pax_force_retaddr
13440 ret
13441 ENDPROC(aesni_xts_crypt8)
13442
13443diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13444index 246c670..466e2d6 100644
13445--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13446+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13447@@ -21,6 +21,7 @@
13448 */
13449
13450 #include <linux/linkage.h>
13451+#include <asm/alternative-asm.h>
13452
13453 .file "blowfish-x86_64-asm.S"
13454 .text
13455@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13456 jnz .L__enc_xor;
13457
13458 write_block();
13459+ pax_force_retaddr
13460 ret;
13461 .L__enc_xor:
13462 xor_block();
13463+ pax_force_retaddr
13464 ret;
13465 ENDPROC(__blowfish_enc_blk)
13466
13467@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13468
13469 movq %r11, %rbp;
13470
13471+ pax_force_retaddr
13472 ret;
13473 ENDPROC(blowfish_dec_blk)
13474
13475@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13476
13477 popq %rbx;
13478 popq %rbp;
13479+ pax_force_retaddr
13480 ret;
13481
13482 .L__enc_xor4:
13483@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13484
13485 popq %rbx;
13486 popq %rbp;
13487+ pax_force_retaddr
13488 ret;
13489 ENDPROC(__blowfish_enc_blk_4way)
13490
13491@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13492 popq %rbx;
13493 popq %rbp;
13494
13495+ pax_force_retaddr
13496 ret;
13497 ENDPROC(blowfish_dec_blk_4way)
13498diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13499index ce71f92..1dce7ec 100644
13500--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13501+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13502@@ -16,6 +16,7 @@
13503 */
13504
13505 #include <linux/linkage.h>
13506+#include <asm/alternative-asm.h>
13507
13508 #define CAMELLIA_TABLE_BYTE_LEN 272
13509
13510@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13511 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13512 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13513 %rcx, (%r9));
13514+ pax_force_retaddr
13515 ret;
13516 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13517
13518@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13519 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13520 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13521 %rax, (%r9));
13522+ pax_force_retaddr
13523 ret;
13524 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13525
13526@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13527 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13528 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13529
13530+ pax_force_retaddr
13531 ret;
13532
13533 .align 8
13534@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13535 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13536 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13537
13538+ pax_force_retaddr
13539 ret;
13540
13541 .align 8
13542@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13543 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13544 %xmm8, %rsi);
13545
13546+ pax_force_retaddr
13547 ret;
13548 ENDPROC(camellia_ecb_enc_16way)
13549
13550@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13551 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13552 %xmm8, %rsi);
13553
13554+ pax_force_retaddr
13555 ret;
13556 ENDPROC(camellia_ecb_dec_16way)
13557
13558@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13559 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13560 %xmm8, %rsi);
13561
13562+ pax_force_retaddr
13563 ret;
13564 ENDPROC(camellia_cbc_dec_16way)
13565
13566@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13567 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13568 %xmm8, %rsi);
13569
13570+ pax_force_retaddr
13571 ret;
13572 ENDPROC(camellia_ctr_16way)
13573
13574@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13575 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13576 %xmm8, %rsi);
13577
13578+ pax_force_retaddr
13579 ret;
13580 ENDPROC(camellia_xts_crypt_16way)
13581
13582diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13583index 0e0b886..5a3123c 100644
13584--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13585+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13586@@ -11,6 +11,7 @@
13587 */
13588
13589 #include <linux/linkage.h>
13590+#include <asm/alternative-asm.h>
13591
13592 #define CAMELLIA_TABLE_BYTE_LEN 272
13593
13594@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13595 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13596 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13597 %rcx, (%r9));
13598+ pax_force_retaddr
13599 ret;
13600 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13601
13602@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13603 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13604 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13605 %rax, (%r9));
13606+ pax_force_retaddr
13607 ret;
13608 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13609
13610@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13611 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13612 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13613
13614+ pax_force_retaddr
13615 ret;
13616
13617 .align 8
13618@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13619 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13620 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13621
13622+ pax_force_retaddr
13623 ret;
13624
13625 .align 8
13626@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13627
13628 vzeroupper;
13629
13630+ pax_force_retaddr
13631 ret;
13632 ENDPROC(camellia_ecb_enc_32way)
13633
13634@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13635
13636 vzeroupper;
13637
13638+ pax_force_retaddr
13639 ret;
13640 ENDPROC(camellia_ecb_dec_32way)
13641
13642@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13643
13644 vzeroupper;
13645
13646+ pax_force_retaddr
13647 ret;
13648 ENDPROC(camellia_cbc_dec_32way)
13649
13650@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13651
13652 vzeroupper;
13653
13654+ pax_force_retaddr
13655 ret;
13656 ENDPROC(camellia_ctr_32way)
13657
13658@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13659
13660 vzeroupper;
13661
13662+ pax_force_retaddr
13663 ret;
13664 ENDPROC(camellia_xts_crypt_32way)
13665
13666diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13667index 310319c..db3d7b5 100644
13668--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13669+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13670@@ -21,6 +21,7 @@
13671 */
13672
13673 #include <linux/linkage.h>
13674+#include <asm/alternative-asm.h>
13675
13676 .file "camellia-x86_64-asm_64.S"
13677 .text
13678@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13679 enc_outunpack(mov, RT1);
13680
13681 movq RRBP, %rbp;
13682+ pax_force_retaddr
13683 ret;
13684
13685 .L__enc_xor:
13686 enc_outunpack(xor, RT1);
13687
13688 movq RRBP, %rbp;
13689+ pax_force_retaddr
13690 ret;
13691 ENDPROC(__camellia_enc_blk)
13692
13693@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13694 dec_outunpack();
13695
13696 movq RRBP, %rbp;
13697+ pax_force_retaddr
13698 ret;
13699 ENDPROC(camellia_dec_blk)
13700
13701@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13702
13703 movq RRBP, %rbp;
13704 popq %rbx;
13705+ pax_force_retaddr
13706 ret;
13707
13708 .L__enc2_xor:
13709@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13710
13711 movq RRBP, %rbp;
13712 popq %rbx;
13713+ pax_force_retaddr
13714 ret;
13715 ENDPROC(__camellia_enc_blk_2way)
13716
13717@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13718
13719 movq RRBP, %rbp;
13720 movq RXOR, %rbx;
13721+ pax_force_retaddr
13722 ret;
13723 ENDPROC(camellia_dec_blk_2way)
13724diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13725index c35fd5d..2d8c7db 100644
13726--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13727+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13728@@ -24,6 +24,7 @@
13729 */
13730
13731 #include <linux/linkage.h>
13732+#include <asm/alternative-asm.h>
13733
13734 .file "cast5-avx-x86_64-asm_64.S"
13735
13736@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13737 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13738 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13739
13740+ pax_force_retaddr
13741 ret;
13742 ENDPROC(__cast5_enc_blk16)
13743
13744@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13745 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13746 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13747
13748+ pax_force_retaddr
13749 ret;
13750
13751 .L__skip_dec:
13752@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13753 vmovdqu RR4, (6*4*4)(%r11);
13754 vmovdqu RL4, (7*4*4)(%r11);
13755
13756+ pax_force_retaddr
13757 ret;
13758 ENDPROC(cast5_ecb_enc_16way)
13759
13760@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13761 vmovdqu RR4, (6*4*4)(%r11);
13762 vmovdqu RL4, (7*4*4)(%r11);
13763
13764+ pax_force_retaddr
13765 ret;
13766 ENDPROC(cast5_ecb_dec_16way)
13767
13768@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13769 * %rdx: src
13770 */
13771
13772- pushq %r12;
13773+ pushq %r14;
13774
13775 movq %rsi, %r11;
13776- movq %rdx, %r12;
13777+ movq %rdx, %r14;
13778
13779 vmovdqu (0*16)(%rdx), RL1;
13780 vmovdqu (1*16)(%rdx), RR1;
13781@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13782 call __cast5_dec_blk16;
13783
13784 /* xor with src */
13785- vmovq (%r12), RX;
13786+ vmovq (%r14), RX;
13787 vpshufd $0x4f, RX, RX;
13788 vpxor RX, RR1, RR1;
13789- vpxor 0*16+8(%r12), RL1, RL1;
13790- vpxor 1*16+8(%r12), RR2, RR2;
13791- vpxor 2*16+8(%r12), RL2, RL2;
13792- vpxor 3*16+8(%r12), RR3, RR3;
13793- vpxor 4*16+8(%r12), RL3, RL3;
13794- vpxor 5*16+8(%r12), RR4, RR4;
13795- vpxor 6*16+8(%r12), RL4, RL4;
13796+ vpxor 0*16+8(%r14), RL1, RL1;
13797+ vpxor 1*16+8(%r14), RR2, RR2;
13798+ vpxor 2*16+8(%r14), RL2, RL2;
13799+ vpxor 3*16+8(%r14), RR3, RR3;
13800+ vpxor 4*16+8(%r14), RL3, RL3;
13801+ vpxor 5*16+8(%r14), RR4, RR4;
13802+ vpxor 6*16+8(%r14), RL4, RL4;
13803
13804 vmovdqu RR1, (0*16)(%r11);
13805 vmovdqu RL1, (1*16)(%r11);
13806@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13807 vmovdqu RR4, (6*16)(%r11);
13808 vmovdqu RL4, (7*16)(%r11);
13809
13810- popq %r12;
13811+ popq %r14;
13812
13813+ pax_force_retaddr
13814 ret;
13815 ENDPROC(cast5_cbc_dec_16way)
13816
13817@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13818 * %rcx: iv (big endian, 64bit)
13819 */
13820
13821- pushq %r12;
13822+ pushq %r14;
13823
13824 movq %rsi, %r11;
13825- movq %rdx, %r12;
13826+ movq %rdx, %r14;
13827
13828 vpcmpeqd RTMP, RTMP, RTMP;
13829 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13830@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13831 call __cast5_enc_blk16;
13832
13833 /* dst = src ^ iv */
13834- vpxor (0*16)(%r12), RR1, RR1;
13835- vpxor (1*16)(%r12), RL1, RL1;
13836- vpxor (2*16)(%r12), RR2, RR2;
13837- vpxor (3*16)(%r12), RL2, RL2;
13838- vpxor (4*16)(%r12), RR3, RR3;
13839- vpxor (5*16)(%r12), RL3, RL3;
13840- vpxor (6*16)(%r12), RR4, RR4;
13841- vpxor (7*16)(%r12), RL4, RL4;
13842+ vpxor (0*16)(%r14), RR1, RR1;
13843+ vpxor (1*16)(%r14), RL1, RL1;
13844+ vpxor (2*16)(%r14), RR2, RR2;
13845+ vpxor (3*16)(%r14), RL2, RL2;
13846+ vpxor (4*16)(%r14), RR3, RR3;
13847+ vpxor (5*16)(%r14), RL3, RL3;
13848+ vpxor (6*16)(%r14), RR4, RR4;
13849+ vpxor (7*16)(%r14), RL4, RL4;
13850 vmovdqu RR1, (0*16)(%r11);
13851 vmovdqu RL1, (1*16)(%r11);
13852 vmovdqu RR2, (2*16)(%r11);
13853@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13854 vmovdqu RR4, (6*16)(%r11);
13855 vmovdqu RL4, (7*16)(%r11);
13856
13857- popq %r12;
13858+ popq %r14;
13859
13860+ pax_force_retaddr
13861 ret;
13862 ENDPROC(cast5_ctr_16way)
13863diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13864index e3531f8..e123f35 100644
13865--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13866+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13867@@ -24,6 +24,7 @@
13868 */
13869
13870 #include <linux/linkage.h>
13871+#include <asm/alternative-asm.h>
13872 #include "glue_helper-asm-avx.S"
13873
13874 .file "cast6-avx-x86_64-asm_64.S"
13875@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13876 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13877 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13878
13879+ pax_force_retaddr
13880 ret;
13881 ENDPROC(__cast6_enc_blk8)
13882
13883@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13884 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13885 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13886
13887+ pax_force_retaddr
13888 ret;
13889 ENDPROC(__cast6_dec_blk8)
13890
13891@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13892
13893 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13894
13895+ pax_force_retaddr
13896 ret;
13897 ENDPROC(cast6_ecb_enc_8way)
13898
13899@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13900
13901 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13902
13903+ pax_force_retaddr
13904 ret;
13905 ENDPROC(cast6_ecb_dec_8way)
13906
13907@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13908 * %rdx: src
13909 */
13910
13911- pushq %r12;
13912+ pushq %r14;
13913
13914 movq %rsi, %r11;
13915- movq %rdx, %r12;
13916+ movq %rdx, %r14;
13917
13918 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13919
13920 call __cast6_dec_blk8;
13921
13922- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13923+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13924
13925- popq %r12;
13926+ popq %r14;
13927
13928+ pax_force_retaddr
13929 ret;
13930 ENDPROC(cast6_cbc_dec_8way)
13931
13932@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13933 * %rcx: iv (little endian, 128bit)
13934 */
13935
13936- pushq %r12;
13937+ pushq %r14;
13938
13939 movq %rsi, %r11;
13940- movq %rdx, %r12;
13941+ movq %rdx, %r14;
13942
13943 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13944 RD2, RX, RKR, RKM);
13945
13946 call __cast6_enc_blk8;
13947
13948- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13949+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13950
13951- popq %r12;
13952+ popq %r14;
13953
13954+ pax_force_retaddr
13955 ret;
13956 ENDPROC(cast6_ctr_8way)
13957
13958@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13959 /* dst <= regs xor IVs(in dst) */
13960 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13961
13962+ pax_force_retaddr
13963 ret;
13964 ENDPROC(cast6_xts_enc_8way)
13965
13966@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13967 /* dst <= regs xor IVs(in dst) */
13968 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13969
13970+ pax_force_retaddr
13971 ret;
13972 ENDPROC(cast6_xts_dec_8way)
13973diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13974index 26d49eb..8bf39c8 100644
13975--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13976+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13977@@ -45,6 +45,7 @@
13978
13979 #include <asm/inst.h>
13980 #include <linux/linkage.h>
13981+#include <asm/alternative-asm.h>
13982
13983 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13984
13985@@ -309,6 +310,7 @@ do_return:
13986 popq %rsi
13987 popq %rdi
13988 popq %rbx
13989+ pax_force_retaddr
13990 ret
13991
13992 ################################################################
13993@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
13994 ## PCLMULQDQ tables
13995 ## Table is 128 entries x 2 words (8 bytes) each
13996 ################################################################
13997-.section .rotata, "a", %progbits
13998+.section .rodata, "a", %progbits
13999 .align 8
14000 K_table:
14001 .long 0x493c7d27, 0x00000001
14002diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14003index 5d1e007..098cb4f 100644
14004--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14005+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14006@@ -18,6 +18,7 @@
14007
14008 #include <linux/linkage.h>
14009 #include <asm/inst.h>
14010+#include <asm/alternative-asm.h>
14011
14012 .data
14013
14014@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14015 psrlq $1, T2
14016 pxor T2, T1
14017 pxor T1, DATA
14018+ pax_force_retaddr
14019 ret
14020 ENDPROC(__clmul_gf128mul_ble)
14021
14022@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14023 call __clmul_gf128mul_ble
14024 PSHUFB_XMM BSWAP DATA
14025 movups DATA, (%rdi)
14026+ pax_force_retaddr
14027 ret
14028 ENDPROC(clmul_ghash_mul)
14029
14030@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14031 PSHUFB_XMM BSWAP DATA
14032 movups DATA, (%rdi)
14033 .Lupdate_just_ret:
14034+ pax_force_retaddr
14035 ret
14036 ENDPROC(clmul_ghash_update)
14037diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14038index 9279e0b..c4b3d2c 100644
14039--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14040+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14041@@ -1,4 +1,5 @@
14042 #include <linux/linkage.h>
14043+#include <asm/alternative-asm.h>
14044
14045 # enter salsa20_encrypt_bytes
14046 ENTRY(salsa20_encrypt_bytes)
14047@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14048 add %r11,%rsp
14049 mov %rdi,%rax
14050 mov %rsi,%rdx
14051+ pax_force_retaddr
14052 ret
14053 # bytesatleast65:
14054 ._bytesatleast65:
14055@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14056 add %r11,%rsp
14057 mov %rdi,%rax
14058 mov %rsi,%rdx
14059+ pax_force_retaddr
14060 ret
14061 ENDPROC(salsa20_keysetup)
14062
14063@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14064 add %r11,%rsp
14065 mov %rdi,%rax
14066 mov %rsi,%rdx
14067+ pax_force_retaddr
14068 ret
14069 ENDPROC(salsa20_ivsetup)
14070diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14071index 2f202f4..d9164d6 100644
14072--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14073+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14074@@ -24,6 +24,7 @@
14075 */
14076
14077 #include <linux/linkage.h>
14078+#include <asm/alternative-asm.h>
14079 #include "glue_helper-asm-avx.S"
14080
14081 .file "serpent-avx-x86_64-asm_64.S"
14082@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14083 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14084 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14085
14086+ pax_force_retaddr
14087 ret;
14088 ENDPROC(__serpent_enc_blk8_avx)
14089
14090@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14091 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14092 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14093
14094+ pax_force_retaddr
14095 ret;
14096 ENDPROC(__serpent_dec_blk8_avx)
14097
14098@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14099
14100 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14101
14102+ pax_force_retaddr
14103 ret;
14104 ENDPROC(serpent_ecb_enc_8way_avx)
14105
14106@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14107
14108 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14109
14110+ pax_force_retaddr
14111 ret;
14112 ENDPROC(serpent_ecb_dec_8way_avx)
14113
14114@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14115
14116 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14117
14118+ pax_force_retaddr
14119 ret;
14120 ENDPROC(serpent_cbc_dec_8way_avx)
14121
14122@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14123
14124 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14125
14126+ pax_force_retaddr
14127 ret;
14128 ENDPROC(serpent_ctr_8way_avx)
14129
14130@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14131 /* dst <= regs xor IVs(in dst) */
14132 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14133
14134+ pax_force_retaddr
14135 ret;
14136 ENDPROC(serpent_xts_enc_8way_avx)
14137
14138@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14139 /* dst <= regs xor IVs(in dst) */
14140 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14141
14142+ pax_force_retaddr
14143 ret;
14144 ENDPROC(serpent_xts_dec_8way_avx)
14145diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14146index b222085..abd483c 100644
14147--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14148+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14149@@ -15,6 +15,7 @@
14150 */
14151
14152 #include <linux/linkage.h>
14153+#include <asm/alternative-asm.h>
14154 #include "glue_helper-asm-avx2.S"
14155
14156 .file "serpent-avx2-asm_64.S"
14157@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14158 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14159 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14160
14161+ pax_force_retaddr
14162 ret;
14163 ENDPROC(__serpent_enc_blk16)
14164
14165@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14166 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14167 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14168
14169+ pax_force_retaddr
14170 ret;
14171 ENDPROC(__serpent_dec_blk16)
14172
14173@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14174
14175 vzeroupper;
14176
14177+ pax_force_retaddr
14178 ret;
14179 ENDPROC(serpent_ecb_enc_16way)
14180
14181@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14182
14183 vzeroupper;
14184
14185+ pax_force_retaddr
14186 ret;
14187 ENDPROC(serpent_ecb_dec_16way)
14188
14189@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14190
14191 vzeroupper;
14192
14193+ pax_force_retaddr
14194 ret;
14195 ENDPROC(serpent_cbc_dec_16way)
14196
14197@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14198
14199 vzeroupper;
14200
14201+ pax_force_retaddr
14202 ret;
14203 ENDPROC(serpent_ctr_16way)
14204
14205@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14206
14207 vzeroupper;
14208
14209+ pax_force_retaddr
14210 ret;
14211 ENDPROC(serpent_xts_enc_16way)
14212
14213@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14214
14215 vzeroupper;
14216
14217+ pax_force_retaddr
14218 ret;
14219 ENDPROC(serpent_xts_dec_16way)
14220diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14221index acc066c..1559cc4 100644
14222--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14223+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14224@@ -25,6 +25,7 @@
14225 */
14226
14227 #include <linux/linkage.h>
14228+#include <asm/alternative-asm.h>
14229
14230 .file "serpent-sse2-x86_64-asm_64.S"
14231 .text
14232@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14233 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14234 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14235
14236+ pax_force_retaddr
14237 ret;
14238
14239 .L__enc_xor8:
14240 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14241 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14242
14243+ pax_force_retaddr
14244 ret;
14245 ENDPROC(__serpent_enc_blk_8way)
14246
14247@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14248 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14249 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14250
14251+ pax_force_retaddr
14252 ret;
14253 ENDPROC(serpent_dec_blk_8way)
14254diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14255index a410950..9dfe7ad 100644
14256--- a/arch/x86/crypto/sha1_ssse3_asm.S
14257+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14258@@ -29,6 +29,7 @@
14259 */
14260
14261 #include <linux/linkage.h>
14262+#include <asm/alternative-asm.h>
14263
14264 #define CTX %rdi // arg1
14265 #define BUF %rsi // arg2
14266@@ -75,9 +76,9 @@
14267
14268 push %rbx
14269 push %rbp
14270- push %r12
14271+ push %r14
14272
14273- mov %rsp, %r12
14274+ mov %rsp, %r14
14275 sub $64, %rsp # allocate workspace
14276 and $~15, %rsp # align stack
14277
14278@@ -99,11 +100,12 @@
14279 xor %rax, %rax
14280 rep stosq
14281
14282- mov %r12, %rsp # deallocate workspace
14283+ mov %r14, %rsp # deallocate workspace
14284
14285- pop %r12
14286+ pop %r14
14287 pop %rbp
14288 pop %rbx
14289+ pax_force_retaddr
14290 ret
14291
14292 ENDPROC(\name)
14293diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14294index 642f156..51a513c 100644
14295--- a/arch/x86/crypto/sha256-avx-asm.S
14296+++ b/arch/x86/crypto/sha256-avx-asm.S
14297@@ -49,6 +49,7 @@
14298
14299 #ifdef CONFIG_AS_AVX
14300 #include <linux/linkage.h>
14301+#include <asm/alternative-asm.h>
14302
14303 ## assume buffers not aligned
14304 #define VMOVDQ vmovdqu
14305@@ -460,6 +461,7 @@ done_hash:
14306 popq %r13
14307 popq %rbp
14308 popq %rbx
14309+ pax_force_retaddr
14310 ret
14311 ENDPROC(sha256_transform_avx)
14312
14313diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14314index 9e86944..3795e6a 100644
14315--- a/arch/x86/crypto/sha256-avx2-asm.S
14316+++ b/arch/x86/crypto/sha256-avx2-asm.S
14317@@ -50,6 +50,7 @@
14318
14319 #ifdef CONFIG_AS_AVX2
14320 #include <linux/linkage.h>
14321+#include <asm/alternative-asm.h>
14322
14323 ## assume buffers not aligned
14324 #define VMOVDQ vmovdqu
14325@@ -720,6 +721,7 @@ done_hash:
14326 popq %r12
14327 popq %rbp
14328 popq %rbx
14329+ pax_force_retaddr
14330 ret
14331 ENDPROC(sha256_transform_rorx)
14332
14333diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14334index f833b74..8c62a9e 100644
14335--- a/arch/x86/crypto/sha256-ssse3-asm.S
14336+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14337@@ -47,6 +47,7 @@
14338 ########################################################################
14339
14340 #include <linux/linkage.h>
14341+#include <asm/alternative-asm.h>
14342
14343 ## assume buffers not aligned
14344 #define MOVDQ movdqu
14345@@ -471,6 +472,7 @@ done_hash:
14346 popq %rbp
14347 popq %rbx
14348
14349+ pax_force_retaddr
14350 ret
14351 ENDPROC(sha256_transform_ssse3)
14352
14353diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14354index 974dde9..a823ff9 100644
14355--- a/arch/x86/crypto/sha512-avx-asm.S
14356+++ b/arch/x86/crypto/sha512-avx-asm.S
14357@@ -49,6 +49,7 @@
14358
14359 #ifdef CONFIG_AS_AVX
14360 #include <linux/linkage.h>
14361+#include <asm/alternative-asm.h>
14362
14363 .text
14364
14365@@ -364,6 +365,7 @@ updateblock:
14366 mov frame_RSPSAVE(%rsp), %rsp
14367
14368 nowork:
14369+ pax_force_retaddr
14370 ret
14371 ENDPROC(sha512_transform_avx)
14372
14373diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14374index 568b961..ed20c37 100644
14375--- a/arch/x86/crypto/sha512-avx2-asm.S
14376+++ b/arch/x86/crypto/sha512-avx2-asm.S
14377@@ -51,6 +51,7 @@
14378
14379 #ifdef CONFIG_AS_AVX2
14380 #include <linux/linkage.h>
14381+#include <asm/alternative-asm.h>
14382
14383 .text
14384
14385@@ -678,6 +679,7 @@ done_hash:
14386
14387 # Restore Stack Pointer
14388 mov frame_RSPSAVE(%rsp), %rsp
14389+ pax_force_retaddr
14390 ret
14391 ENDPROC(sha512_transform_rorx)
14392
14393diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14394index fb56855..6edd768 100644
14395--- a/arch/x86/crypto/sha512-ssse3-asm.S
14396+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14397@@ -48,6 +48,7 @@
14398 ########################################################################
14399
14400 #include <linux/linkage.h>
14401+#include <asm/alternative-asm.h>
14402
14403 .text
14404
14405@@ -363,6 +364,7 @@ updateblock:
14406 mov frame_RSPSAVE(%rsp), %rsp
14407
14408 nowork:
14409+ pax_force_retaddr
14410 ret
14411 ENDPROC(sha512_transform_ssse3)
14412
14413diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14414index 0505813..b067311 100644
14415--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14416+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14417@@ -24,6 +24,7 @@
14418 */
14419
14420 #include <linux/linkage.h>
14421+#include <asm/alternative-asm.h>
14422 #include "glue_helper-asm-avx.S"
14423
14424 .file "twofish-avx-x86_64-asm_64.S"
14425@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14426 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14427 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14428
14429+ pax_force_retaddr
14430 ret;
14431 ENDPROC(__twofish_enc_blk8)
14432
14433@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14434 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14435 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14436
14437+ pax_force_retaddr
14438 ret;
14439 ENDPROC(__twofish_dec_blk8)
14440
14441@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14442
14443 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14444
14445+ pax_force_retaddr
14446 ret;
14447 ENDPROC(twofish_ecb_enc_8way)
14448
14449@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14450
14451 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14452
14453+ pax_force_retaddr
14454 ret;
14455 ENDPROC(twofish_ecb_dec_8way)
14456
14457@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14458 * %rdx: src
14459 */
14460
14461- pushq %r12;
14462+ pushq %r14;
14463
14464 movq %rsi, %r11;
14465- movq %rdx, %r12;
14466+ movq %rdx, %r14;
14467
14468 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14469
14470 call __twofish_dec_blk8;
14471
14472- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14473+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14474
14475- popq %r12;
14476+ popq %r14;
14477
14478+ pax_force_retaddr
14479 ret;
14480 ENDPROC(twofish_cbc_dec_8way)
14481
14482@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14483 * %rcx: iv (little endian, 128bit)
14484 */
14485
14486- pushq %r12;
14487+ pushq %r14;
14488
14489 movq %rsi, %r11;
14490- movq %rdx, %r12;
14491+ movq %rdx, %r14;
14492
14493 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14494 RD2, RX0, RX1, RY0);
14495
14496 call __twofish_enc_blk8;
14497
14498- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14499+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14500
14501- popq %r12;
14502+ popq %r14;
14503
14504+ pax_force_retaddr
14505 ret;
14506 ENDPROC(twofish_ctr_8way)
14507
14508@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14509 /* dst <= regs xor IVs(in dst) */
14510 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14511
14512+ pax_force_retaddr
14513 ret;
14514 ENDPROC(twofish_xts_enc_8way)
14515
14516@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14517 /* dst <= regs xor IVs(in dst) */
14518 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14519
14520+ pax_force_retaddr
14521 ret;
14522 ENDPROC(twofish_xts_dec_8way)
14523diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14524index 1c3b7ce..02f578d 100644
14525--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14526+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14527@@ -21,6 +21,7 @@
14528 */
14529
14530 #include <linux/linkage.h>
14531+#include <asm/alternative-asm.h>
14532
14533 .file "twofish-x86_64-asm-3way.S"
14534 .text
14535@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14536 popq %r13;
14537 popq %r14;
14538 popq %r15;
14539+ pax_force_retaddr
14540 ret;
14541
14542 .L__enc_xor3:
14543@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14544 popq %r13;
14545 popq %r14;
14546 popq %r15;
14547+ pax_force_retaddr
14548 ret;
14549 ENDPROC(__twofish_enc_blk_3way)
14550
14551@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14552 popq %r13;
14553 popq %r14;
14554 popq %r15;
14555+ pax_force_retaddr
14556 ret;
14557 ENDPROC(twofish_dec_blk_3way)
14558diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14559index a039d21..524b8b2 100644
14560--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14561+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14562@@ -22,6 +22,7 @@
14563
14564 #include <linux/linkage.h>
14565 #include <asm/asm-offsets.h>
14566+#include <asm/alternative-asm.h>
14567
14568 #define a_offset 0
14569 #define b_offset 4
14570@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14571
14572 popq R1
14573 movq $1,%rax
14574+ pax_force_retaddr
14575 ret
14576 ENDPROC(twofish_enc_blk)
14577
14578@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14579
14580 popq R1
14581 movq $1,%rax
14582+ pax_force_retaddr
14583 ret
14584 ENDPROC(twofish_dec_blk)
14585diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14586index ae6aad1..719d6d9 100644
14587--- a/arch/x86/ia32/ia32_aout.c
14588+++ b/arch/x86/ia32/ia32_aout.c
14589@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14590 unsigned long dump_start, dump_size;
14591 struct user32 dump;
14592
14593+ memset(&dump, 0, sizeof(dump));
14594+
14595 fs = get_fs();
14596 set_fs(KERNEL_DS);
14597 has_dumped = 1;
14598diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14599index d0165c9..0d5639b 100644
14600--- a/arch/x86/ia32/ia32_signal.c
14601+++ b/arch/x86/ia32/ia32_signal.c
14602@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14603 if (__get_user(set.sig[0], &frame->sc.oldmask)
14604 || (_COMPAT_NSIG_WORDS > 1
14605 && __copy_from_user((((char *) &set.sig) + 4),
14606- &frame->extramask,
14607+ frame->extramask,
14608 sizeof(frame->extramask))))
14609 goto badframe;
14610
14611@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14612 sp -= frame_size;
14613 /* Align the stack pointer according to the i386 ABI,
14614 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14615- sp = ((sp + 4) & -16ul) - 4;
14616+ sp = ((sp - 12) & -16ul) - 4;
14617 return (void __user *) sp;
14618 }
14619
14620@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14621 } else {
14622 /* Return stub is in 32bit vsyscall page */
14623 if (current->mm->context.vdso)
14624- restorer = current->mm->context.vdso +
14625- selected_vdso32->sym___kernel_sigreturn;
14626+ restorer = (void __force_user *)(current->mm->context.vdso +
14627+ selected_vdso32->sym___kernel_sigreturn);
14628 else
14629- restorer = &frame->retcode;
14630+ restorer = frame->retcode;
14631 }
14632
14633 put_user_try {
14634@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14635 * These are actually not used anymore, but left because some
14636 * gdb versions depend on them as a marker.
14637 */
14638- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14639+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14640 } put_user_catch(err);
14641
14642 if (err)
14643@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14644 0xb8,
14645 __NR_ia32_rt_sigreturn,
14646 0x80cd,
14647- 0,
14648+ 0
14649 };
14650
14651 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14652@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14653
14654 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14655 restorer = ksig->ka.sa.sa_restorer;
14656+ else if (current->mm->context.vdso)
14657+ /* Return stub is in 32bit vsyscall page */
14658+ restorer = (void __force_user *)(current->mm->context.vdso +
14659+ selected_vdso32->sym___kernel_rt_sigreturn);
14660 else
14661- restorer = current->mm->context.vdso +
14662- selected_vdso32->sym___kernel_rt_sigreturn;
14663+ restorer = frame->retcode;
14664 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14665
14666 /*
14667 * Not actually used anymore, but left because some gdb
14668 * versions need it.
14669 */
14670- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14671+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14672 } put_user_catch(err);
14673
14674 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14675diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14676index 156ebca..9591cf0 100644
14677--- a/arch/x86/ia32/ia32entry.S
14678+++ b/arch/x86/ia32/ia32entry.S
14679@@ -15,8 +15,10 @@
14680 #include <asm/irqflags.h>
14681 #include <asm/asm.h>
14682 #include <asm/smap.h>
14683+#include <asm/pgtable.h>
14684 #include <linux/linkage.h>
14685 #include <linux/err.h>
14686+#include <asm/alternative-asm.h>
14687
14688 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14689 #include <linux/elf-em.h>
14690@@ -62,12 +64,12 @@
14691 */
14692 .macro LOAD_ARGS32 offset, _r9=0
14693 .if \_r9
14694- movl \offset+16(%rsp),%r9d
14695+ movl \offset+R9(%rsp),%r9d
14696 .endif
14697- movl \offset+40(%rsp),%ecx
14698- movl \offset+48(%rsp),%edx
14699- movl \offset+56(%rsp),%esi
14700- movl \offset+64(%rsp),%edi
14701+ movl \offset+RCX(%rsp),%ecx
14702+ movl \offset+RDX(%rsp),%edx
14703+ movl \offset+RSI(%rsp),%esi
14704+ movl \offset+RDI(%rsp),%edi
14705 movl %eax,%eax /* zero extension */
14706 .endm
14707
14708@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14709 ENDPROC(native_irq_enable_sysexit)
14710 #endif
14711
14712+ .macro pax_enter_kernel_user
14713+ pax_set_fptr_mask
14714+#ifdef CONFIG_PAX_MEMORY_UDEREF
14715+ call pax_enter_kernel_user
14716+#endif
14717+ .endm
14718+
14719+ .macro pax_exit_kernel_user
14720+#ifdef CONFIG_PAX_MEMORY_UDEREF
14721+ call pax_exit_kernel_user
14722+#endif
14723+#ifdef CONFIG_PAX_RANDKSTACK
14724+ pushq %rax
14725+ pushq %r11
14726+ call pax_randomize_kstack
14727+ popq %r11
14728+ popq %rax
14729+#endif
14730+ .endm
14731+
14732+ .macro pax_erase_kstack
14733+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14734+ call pax_erase_kstack
14735+#endif
14736+ .endm
14737+
14738 /*
14739 * 32bit SYSENTER instruction entry.
14740 *
14741@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14742 CFI_REGISTER rsp,rbp
14743 SWAPGS_UNSAFE_STACK
14744 movq PER_CPU_VAR(kernel_stack), %rsp
14745- addq $(KERNEL_STACK_OFFSET),%rsp
14746- /*
14747- * No need to follow this irqs on/off section: the syscall
14748- * disabled irqs, here we enable it straight after entry:
14749- */
14750- ENABLE_INTERRUPTS(CLBR_NONE)
14751 movl %ebp,%ebp /* zero extension */
14752 pushq_cfi $__USER32_DS
14753 /*CFI_REL_OFFSET ss,0*/
14754@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14755 CFI_REL_OFFSET rsp,0
14756 pushfq_cfi
14757 /*CFI_REL_OFFSET rflags,0*/
14758- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14759- CFI_REGISTER rip,r10
14760+ orl $X86_EFLAGS_IF,(%rsp)
14761+ GET_THREAD_INFO(%r11)
14762+ movl TI_sysenter_return(%r11), %r11d
14763+ CFI_REGISTER rip,r11
14764 pushq_cfi $__USER32_CS
14765 /*CFI_REL_OFFSET cs,0*/
14766 movl %eax, %eax
14767- pushq_cfi %r10
14768+ pushq_cfi %r11
14769 CFI_REL_OFFSET rip,0
14770 pushq_cfi %rax
14771 cld
14772 SAVE_ARGS 0,1,0
14773+ pax_enter_kernel_user
14774+
14775+#ifdef CONFIG_PAX_RANDKSTACK
14776+ pax_erase_kstack
14777+#endif
14778+
14779+ /*
14780+ * No need to follow this irqs on/off section: the syscall
14781+ * disabled irqs, here we enable it straight after entry:
14782+ */
14783+ ENABLE_INTERRUPTS(CLBR_NONE)
14784 /* no need to do an access_ok check here because rbp has been
14785 32bit zero extended */
14786+
14787+#ifdef CONFIG_PAX_MEMORY_UDEREF
14788+ addq pax_user_shadow_base,%rbp
14789+ ASM_PAX_OPEN_USERLAND
14790+#endif
14791+
14792 ASM_STAC
14793 1: movl (%rbp),%ebp
14794 _ASM_EXTABLE(1b,ia32_badarg)
14795 ASM_CLAC
14796
14797+#ifdef CONFIG_PAX_MEMORY_UDEREF
14798+ ASM_PAX_CLOSE_USERLAND
14799+#endif
14800+
14801 /*
14802 * Sysenter doesn't filter flags, so we need to clear NT
14803 * ourselves. To save a few cycles, we can check whether
14804@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14805 jnz sysenter_fix_flags
14806 sysenter_flags_fixed:
14807
14808- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14809- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14810+ GET_THREAD_INFO(%r11)
14811+ orl $TS_COMPAT,TI_status(%r11)
14812+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14813 CFI_REMEMBER_STATE
14814 jnz sysenter_tracesys
14815 cmpq $(IA32_NR_syscalls-1),%rax
14816@@ -172,14 +218,17 @@ sysenter_do_call:
14817 sysenter_dispatch:
14818 call *ia32_sys_call_table(,%rax,8)
14819 movq %rax,RAX-ARGOFFSET(%rsp)
14820+ GET_THREAD_INFO(%r11)
14821 DISABLE_INTERRUPTS(CLBR_NONE)
14822 TRACE_IRQS_OFF
14823- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14824+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14825 jnz sysexit_audit
14826 sysexit_from_sys_call:
14827- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14828+ pax_exit_kernel_user
14829+ pax_erase_kstack
14830+ andl $~TS_COMPAT,TI_status(%r11)
14831 /* clear IF, that popfq doesn't enable interrupts early */
14832- andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
14833+ andl $~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
14834 movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
14835 CFI_REGISTER rip,rdx
14836 RESTORE_ARGS 0,24,0,0,0,0
14837@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14838 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14839 movl %eax,%edi /* 1st arg: syscall number */
14840 call __audit_syscall_entry
14841+
14842+ pax_erase_kstack
14843+
14844 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14845 cmpq $(IA32_NR_syscalls-1),%rax
14846 ja ia32_badsys
14847@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14848 .endm
14849
14850 .macro auditsys_exit exit
14851- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14852+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14853 jnz ia32_ret_from_sys_call
14854 TRACE_IRQS_ON
14855 ENABLE_INTERRUPTS(CLBR_NONE)
14856@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14857 1: setbe %al /* 1 if error, 0 if not */
14858 movzbl %al,%edi /* zero-extend that into %edi */
14859 call __audit_syscall_exit
14860+ GET_THREAD_INFO(%r11)
14861 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14862 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14863 DISABLE_INTERRUPTS(CLBR_NONE)
14864 TRACE_IRQS_OFF
14865- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14866+ testl %edi,TI_flags(%r11)
14867 jz \exit
14868 CLEAR_RREGS -ARGOFFSET
14869 jmp int_with_check
14870@@ -253,7 +306,7 @@ sysenter_fix_flags:
14871
14872 sysenter_tracesys:
14873 #ifdef CONFIG_AUDITSYSCALL
14874- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14875+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14876 jz sysenter_auditsys
14877 #endif
14878 SAVE_REST
14879@@ -265,6 +318,9 @@ sysenter_tracesys:
14880 RESTORE_REST
14881 cmpq $(IA32_NR_syscalls-1),%rax
14882 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14883+
14884+ pax_erase_kstack
14885+
14886 jmp sysenter_do_call
14887 CFI_ENDPROC
14888 ENDPROC(ia32_sysenter_target)
14889@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14890 ENTRY(ia32_cstar_target)
14891 CFI_STARTPROC32 simple
14892 CFI_SIGNAL_FRAME
14893- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14894+ CFI_DEF_CFA rsp,0
14895 CFI_REGISTER rip,rcx
14896 /*CFI_REGISTER rflags,r11*/
14897 SWAPGS_UNSAFE_STACK
14898 movl %esp,%r8d
14899 CFI_REGISTER rsp,r8
14900 movq PER_CPU_VAR(kernel_stack),%rsp
14901+ SAVE_ARGS 8*6,0,0
14902+ pax_enter_kernel_user
14903+
14904+#ifdef CONFIG_PAX_RANDKSTACK
14905+ pax_erase_kstack
14906+#endif
14907+
14908 /*
14909 * No need to follow this irqs on/off section: the syscall
14910 * disabled irqs and here we enable it straight after entry:
14911 */
14912 ENABLE_INTERRUPTS(CLBR_NONE)
14913- SAVE_ARGS 8,0,0
14914 movl %eax,%eax /* zero extension */
14915 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14916 movq %rcx,RIP-ARGOFFSET(%rsp)
14917@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14918 /* no need to do an access_ok check here because r8 has been
14919 32bit zero extended */
14920 /* hardware stack frame is complete now */
14921+
14922+#ifdef CONFIG_PAX_MEMORY_UDEREF
14923+ ASM_PAX_OPEN_USERLAND
14924+ movq pax_user_shadow_base,%r8
14925+ addq RSP-ARGOFFSET(%rsp),%r8
14926+#endif
14927+
14928 ASM_STAC
14929 1: movl (%r8),%r9d
14930 _ASM_EXTABLE(1b,ia32_badarg)
14931 ASM_CLAC
14932- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14933- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14934+
14935+#ifdef CONFIG_PAX_MEMORY_UDEREF
14936+ ASM_PAX_CLOSE_USERLAND
14937+#endif
14938+
14939+ GET_THREAD_INFO(%r11)
14940+ orl $TS_COMPAT,TI_status(%r11)
14941+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14942 CFI_REMEMBER_STATE
14943 jnz cstar_tracesys
14944 cmpq $IA32_NR_syscalls-1,%rax
14945@@ -335,13 +410,16 @@ cstar_do_call:
14946 cstar_dispatch:
14947 call *ia32_sys_call_table(,%rax,8)
14948 movq %rax,RAX-ARGOFFSET(%rsp)
14949+ GET_THREAD_INFO(%r11)
14950 DISABLE_INTERRUPTS(CLBR_NONE)
14951 TRACE_IRQS_OFF
14952- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14953+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14954 jnz sysretl_audit
14955 sysretl_from_sys_call:
14956- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14957- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14958+ pax_exit_kernel_user
14959+ pax_erase_kstack
14960+ andl $~TS_COMPAT,TI_status(%r11)
14961+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14962 movl RIP-ARGOFFSET(%rsp),%ecx
14963 CFI_REGISTER rip,rcx
14964 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14965@@ -368,7 +446,7 @@ sysretl_audit:
14966
14967 cstar_tracesys:
14968 #ifdef CONFIG_AUDITSYSCALL
14969- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14970+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14971 jz cstar_auditsys
14972 #endif
14973 xchgl %r9d,%ebp
14974@@ -382,11 +460,19 @@ cstar_tracesys:
14975 xchgl %ebp,%r9d
14976 cmpq $(IA32_NR_syscalls-1),%rax
14977 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14978+
14979+ pax_erase_kstack
14980+
14981 jmp cstar_do_call
14982 END(ia32_cstar_target)
14983
14984 ia32_badarg:
14985 ASM_CLAC
14986+
14987+#ifdef CONFIG_PAX_MEMORY_UDEREF
14988+ ASM_PAX_CLOSE_USERLAND
14989+#endif
14990+
14991 movq $-EFAULT,%rax
14992 jmp ia32_sysret
14993 CFI_ENDPROC
14994@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
14995 CFI_REL_OFFSET rip,RIP-RIP
14996 PARAVIRT_ADJUST_EXCEPTION_FRAME
14997 SWAPGS
14998- /*
14999- * No need to follow this irqs on/off section: the syscall
15000- * disabled irqs and here we enable it straight after entry:
15001- */
15002- ENABLE_INTERRUPTS(CLBR_NONE)
15003 movl %eax,%eax
15004 pushq_cfi %rax
15005 cld
15006 /* note the registers are not zero extended to the sf.
15007 this could be a problem. */
15008 SAVE_ARGS 0,1,0
15009- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15010- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15011+ pax_enter_kernel_user
15012+
15013+#ifdef CONFIG_PAX_RANDKSTACK
15014+ pax_erase_kstack
15015+#endif
15016+
15017+ /*
15018+ * No need to follow this irqs on/off section: the syscall
15019+ * disabled irqs and here we enable it straight after entry:
15020+ */
15021+ ENABLE_INTERRUPTS(CLBR_NONE)
15022+ GET_THREAD_INFO(%r11)
15023+ orl $TS_COMPAT,TI_status(%r11)
15024+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15025 jnz ia32_tracesys
15026 cmpq $(IA32_NR_syscalls-1),%rax
15027 ja ia32_badsys
15028@@ -458,6 +551,9 @@ ia32_tracesys:
15029 RESTORE_REST
15030 cmpq $(IA32_NR_syscalls-1),%rax
15031 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15032+
15033+ pax_erase_kstack
15034+
15035 jmp ia32_do_call
15036 END(ia32_syscall)
15037
15038diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15039index 8e0ceec..af13504 100644
15040--- a/arch/x86/ia32/sys_ia32.c
15041+++ b/arch/x86/ia32/sys_ia32.c
15042@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15043 */
15044 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15045 {
15046- typeof(ubuf->st_uid) uid = 0;
15047- typeof(ubuf->st_gid) gid = 0;
15048+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15049+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15050 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15051 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15052 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15053diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15054index 372231c..51b537d 100644
15055--- a/arch/x86/include/asm/alternative-asm.h
15056+++ b/arch/x86/include/asm/alternative-asm.h
15057@@ -18,6 +18,45 @@
15058 .endm
15059 #endif
15060
15061+#ifdef KERNEXEC_PLUGIN
15062+ .macro pax_force_retaddr_bts rip=0
15063+ btsq $63,\rip(%rsp)
15064+ .endm
15065+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15066+ .macro pax_force_retaddr rip=0, reload=0
15067+ btsq $63,\rip(%rsp)
15068+ .endm
15069+ .macro pax_force_fptr ptr
15070+ btsq $63,\ptr
15071+ .endm
15072+ .macro pax_set_fptr_mask
15073+ .endm
15074+#endif
15075+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15076+ .macro pax_force_retaddr rip=0, reload=0
15077+ .if \reload
15078+ pax_set_fptr_mask
15079+ .endif
15080+ orq %r12,\rip(%rsp)
15081+ .endm
15082+ .macro pax_force_fptr ptr
15083+ orq %r12,\ptr
15084+ .endm
15085+ .macro pax_set_fptr_mask
15086+ movabs $0x8000000000000000,%r12
15087+ .endm
15088+#endif
15089+#else
15090+ .macro pax_force_retaddr rip=0, reload=0
15091+ .endm
15092+ .macro pax_force_fptr ptr
15093+ .endm
15094+ .macro pax_force_retaddr_bts rip=0
15095+ .endm
15096+ .macro pax_set_fptr_mask
15097+ .endm
15098+#endif
15099+
15100 .macro altinstruction_entry orig alt feature orig_len alt_len
15101 .long \orig - .
15102 .long \alt - .
15103diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15104index 473bdbe..b1e3377 100644
15105--- a/arch/x86/include/asm/alternative.h
15106+++ b/arch/x86/include/asm/alternative.h
15107@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15108 ".pushsection .discard,\"aw\",@progbits\n" \
15109 DISCARD_ENTRY(1) \
15110 ".popsection\n" \
15111- ".pushsection .altinstr_replacement, \"ax\"\n" \
15112+ ".pushsection .altinstr_replacement, \"a\"\n" \
15113 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15114 ".popsection"
15115
15116@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15117 DISCARD_ENTRY(1) \
15118 DISCARD_ENTRY(2) \
15119 ".popsection\n" \
15120- ".pushsection .altinstr_replacement, \"ax\"\n" \
15121+ ".pushsection .altinstr_replacement, \"a\"\n" \
15122 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15123 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15124 ".popsection"
15125diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15126index efc3b22..85c4f3a 100644
15127--- a/arch/x86/include/asm/apic.h
15128+++ b/arch/x86/include/asm/apic.h
15129@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15130
15131 #ifdef CONFIG_X86_LOCAL_APIC
15132
15133-extern unsigned int apic_verbosity;
15134+extern int apic_verbosity;
15135 extern int local_apic_timer_c2_ok;
15136
15137 extern int disable_apic;
15138diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15139index 20370c6..a2eb9b0 100644
15140--- a/arch/x86/include/asm/apm.h
15141+++ b/arch/x86/include/asm/apm.h
15142@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15143 __asm__ __volatile__(APM_DO_ZERO_SEGS
15144 "pushl %%edi\n\t"
15145 "pushl %%ebp\n\t"
15146- "lcall *%%cs:apm_bios_entry\n\t"
15147+ "lcall *%%ss:apm_bios_entry\n\t"
15148 "setc %%al\n\t"
15149 "popl %%ebp\n\t"
15150 "popl %%edi\n\t"
15151@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15152 __asm__ __volatile__(APM_DO_ZERO_SEGS
15153 "pushl %%edi\n\t"
15154 "pushl %%ebp\n\t"
15155- "lcall *%%cs:apm_bios_entry\n\t"
15156+ "lcall *%%ss:apm_bios_entry\n\t"
15157 "setc %%bl\n\t"
15158 "popl %%ebp\n\t"
15159 "popl %%edi\n\t"
15160diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15161index 5e5cd12..51cdc93 100644
15162--- a/arch/x86/include/asm/atomic.h
15163+++ b/arch/x86/include/asm/atomic.h
15164@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15165 }
15166
15167 /**
15168+ * atomic_read_unchecked - read atomic variable
15169+ * @v: pointer of type atomic_unchecked_t
15170+ *
15171+ * Atomically reads the value of @v.
15172+ */
15173+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15174+{
15175+ return ACCESS_ONCE((v)->counter);
15176+}
15177+
15178+/**
15179 * atomic_set - set atomic variable
15180 * @v: pointer of type atomic_t
15181 * @i: required value
15182@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15183 }
15184
15185 /**
15186+ * atomic_set_unchecked - set atomic variable
15187+ * @v: pointer of type atomic_unchecked_t
15188+ * @i: required value
15189+ *
15190+ * Atomically sets the value of @v to @i.
15191+ */
15192+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15193+{
15194+ v->counter = i;
15195+}
15196+
15197+/**
15198 * atomic_add - add integer to atomic variable
15199 * @i: integer value to add
15200 * @v: pointer of type atomic_t
15201@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15202 */
15203 static inline void atomic_add(int i, atomic_t *v)
15204 {
15205- asm volatile(LOCK_PREFIX "addl %1,%0"
15206+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15207+
15208+#ifdef CONFIG_PAX_REFCOUNT
15209+ "jno 0f\n"
15210+ LOCK_PREFIX "subl %1,%0\n"
15211+ "int $4\n0:\n"
15212+ _ASM_EXTABLE(0b, 0b)
15213+#endif
15214+
15215+ : "+m" (v->counter)
15216+ : "ir" (i));
15217+}
15218+
15219+/**
15220+ * atomic_add_unchecked - add integer to atomic variable
15221+ * @i: integer value to add
15222+ * @v: pointer of type atomic_unchecked_t
15223+ *
15224+ * Atomically adds @i to @v.
15225+ */
15226+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15227+{
15228+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15229 : "+m" (v->counter)
15230 : "ir" (i));
15231 }
15232@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15233 */
15234 static inline void atomic_sub(int i, atomic_t *v)
15235 {
15236- asm volatile(LOCK_PREFIX "subl %1,%0"
15237+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15238+
15239+#ifdef CONFIG_PAX_REFCOUNT
15240+ "jno 0f\n"
15241+ LOCK_PREFIX "addl %1,%0\n"
15242+ "int $4\n0:\n"
15243+ _ASM_EXTABLE(0b, 0b)
15244+#endif
15245+
15246+ : "+m" (v->counter)
15247+ : "ir" (i));
15248+}
15249+
15250+/**
15251+ * atomic_sub_unchecked - subtract integer from atomic variable
15252+ * @i: integer value to subtract
15253+ * @v: pointer of type atomic_unchecked_t
15254+ *
15255+ * Atomically subtracts @i from @v.
15256+ */
15257+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15258+{
15259+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15260 : "+m" (v->counter)
15261 : "ir" (i));
15262 }
15263@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15264 */
15265 static inline int atomic_sub_and_test(int i, atomic_t *v)
15266 {
15267- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15268+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15269 }
15270
15271 /**
15272@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15273 */
15274 static inline void atomic_inc(atomic_t *v)
15275 {
15276- asm volatile(LOCK_PREFIX "incl %0"
15277+ asm volatile(LOCK_PREFIX "incl %0\n"
15278+
15279+#ifdef CONFIG_PAX_REFCOUNT
15280+ "jno 0f\n"
15281+ LOCK_PREFIX "decl %0\n"
15282+ "int $4\n0:\n"
15283+ _ASM_EXTABLE(0b, 0b)
15284+#endif
15285+
15286+ : "+m" (v->counter));
15287+}
15288+
15289+/**
15290+ * atomic_inc_unchecked - increment atomic variable
15291+ * @v: pointer of type atomic_unchecked_t
15292+ *
15293+ * Atomically increments @v by 1.
15294+ */
15295+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15296+{
15297+ asm volatile(LOCK_PREFIX "incl %0\n"
15298 : "+m" (v->counter));
15299 }
15300
15301@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15302 */
15303 static inline void atomic_dec(atomic_t *v)
15304 {
15305- asm volatile(LOCK_PREFIX "decl %0"
15306+ asm volatile(LOCK_PREFIX "decl %0\n"
15307+
15308+#ifdef CONFIG_PAX_REFCOUNT
15309+ "jno 0f\n"
15310+ LOCK_PREFIX "incl %0\n"
15311+ "int $4\n0:\n"
15312+ _ASM_EXTABLE(0b, 0b)
15313+#endif
15314+
15315+ : "+m" (v->counter));
15316+}
15317+
15318+/**
15319+ * atomic_dec_unchecked - decrement atomic variable
15320+ * @v: pointer of type atomic_unchecked_t
15321+ *
15322+ * Atomically decrements @v by 1.
15323+ */
15324+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15325+{
15326+ asm volatile(LOCK_PREFIX "decl %0\n"
15327 : "+m" (v->counter));
15328 }
15329
15330@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15331 */
15332 static inline int atomic_dec_and_test(atomic_t *v)
15333 {
15334- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15335+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15336 }
15337
15338 /**
15339@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15340 */
15341 static inline int atomic_inc_and_test(atomic_t *v)
15342 {
15343- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15344+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15345+}
15346+
15347+/**
15348+ * atomic_inc_and_test_unchecked - increment and test
15349+ * @v: pointer of type atomic_unchecked_t
15350+ *
15351+ * Atomically increments @v by 1
15352+ * and returns true if the result is zero, or false for all
15353+ * other cases.
15354+ */
15355+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15356+{
15357+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15358 }
15359
15360 /**
15361@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15362 */
15363 static inline int atomic_add_negative(int i, atomic_t *v)
15364 {
15365- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15366+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15367 }
15368
15369 /**
15370@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15371 *
15372 * Atomically adds @i to @v and returns @i + @v
15373 */
15374-static inline int atomic_add_return(int i, atomic_t *v)
15375+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15376+{
15377+ return i + xadd_check_overflow(&v->counter, i);
15378+}
15379+
15380+/**
15381+ * atomic_add_return_unchecked - add integer and return
15382+ * @i: integer value to add
15383+ * @v: pointer of type atomic_unchecked_t
15384+ *
15385+ * Atomically adds @i to @v and returns @i + @v
15386+ */
15387+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15388 {
15389 return i + xadd(&v->counter, i);
15390 }
15391@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15392 *
15393 * Atomically subtracts @i from @v and returns @v - @i
15394 */
15395-static inline int atomic_sub_return(int i, atomic_t *v)
15396+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15397 {
15398 return atomic_add_return(-i, v);
15399 }
15400
15401 #define atomic_inc_return(v) (atomic_add_return(1, v))
15402+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15403+{
15404+ return atomic_add_return_unchecked(1, v);
15405+}
15406 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15407
15408-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15409+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15410+{
15411+ return cmpxchg(&v->counter, old, new);
15412+}
15413+
15414+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15415 {
15416 return cmpxchg(&v->counter, old, new);
15417 }
15418@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15419 return xchg(&v->counter, new);
15420 }
15421
15422+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15423+{
15424+ return xchg(&v->counter, new);
15425+}
15426+
15427 /**
15428 * __atomic_add_unless - add unless the number is already a given value
15429 * @v: pointer of type atomic_t
15430@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15431 */
15432 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15433 {
15434- int c, old;
15435+ int c, old, new;
15436 c = atomic_read(v);
15437 for (;;) {
15438- if (unlikely(c == (u)))
15439+ if (unlikely(c == u))
15440 break;
15441- old = atomic_cmpxchg((v), c, c + (a));
15442+
15443+ asm volatile("addl %2,%0\n"
15444+
15445+#ifdef CONFIG_PAX_REFCOUNT
15446+ "jno 0f\n"
15447+ "subl %2,%0\n"
15448+ "int $4\n0:\n"
15449+ _ASM_EXTABLE(0b, 0b)
15450+#endif
15451+
15452+ : "=r" (new)
15453+ : "0" (c), "ir" (a));
15454+
15455+ old = atomic_cmpxchg(v, c, new);
15456 if (likely(old == c))
15457 break;
15458 c = old;
15459@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15460 }
15461
15462 /**
15463+ * atomic_inc_not_zero_hint - increment if not null
15464+ * @v: pointer of type atomic_t
15465+ * @hint: probable value of the atomic before the increment
15466+ *
15467+ * This version of atomic_inc_not_zero() gives a hint of probable
15468+ * value of the atomic. This helps processor to not read the memory
15469+ * before doing the atomic read/modify/write cycle, lowering
15470+ * number of bus transactions on some arches.
15471+ *
15472+ * Returns: 0 if increment was not done, 1 otherwise.
15473+ */
15474+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15475+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15476+{
15477+ int val, c = hint, new;
15478+
15479+ /* sanity test, should be removed by compiler if hint is a constant */
15480+ if (!hint)
15481+ return __atomic_add_unless(v, 1, 0);
15482+
15483+ do {
15484+ asm volatile("incl %0\n"
15485+
15486+#ifdef CONFIG_PAX_REFCOUNT
15487+ "jno 0f\n"
15488+ "decl %0\n"
15489+ "int $4\n0:\n"
15490+ _ASM_EXTABLE(0b, 0b)
15491+#endif
15492+
15493+ : "=r" (new)
15494+ : "0" (c));
15495+
15496+ val = atomic_cmpxchg(v, c, new);
15497+ if (val == c)
15498+ return 1;
15499+ c = val;
15500+ } while (c);
15501+
15502+ return 0;
15503+}
15504+
15505+/**
15506 * atomic_inc_short - increment of a short integer
15507 * @v: pointer to type int
15508 *
15509@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15510 }
15511
15512 /* These are x86-specific, used by some header files */
15513-#define atomic_clear_mask(mask, addr) \
15514- asm volatile(LOCK_PREFIX "andl %0,%1" \
15515- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15516+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15517+{
15518+ asm volatile(LOCK_PREFIX "andl %1,%0"
15519+ : "+m" (v->counter)
15520+ : "r" (~(mask))
15521+ : "memory");
15522+}
15523
15524-#define atomic_set_mask(mask, addr) \
15525- asm volatile(LOCK_PREFIX "orl %0,%1" \
15526- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15527- : "memory")
15528+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15529+{
15530+ asm volatile(LOCK_PREFIX "andl %1,%0"
15531+ : "+m" (v->counter)
15532+ : "r" (~(mask))
15533+ : "memory");
15534+}
15535+
15536+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15537+{
15538+ asm volatile(LOCK_PREFIX "orl %1,%0"
15539+ : "+m" (v->counter)
15540+ : "r" (mask)
15541+ : "memory");
15542+}
15543+
15544+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15545+{
15546+ asm volatile(LOCK_PREFIX "orl %1,%0"
15547+ : "+m" (v->counter)
15548+ : "r" (mask)
15549+ : "memory");
15550+}
15551
15552 #ifdef CONFIG_X86_32
15553 # include <asm/atomic64_32.h>
15554diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15555index b154de7..bf18a5a 100644
15556--- a/arch/x86/include/asm/atomic64_32.h
15557+++ b/arch/x86/include/asm/atomic64_32.h
15558@@ -12,6 +12,14 @@ typedef struct {
15559 u64 __aligned(8) counter;
15560 } atomic64_t;
15561
15562+#ifdef CONFIG_PAX_REFCOUNT
15563+typedef struct {
15564+ u64 __aligned(8) counter;
15565+} atomic64_unchecked_t;
15566+#else
15567+typedef atomic64_t atomic64_unchecked_t;
15568+#endif
15569+
15570 #define ATOMIC64_INIT(val) { (val) }
15571
15572 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15573@@ -37,21 +45,31 @@ typedef struct {
15574 ATOMIC64_DECL_ONE(sym##_386)
15575
15576 ATOMIC64_DECL_ONE(add_386);
15577+ATOMIC64_DECL_ONE(add_unchecked_386);
15578 ATOMIC64_DECL_ONE(sub_386);
15579+ATOMIC64_DECL_ONE(sub_unchecked_386);
15580 ATOMIC64_DECL_ONE(inc_386);
15581+ATOMIC64_DECL_ONE(inc_unchecked_386);
15582 ATOMIC64_DECL_ONE(dec_386);
15583+ATOMIC64_DECL_ONE(dec_unchecked_386);
15584 #endif
15585
15586 #define alternative_atomic64(f, out, in...) \
15587 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15588
15589 ATOMIC64_DECL(read);
15590+ATOMIC64_DECL(read_unchecked);
15591 ATOMIC64_DECL(set);
15592+ATOMIC64_DECL(set_unchecked);
15593 ATOMIC64_DECL(xchg);
15594 ATOMIC64_DECL(add_return);
15595+ATOMIC64_DECL(add_return_unchecked);
15596 ATOMIC64_DECL(sub_return);
15597+ATOMIC64_DECL(sub_return_unchecked);
15598 ATOMIC64_DECL(inc_return);
15599+ATOMIC64_DECL(inc_return_unchecked);
15600 ATOMIC64_DECL(dec_return);
15601+ATOMIC64_DECL(dec_return_unchecked);
15602 ATOMIC64_DECL(dec_if_positive);
15603 ATOMIC64_DECL(inc_not_zero);
15604 ATOMIC64_DECL(add_unless);
15605@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15606 }
15607
15608 /**
15609+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15610+ * @p: pointer to type atomic64_unchecked_t
15611+ * @o: expected value
15612+ * @n: new value
15613+ *
15614+ * Atomically sets @v to @n if it was equal to @o and returns
15615+ * the old value.
15616+ */
15617+
15618+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15619+{
15620+ return cmpxchg64(&v->counter, o, n);
15621+}
15622+
15623+/**
15624 * atomic64_xchg - xchg atomic64 variable
15625 * @v: pointer to type atomic64_t
15626 * @n: value to assign
15627@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15628 }
15629
15630 /**
15631+ * atomic64_set_unchecked - set atomic64 variable
15632+ * @v: pointer to type atomic64_unchecked_t
15633+ * @n: value to assign
15634+ *
15635+ * Atomically sets the value of @v to @n.
15636+ */
15637+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15638+{
15639+ unsigned high = (unsigned)(i >> 32);
15640+ unsigned low = (unsigned)i;
15641+ alternative_atomic64(set, /* no output */,
15642+ "S" (v), "b" (low), "c" (high)
15643+ : "eax", "edx", "memory");
15644+}
15645+
15646+/**
15647 * atomic64_read - read atomic64 variable
15648 * @v: pointer to type atomic64_t
15649 *
15650@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15651 }
15652
15653 /**
15654+ * atomic64_read_unchecked - read atomic64 variable
15655+ * @v: pointer to type atomic64_unchecked_t
15656+ *
15657+ * Atomically reads the value of @v and returns it.
15658+ */
15659+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15660+{
15661+ long long r;
15662+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15663+ return r;
15664+ }
15665+
15666+/**
15667 * atomic64_add_return - add and return
15668 * @i: integer value to add
15669 * @v: pointer to type atomic64_t
15670@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15671 return i;
15672 }
15673
15674+/**
15675+ * atomic64_add_return_unchecked - add and return
15676+ * @i: integer value to add
15677+ * @v: pointer to type atomic64_unchecked_t
15678+ *
15679+ * Atomically adds @i to @v and returns @i + *@v
15680+ */
15681+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15682+{
15683+ alternative_atomic64(add_return_unchecked,
15684+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15685+ ASM_NO_INPUT_CLOBBER("memory"));
15686+ return i;
15687+}
15688+
15689 /*
15690 * Other variants with different arithmetic operators:
15691 */
15692@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15693 return a;
15694 }
15695
15696+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15697+{
15698+ long long a;
15699+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15700+ "S" (v) : "memory", "ecx");
15701+ return a;
15702+}
15703+
15704 static inline long long atomic64_dec_return(atomic64_t *v)
15705 {
15706 long long a;
15707@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15708 }
15709
15710 /**
15711+ * atomic64_add_unchecked - add integer to atomic64 variable
15712+ * @i: integer value to add
15713+ * @v: pointer to type atomic64_unchecked_t
15714+ *
15715+ * Atomically adds @i to @v.
15716+ */
15717+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15718+{
15719+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15720+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15721+ ASM_NO_INPUT_CLOBBER("memory"));
15722+ return i;
15723+}
15724+
15725+/**
15726 * atomic64_sub - subtract the atomic64 variable
15727 * @i: integer value to subtract
15728 * @v: pointer to type atomic64_t
15729diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15730index f8d273e..02f39f3 100644
15731--- a/arch/x86/include/asm/atomic64_64.h
15732+++ b/arch/x86/include/asm/atomic64_64.h
15733@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15734 }
15735
15736 /**
15737+ * atomic64_read_unchecked - read atomic64 variable
15738+ * @v: pointer of type atomic64_unchecked_t
15739+ *
15740+ * Atomically reads the value of @v.
15741+ * Doesn't imply a read memory barrier.
15742+ */
15743+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15744+{
15745+ return ACCESS_ONCE((v)->counter);
15746+}
15747+
15748+/**
15749 * atomic64_set - set atomic64 variable
15750 * @v: pointer to type atomic64_t
15751 * @i: required value
15752@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15753 }
15754
15755 /**
15756+ * atomic64_set_unchecked - set atomic64 variable
15757+ * @v: pointer to type atomic64_unchecked_t
15758+ * @i: required value
15759+ *
15760+ * Atomically sets the value of @v to @i.
15761+ */
15762+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15763+{
15764+ v->counter = i;
15765+}
15766+
15767+/**
15768 * atomic64_add - add integer to atomic64 variable
15769 * @i: integer value to add
15770 * @v: pointer to type atomic64_t
15771@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15772 */
15773 static inline void atomic64_add(long i, atomic64_t *v)
15774 {
15775+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15776+
15777+#ifdef CONFIG_PAX_REFCOUNT
15778+ "jno 0f\n"
15779+ LOCK_PREFIX "subq %1,%0\n"
15780+ "int $4\n0:\n"
15781+ _ASM_EXTABLE(0b, 0b)
15782+#endif
15783+
15784+ : "=m" (v->counter)
15785+ : "er" (i), "m" (v->counter));
15786+}
15787+
15788+/**
15789+ * atomic64_add_unchecked - add integer to atomic64 variable
15790+ * @i: integer value to add
15791+ * @v: pointer to type atomic64_unchecked_t
15792+ *
15793+ * Atomically adds @i to @v.
15794+ */
15795+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15796+{
15797 asm volatile(LOCK_PREFIX "addq %1,%0"
15798 : "=m" (v->counter)
15799 : "er" (i), "m" (v->counter));
15800@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15801 */
15802 static inline void atomic64_sub(long i, atomic64_t *v)
15803 {
15804- asm volatile(LOCK_PREFIX "subq %1,%0"
15805+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15806+
15807+#ifdef CONFIG_PAX_REFCOUNT
15808+ "jno 0f\n"
15809+ LOCK_PREFIX "addq %1,%0\n"
15810+ "int $4\n0:\n"
15811+ _ASM_EXTABLE(0b, 0b)
15812+#endif
15813+
15814+ : "=m" (v->counter)
15815+ : "er" (i), "m" (v->counter));
15816+}
15817+
15818+/**
15819+ * atomic64_sub_unchecked - subtract the atomic64 variable
15820+ * @i: integer value to subtract
15821+ * @v: pointer to type atomic64_unchecked_t
15822+ *
15823+ * Atomically subtracts @i from @v.
15824+ */
15825+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15826+{
15827+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15828 : "=m" (v->counter)
15829 : "er" (i), "m" (v->counter));
15830 }
15831@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15832 */
15833 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15834 {
15835- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15836+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15837 }
15838
15839 /**
15840@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15841 */
15842 static inline void atomic64_inc(atomic64_t *v)
15843 {
15844+ asm volatile(LOCK_PREFIX "incq %0\n"
15845+
15846+#ifdef CONFIG_PAX_REFCOUNT
15847+ "jno 0f\n"
15848+ LOCK_PREFIX "decq %0\n"
15849+ "int $4\n0:\n"
15850+ _ASM_EXTABLE(0b, 0b)
15851+#endif
15852+
15853+ : "=m" (v->counter)
15854+ : "m" (v->counter));
15855+}
15856+
15857+/**
15858+ * atomic64_inc_unchecked - increment atomic64 variable
15859+ * @v: pointer to type atomic64_unchecked_t
15860+ *
15861+ * Atomically increments @v by 1.
15862+ */
15863+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15864+{
15865 asm volatile(LOCK_PREFIX "incq %0"
15866 : "=m" (v->counter)
15867 : "m" (v->counter));
15868@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15869 */
15870 static inline void atomic64_dec(atomic64_t *v)
15871 {
15872- asm volatile(LOCK_PREFIX "decq %0"
15873+ asm volatile(LOCK_PREFIX "decq %0\n"
15874+
15875+#ifdef CONFIG_PAX_REFCOUNT
15876+ "jno 0f\n"
15877+ LOCK_PREFIX "incq %0\n"
15878+ "int $4\n0:\n"
15879+ _ASM_EXTABLE(0b, 0b)
15880+#endif
15881+
15882+ : "=m" (v->counter)
15883+ : "m" (v->counter));
15884+}
15885+
15886+/**
15887+ * atomic64_dec_unchecked - decrement atomic64 variable
15888+ * @v: pointer to type atomic64_t
15889+ *
15890+ * Atomically decrements @v by 1.
15891+ */
15892+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15893+{
15894+ asm volatile(LOCK_PREFIX "decq %0\n"
15895 : "=m" (v->counter)
15896 : "m" (v->counter));
15897 }
15898@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15899 */
15900 static inline int atomic64_dec_and_test(atomic64_t *v)
15901 {
15902- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15903+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15904 }
15905
15906 /**
15907@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15908 */
15909 static inline int atomic64_inc_and_test(atomic64_t *v)
15910 {
15911- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15912+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15913 }
15914
15915 /**
15916@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15917 */
15918 static inline int atomic64_add_negative(long i, atomic64_t *v)
15919 {
15920- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15921+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15922 }
15923
15924 /**
15925@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15926 */
15927 static inline long atomic64_add_return(long i, atomic64_t *v)
15928 {
15929+ return i + xadd_check_overflow(&v->counter, i);
15930+}
15931+
15932+/**
15933+ * atomic64_add_return_unchecked - add and return
15934+ * @i: integer value to add
15935+ * @v: pointer to type atomic64_unchecked_t
15936+ *
15937+ * Atomically adds @i to @v and returns @i + @v
15938+ */
15939+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15940+{
15941 return i + xadd(&v->counter, i);
15942 }
15943
15944@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15945 }
15946
15947 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15948+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15949+{
15950+ return atomic64_add_return_unchecked(1, v);
15951+}
15952 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15953
15954 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15955@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15956 return cmpxchg(&v->counter, old, new);
15957 }
15958
15959+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15960+{
15961+ return cmpxchg(&v->counter, old, new);
15962+}
15963+
15964 static inline long atomic64_xchg(atomic64_t *v, long new)
15965 {
15966 return xchg(&v->counter, new);
15967@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15968 */
15969 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15970 {
15971- long c, old;
15972+ long c, old, new;
15973 c = atomic64_read(v);
15974 for (;;) {
15975- if (unlikely(c == (u)))
15976+ if (unlikely(c == u))
15977 break;
15978- old = atomic64_cmpxchg((v), c, c + (a));
15979+
15980+ asm volatile("add %2,%0\n"
15981+
15982+#ifdef CONFIG_PAX_REFCOUNT
15983+ "jno 0f\n"
15984+ "sub %2,%0\n"
15985+ "int $4\n0:\n"
15986+ _ASM_EXTABLE(0b, 0b)
15987+#endif
15988+
15989+ : "=r" (new)
15990+ : "0" (c), "ir" (a));
15991+
15992+ old = atomic64_cmpxchg(v, c, new);
15993 if (likely(old == c))
15994 break;
15995 c = old;
15996 }
15997- return c != (u);
15998+ return c != u;
15999 }
16000
16001 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16002diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16003index 2ab1eb3..1e8cc5d 100644
16004--- a/arch/x86/include/asm/barrier.h
16005+++ b/arch/x86/include/asm/barrier.h
16006@@ -57,7 +57,7 @@
16007 do { \
16008 compiletime_assert_atomic_type(*p); \
16009 smp_mb(); \
16010- ACCESS_ONCE(*p) = (v); \
16011+ ACCESS_ONCE_RW(*p) = (v); \
16012 } while (0)
16013
16014 #define smp_load_acquire(p) \
16015@@ -74,7 +74,7 @@ do { \
16016 do { \
16017 compiletime_assert_atomic_type(*p); \
16018 barrier(); \
16019- ACCESS_ONCE(*p) = (v); \
16020+ ACCESS_ONCE_RW(*p) = (v); \
16021 } while (0)
16022
16023 #define smp_load_acquire(p) \
16024diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16025index cfe3b95..d01b118 100644
16026--- a/arch/x86/include/asm/bitops.h
16027+++ b/arch/x86/include/asm/bitops.h
16028@@ -50,7 +50,7 @@
16029 * a mask operation on a byte.
16030 */
16031 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16032-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16033+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16034 #define CONST_MASK(nr) (1 << ((nr) & 7))
16035
16036 /**
16037@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16038 */
16039 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16040 {
16041- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16042+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16043 }
16044
16045 /**
16046@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16047 */
16048 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16049 {
16050- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16051+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16052 }
16053
16054 /**
16055@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16056 */
16057 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16058 {
16059- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16060+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16061 }
16062
16063 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16064@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16065 *
16066 * Undefined if no bit exists, so code should check against 0 first.
16067 */
16068-static inline unsigned long __ffs(unsigned long word)
16069+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16070 {
16071 asm("rep; bsf %1,%0"
16072 : "=r" (word)
16073@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16074 *
16075 * Undefined if no zero exists, so code should check against ~0UL first.
16076 */
16077-static inline unsigned long ffz(unsigned long word)
16078+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16079 {
16080 asm("rep; bsf %1,%0"
16081 : "=r" (word)
16082@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16083 *
16084 * Undefined if no set bit exists, so code should check against 0 first.
16085 */
16086-static inline unsigned long __fls(unsigned long word)
16087+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16088 {
16089 asm("bsr %1,%0"
16090 : "=r" (word)
16091@@ -434,7 +434,7 @@ static inline int ffs(int x)
16092 * set bit if value is nonzero. The last (most significant) bit is
16093 * at position 32.
16094 */
16095-static inline int fls(int x)
16096+static inline int __intentional_overflow(-1) fls(int x)
16097 {
16098 int r;
16099
16100@@ -476,7 +476,7 @@ static inline int fls(int x)
16101 * at position 64.
16102 */
16103 #ifdef CONFIG_X86_64
16104-static __always_inline int fls64(__u64 x)
16105+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16106 {
16107 int bitpos = -1;
16108 /*
16109diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16110index 4fa687a..60f2d39 100644
16111--- a/arch/x86/include/asm/boot.h
16112+++ b/arch/x86/include/asm/boot.h
16113@@ -6,10 +6,15 @@
16114 #include <uapi/asm/boot.h>
16115
16116 /* Physical address where kernel should be loaded. */
16117-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16118+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16119 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16120 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16121
16122+#ifndef __ASSEMBLY__
16123+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16124+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16125+#endif
16126+
16127 /* Minimum kernel alignment, as a power of two */
16128 #ifdef CONFIG_X86_64
16129 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16130diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16131index 48f99f1..d78ebf9 100644
16132--- a/arch/x86/include/asm/cache.h
16133+++ b/arch/x86/include/asm/cache.h
16134@@ -5,12 +5,13 @@
16135
16136 /* L1 cache line size */
16137 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16138-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16139+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16140
16141 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16142+#define __read_only __attribute__((__section__(".data..read_only")))
16143
16144 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16145-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16146+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16147
16148 #ifdef CONFIG_X86_VSMP
16149 #ifdef CONFIG_SMP
16150diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16151index 1f1297b..72b8439 100644
16152--- a/arch/x86/include/asm/calling.h
16153+++ b/arch/x86/include/asm/calling.h
16154@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16155 #define RSP 152
16156 #define SS 160
16157
16158-#define ARGOFFSET R11
16159+#define ARGOFFSET R15
16160
16161 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16162- subq $9*8+\addskip, %rsp
16163- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16164- movq_cfi rdi, 8*8
16165- movq_cfi rsi, 7*8
16166- movq_cfi rdx, 6*8
16167+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16168+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16169+ movq_cfi rdi, RDI
16170+ movq_cfi rsi, RSI
16171+ movq_cfi rdx, RDX
16172
16173 .if \save_rcx
16174- movq_cfi rcx, 5*8
16175+ movq_cfi rcx, RCX
16176 .endif
16177
16178 .if \rax_enosys
16179- movq $-ENOSYS, 4*8(%rsp)
16180+ movq $-ENOSYS, RAX(%rsp)
16181 .else
16182- movq_cfi rax, 4*8
16183+ movq_cfi rax, RAX
16184 .endif
16185
16186 .if \save_r891011
16187- movq_cfi r8, 3*8
16188- movq_cfi r9, 2*8
16189- movq_cfi r10, 1*8
16190- movq_cfi r11, 0*8
16191+ movq_cfi r8, R8
16192+ movq_cfi r9, R9
16193+ movq_cfi r10, R10
16194+ movq_cfi r11, R11
16195 .endif
16196
16197+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16198+ movq_cfi r12, R12
16199+#endif
16200+
16201 .endm
16202
16203-#define ARG_SKIP (9*8)
16204+#define ARG_SKIP ORIG_RAX
16205
16206 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16207 rstor_r8910=1, rstor_rdx=1
16208+
16209+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16210+ movq_cfi_restore R12, r12
16211+#endif
16212+
16213 .if \rstor_r11
16214- movq_cfi_restore 0*8, r11
16215+ movq_cfi_restore R11, r11
16216 .endif
16217
16218 .if \rstor_r8910
16219- movq_cfi_restore 1*8, r10
16220- movq_cfi_restore 2*8, r9
16221- movq_cfi_restore 3*8, r8
16222+ movq_cfi_restore R10, r10
16223+ movq_cfi_restore R9, r9
16224+ movq_cfi_restore R8, r8
16225 .endif
16226
16227 .if \rstor_rax
16228- movq_cfi_restore 4*8, rax
16229+ movq_cfi_restore RAX, rax
16230 .endif
16231
16232 .if \rstor_rcx
16233- movq_cfi_restore 5*8, rcx
16234+ movq_cfi_restore RCX, rcx
16235 .endif
16236
16237 .if \rstor_rdx
16238- movq_cfi_restore 6*8, rdx
16239+ movq_cfi_restore RDX, rdx
16240 .endif
16241
16242- movq_cfi_restore 7*8, rsi
16243- movq_cfi_restore 8*8, rdi
16244+ movq_cfi_restore RSI, rsi
16245+ movq_cfi_restore RDI, rdi
16246
16247- .if ARG_SKIP+\addskip > 0
16248- addq $ARG_SKIP+\addskip, %rsp
16249- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16250+ .if ORIG_RAX+\addskip > 0
16251+ addq $ORIG_RAX+\addskip, %rsp
16252+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16253 .endif
16254 .endm
16255
16256- .macro LOAD_ARGS offset, skiprax=0
16257- movq \offset(%rsp), %r11
16258- movq \offset+8(%rsp), %r10
16259- movq \offset+16(%rsp), %r9
16260- movq \offset+24(%rsp), %r8
16261- movq \offset+40(%rsp), %rcx
16262- movq \offset+48(%rsp), %rdx
16263- movq \offset+56(%rsp), %rsi
16264- movq \offset+64(%rsp), %rdi
16265+ .macro LOAD_ARGS skiprax=0
16266+ movq R11(%rsp), %r11
16267+ movq R10(%rsp), %r10
16268+ movq R9(%rsp), %r9
16269+ movq R8(%rsp), %r8
16270+ movq RCX(%rsp), %rcx
16271+ movq RDX(%rsp), %rdx
16272+ movq RSI(%rsp), %rsi
16273+ movq RDI(%rsp), %rdi
16274 .if \skiprax
16275 .else
16276- movq \offset+72(%rsp), %rax
16277+ movq ORIG_RAX(%rsp), %rax
16278 .endif
16279 .endm
16280
16281-#define REST_SKIP (6*8)
16282-
16283 .macro SAVE_REST
16284- subq $REST_SKIP, %rsp
16285- CFI_ADJUST_CFA_OFFSET REST_SKIP
16286- movq_cfi rbx, 5*8
16287- movq_cfi rbp, 4*8
16288- movq_cfi r12, 3*8
16289- movq_cfi r13, 2*8
16290- movq_cfi r14, 1*8
16291- movq_cfi r15, 0*8
16292+ movq_cfi rbx, RBX
16293+ movq_cfi rbp, RBP
16294+
16295+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16296+ movq_cfi r12, R12
16297+#endif
16298+
16299+ movq_cfi r13, R13
16300+ movq_cfi r14, R14
16301+ movq_cfi r15, R15
16302 .endm
16303
16304 .macro RESTORE_REST
16305- movq_cfi_restore 0*8, r15
16306- movq_cfi_restore 1*8, r14
16307- movq_cfi_restore 2*8, r13
16308- movq_cfi_restore 3*8, r12
16309- movq_cfi_restore 4*8, rbp
16310- movq_cfi_restore 5*8, rbx
16311- addq $REST_SKIP, %rsp
16312- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16313+ movq_cfi_restore R15, r15
16314+ movq_cfi_restore R14, r14
16315+ movq_cfi_restore R13, r13
16316+
16317+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16318+ movq_cfi_restore R12, r12
16319+#endif
16320+
16321+ movq_cfi_restore RBP, rbp
16322+ movq_cfi_restore RBX, rbx
16323 .endm
16324
16325 .macro SAVE_ALL
16326diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16327index f50de69..2b0a458 100644
16328--- a/arch/x86/include/asm/checksum_32.h
16329+++ b/arch/x86/include/asm/checksum_32.h
16330@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16331 int len, __wsum sum,
16332 int *src_err_ptr, int *dst_err_ptr);
16333
16334+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16335+ int len, __wsum sum,
16336+ int *src_err_ptr, int *dst_err_ptr);
16337+
16338+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16339+ int len, __wsum sum,
16340+ int *src_err_ptr, int *dst_err_ptr);
16341+
16342 /*
16343 * Note: when you get a NULL pointer exception here this means someone
16344 * passed in an incorrect kernel address to one of these functions.
16345@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16346
16347 might_sleep();
16348 stac();
16349- ret = csum_partial_copy_generic((__force void *)src, dst,
16350+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16351 len, sum, err_ptr, NULL);
16352 clac();
16353
16354@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16355 might_sleep();
16356 if (access_ok(VERIFY_WRITE, dst, len)) {
16357 stac();
16358- ret = csum_partial_copy_generic(src, (__force void *)dst,
16359+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16360 len, sum, NULL, err_ptr);
16361 clac();
16362 return ret;
16363diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16364index 99c105d7..2f667ac 100644
16365--- a/arch/x86/include/asm/cmpxchg.h
16366+++ b/arch/x86/include/asm/cmpxchg.h
16367@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16368 __compiletime_error("Bad argument size for cmpxchg");
16369 extern void __xadd_wrong_size(void)
16370 __compiletime_error("Bad argument size for xadd");
16371+extern void __xadd_check_overflow_wrong_size(void)
16372+ __compiletime_error("Bad argument size for xadd_check_overflow");
16373 extern void __add_wrong_size(void)
16374 __compiletime_error("Bad argument size for add");
16375+extern void __add_check_overflow_wrong_size(void)
16376+ __compiletime_error("Bad argument size for add_check_overflow");
16377
16378 /*
16379 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16380@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16381 __ret; \
16382 })
16383
16384+#ifdef CONFIG_PAX_REFCOUNT
16385+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16386+ ({ \
16387+ __typeof__ (*(ptr)) __ret = (arg); \
16388+ switch (sizeof(*(ptr))) { \
16389+ case __X86_CASE_L: \
16390+ asm volatile (lock #op "l %0, %1\n" \
16391+ "jno 0f\n" \
16392+ "mov %0,%1\n" \
16393+ "int $4\n0:\n" \
16394+ _ASM_EXTABLE(0b, 0b) \
16395+ : "+r" (__ret), "+m" (*(ptr)) \
16396+ : : "memory", "cc"); \
16397+ break; \
16398+ case __X86_CASE_Q: \
16399+ asm volatile (lock #op "q %q0, %1\n" \
16400+ "jno 0f\n" \
16401+ "mov %0,%1\n" \
16402+ "int $4\n0:\n" \
16403+ _ASM_EXTABLE(0b, 0b) \
16404+ : "+r" (__ret), "+m" (*(ptr)) \
16405+ : : "memory", "cc"); \
16406+ break; \
16407+ default: \
16408+ __ ## op ## _check_overflow_wrong_size(); \
16409+ } \
16410+ __ret; \
16411+ })
16412+#else
16413+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16414+#endif
16415+
16416 /*
16417 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16418 * Since this is generally used to protect other memory information, we
16419@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16420 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16421 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16422
16423+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16424+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16425+
16426 #define __add(ptr, inc, lock) \
16427 ({ \
16428 __typeof__ (*(ptr)) __ret = (inc); \
16429diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16430index 59c6c40..5e0b22c 100644
16431--- a/arch/x86/include/asm/compat.h
16432+++ b/arch/x86/include/asm/compat.h
16433@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16434 typedef u32 compat_uint_t;
16435 typedef u32 compat_ulong_t;
16436 typedef u64 __attribute__((aligned(4))) compat_u64;
16437-typedef u32 compat_uptr_t;
16438+typedef u32 __user compat_uptr_t;
16439
16440 struct compat_timespec {
16441 compat_time_t tv_sec;
16442diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16443index 90a5485..43b6211 100644
16444--- a/arch/x86/include/asm/cpufeature.h
16445+++ b/arch/x86/include/asm/cpufeature.h
16446@@ -213,7 +213,7 @@
16447 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16448 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16449 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16450-
16451+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16452
16453 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16454 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16455@@ -221,7 +221,7 @@
16456 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16457 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16458 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16459-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16460+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16461 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16462 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16463 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16464@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16465 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16466 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16467 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16468+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16469
16470 #if __GNUC__ >= 4
16471 extern void warn_pre_alternatives(void);
16472@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16473
16474 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16475 t_warn:
16476- warn_pre_alternatives();
16477+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16478+ warn_pre_alternatives();
16479 return false;
16480 #endif
16481
16482@@ -461,7 +463,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16483 ".section .discard,\"aw\",@progbits\n"
16484 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16485 ".previous\n"
16486- ".section .altinstr_replacement,\"ax\"\n"
16487+ ".section .altinstr_replacement,\"a\"\n"
16488 "3: movb $1,%0\n"
16489 "4:\n"
16490 ".previous\n"
16491@@ -498,7 +500,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16492 " .byte 2b - 1b\n" /* src len */
16493 " .byte 4f - 3f\n" /* repl len */
16494 ".previous\n"
16495- ".section .altinstr_replacement,\"ax\"\n"
16496+ ".section .altinstr_replacement,\"a\"\n"
16497 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16498 "4:\n"
16499 ".previous\n"
16500@@ -531,7 +533,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16501 ".section .discard,\"aw\",@progbits\n"
16502 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16503 ".previous\n"
16504- ".section .altinstr_replacement,\"ax\"\n"
16505+ ".section .altinstr_replacement,\"a\"\n"
16506 "3: movb $0,%0\n"
16507 "4:\n"
16508 ".previous\n"
16509@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16510 ".section .discard,\"aw\",@progbits\n"
16511 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16512 ".previous\n"
16513- ".section .altinstr_replacement,\"ax\"\n"
16514+ ".section .altinstr_replacement,\"a\"\n"
16515 "5: movb $1,%0\n"
16516 "6:\n"
16517 ".previous\n"
16518diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16519index a94b82e..59ecefa 100644
16520--- a/arch/x86/include/asm/desc.h
16521+++ b/arch/x86/include/asm/desc.h
16522@@ -4,6 +4,7 @@
16523 #include <asm/desc_defs.h>
16524 #include <asm/ldt.h>
16525 #include <asm/mmu.h>
16526+#include <asm/pgtable.h>
16527
16528 #include <linux/smp.h>
16529 #include <linux/percpu.h>
16530@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16531
16532 desc->type = (info->read_exec_only ^ 1) << 1;
16533 desc->type |= info->contents << 2;
16534+ desc->type |= info->seg_not_present ^ 1;
16535
16536 desc->s = 1;
16537 desc->dpl = 0x3;
16538@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16539 }
16540
16541 extern struct desc_ptr idt_descr;
16542-extern gate_desc idt_table[];
16543-extern struct desc_ptr debug_idt_descr;
16544-extern gate_desc debug_idt_table[];
16545-
16546-struct gdt_page {
16547- struct desc_struct gdt[GDT_ENTRIES];
16548-} __attribute__((aligned(PAGE_SIZE)));
16549-
16550-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16551+extern gate_desc idt_table[IDT_ENTRIES];
16552+extern const struct desc_ptr debug_idt_descr;
16553+extern gate_desc debug_idt_table[IDT_ENTRIES];
16554
16555+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16556 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16557 {
16558- return per_cpu(gdt_page, cpu).gdt;
16559+ return cpu_gdt_table[cpu];
16560 }
16561
16562 #ifdef CONFIG_X86_64
16563@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16564 unsigned long base, unsigned dpl, unsigned flags,
16565 unsigned short seg)
16566 {
16567- gate->a = (seg << 16) | (base & 0xffff);
16568- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16569+ gate->gate.offset_low = base;
16570+ gate->gate.seg = seg;
16571+ gate->gate.reserved = 0;
16572+ gate->gate.type = type;
16573+ gate->gate.s = 0;
16574+ gate->gate.dpl = dpl;
16575+ gate->gate.p = 1;
16576+ gate->gate.offset_high = base >> 16;
16577 }
16578
16579 #endif
16580@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16581
16582 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16583 {
16584+ pax_open_kernel();
16585 memcpy(&idt[entry], gate, sizeof(*gate));
16586+ pax_close_kernel();
16587 }
16588
16589 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16590 {
16591+ pax_open_kernel();
16592 memcpy(&ldt[entry], desc, 8);
16593+ pax_close_kernel();
16594 }
16595
16596 static inline void
16597@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16598 default: size = sizeof(*gdt); break;
16599 }
16600
16601+ pax_open_kernel();
16602 memcpy(&gdt[entry], desc, size);
16603+ pax_close_kernel();
16604 }
16605
16606 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16607@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16608
16609 static inline void native_load_tr_desc(void)
16610 {
16611+ pax_open_kernel();
16612 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16613+ pax_close_kernel();
16614 }
16615
16616 static inline void native_load_gdt(const struct desc_ptr *dtr)
16617@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16618 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16619 unsigned int i;
16620
16621+ pax_open_kernel();
16622 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16623 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16624+ pax_close_kernel();
16625 }
16626
16627 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16628@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16629 preempt_enable();
16630 }
16631
16632-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16633+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16634 {
16635 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16636 }
16637@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16638 }
16639
16640 #ifdef CONFIG_X86_64
16641-static inline void set_nmi_gate(int gate, void *addr)
16642+static inline void set_nmi_gate(int gate, const void *addr)
16643 {
16644 gate_desc s;
16645
16646@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16647 #endif
16648
16649 #ifdef CONFIG_TRACING
16650-extern struct desc_ptr trace_idt_descr;
16651-extern gate_desc trace_idt_table[];
16652+extern const struct desc_ptr trace_idt_descr;
16653+extern gate_desc trace_idt_table[IDT_ENTRIES];
16654 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16655 {
16656 write_idt_entry(trace_idt_table, entry, gate);
16657 }
16658
16659-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16660+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16661 unsigned dpl, unsigned ist, unsigned seg)
16662 {
16663 gate_desc s;
16664@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16665 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16666 #endif
16667
16668-static inline void _set_gate(int gate, unsigned type, void *addr,
16669+static inline void _set_gate(int gate, unsigned type, const void *addr,
16670 unsigned dpl, unsigned ist, unsigned seg)
16671 {
16672 gate_desc s;
16673@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16674 #define set_intr_gate(n, addr) \
16675 do { \
16676 BUG_ON((unsigned)n > 0xFF); \
16677- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16678+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16679 __KERNEL_CS); \
16680- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16681+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16682 0, 0, __KERNEL_CS); \
16683 } while (0)
16684
16685@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16686 /*
16687 * This routine sets up an interrupt gate at directory privilege level 3.
16688 */
16689-static inline void set_system_intr_gate(unsigned int n, void *addr)
16690+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16691 {
16692 BUG_ON((unsigned)n > 0xFF);
16693 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16694 }
16695
16696-static inline void set_system_trap_gate(unsigned int n, void *addr)
16697+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16698 {
16699 BUG_ON((unsigned)n > 0xFF);
16700 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16701 }
16702
16703-static inline void set_trap_gate(unsigned int n, void *addr)
16704+static inline void set_trap_gate(unsigned int n, const void *addr)
16705 {
16706 BUG_ON((unsigned)n > 0xFF);
16707 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16708@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16709 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16710 {
16711 BUG_ON((unsigned)n > 0xFF);
16712- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16713+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16714 }
16715
16716-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16717+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16718 {
16719 BUG_ON((unsigned)n > 0xFF);
16720 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16721 }
16722
16723-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16724+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16725 {
16726 BUG_ON((unsigned)n > 0xFF);
16727 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16728@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16729 else
16730 load_idt((const struct desc_ptr *)&idt_descr);
16731 }
16732+
16733+#ifdef CONFIG_X86_32
16734+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16735+{
16736+ struct desc_struct d;
16737+
16738+ if (likely(limit))
16739+ limit = (limit - 1UL) >> PAGE_SHIFT;
16740+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16741+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16742+}
16743+#endif
16744+
16745 #endif /* _ASM_X86_DESC_H */
16746diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16747index 278441f..b95a174 100644
16748--- a/arch/x86/include/asm/desc_defs.h
16749+++ b/arch/x86/include/asm/desc_defs.h
16750@@ -31,6 +31,12 @@ struct desc_struct {
16751 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16752 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16753 };
16754+ struct {
16755+ u16 offset_low;
16756+ u16 seg;
16757+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16758+ unsigned offset_high: 16;
16759+ } gate;
16760 };
16761 } __attribute__((packed));
16762
16763diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16764index ced283a..ffe04cc 100644
16765--- a/arch/x86/include/asm/div64.h
16766+++ b/arch/x86/include/asm/div64.h
16767@@ -39,7 +39,7 @@
16768 __mod; \
16769 })
16770
16771-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16772+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16773 {
16774 union {
16775 u64 v64;
16776diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16777index ca3347a..1a5082a 100644
16778--- a/arch/x86/include/asm/elf.h
16779+++ b/arch/x86/include/asm/elf.h
16780@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16781
16782 #include <asm/vdso.h>
16783
16784-#ifdef CONFIG_X86_64
16785-extern unsigned int vdso64_enabled;
16786-#endif
16787 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16788 extern unsigned int vdso32_enabled;
16789 #endif
16790@@ -249,7 +246,25 @@ extern int force_personality32;
16791 the loader. We need to make sure that it is out of the way of the program
16792 that it will "exec", and that there is sufficient room for the brk. */
16793
16794+#ifdef CONFIG_PAX_SEGMEXEC
16795+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16796+#else
16797 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16798+#endif
16799+
16800+#ifdef CONFIG_PAX_ASLR
16801+#ifdef CONFIG_X86_32
16802+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16803+
16804+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16805+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16806+#else
16807+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16808+
16809+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16810+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16811+#endif
16812+#endif
16813
16814 /* This yields a mask that user programs can use to figure out what
16815 instruction set this CPU supports. This could be done in user space,
16816@@ -298,17 +313,13 @@ do { \
16817
16818 #define ARCH_DLINFO \
16819 do { \
16820- if (vdso64_enabled) \
16821- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16822- (unsigned long __force)current->mm->context.vdso); \
16823+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16824 } while (0)
16825
16826 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16827 #define ARCH_DLINFO_X32 \
16828 do { \
16829- if (vdso64_enabled) \
16830- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16831- (unsigned long __force)current->mm->context.vdso); \
16832+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16833 } while (0)
16834
16835 #define AT_SYSINFO 32
16836@@ -323,10 +334,10 @@ else \
16837
16838 #endif /* !CONFIG_X86_32 */
16839
16840-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16841+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16842
16843 #define VDSO_ENTRY \
16844- ((unsigned long)current->mm->context.vdso + \
16845+ (current->mm->context.vdso + \
16846 selected_vdso32->sym___kernel_vsyscall)
16847
16848 struct linux_binprm;
16849@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16850 int uses_interp);
16851 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16852
16853-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16854-#define arch_randomize_brk arch_randomize_brk
16855-
16856 /*
16857 * True on X86_32 or when emulating IA32 on X86_64
16858 */
16859diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16860index 77a99ac..39ff7f5 100644
16861--- a/arch/x86/include/asm/emergency-restart.h
16862+++ b/arch/x86/include/asm/emergency-restart.h
16863@@ -1,6 +1,6 @@
16864 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16865 #define _ASM_X86_EMERGENCY_RESTART_H
16866
16867-extern void machine_emergency_restart(void);
16868+extern void machine_emergency_restart(void) __noreturn;
16869
16870 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16871diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16872index 1c7eefe..d0e4702 100644
16873--- a/arch/x86/include/asm/floppy.h
16874+++ b/arch/x86/include/asm/floppy.h
16875@@ -229,18 +229,18 @@ static struct fd_routine_l {
16876 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16877 } fd_routine[] = {
16878 {
16879- request_dma,
16880- free_dma,
16881- get_dma_residue,
16882- dma_mem_alloc,
16883- hard_dma_setup
16884+ ._request_dma = request_dma,
16885+ ._free_dma = free_dma,
16886+ ._get_dma_residue = get_dma_residue,
16887+ ._dma_mem_alloc = dma_mem_alloc,
16888+ ._dma_setup = hard_dma_setup
16889 },
16890 {
16891- vdma_request_dma,
16892- vdma_nop,
16893- vdma_get_dma_residue,
16894- vdma_mem_alloc,
16895- vdma_dma_setup
16896+ ._request_dma = vdma_request_dma,
16897+ ._free_dma = vdma_nop,
16898+ ._get_dma_residue = vdma_get_dma_residue,
16899+ ._dma_mem_alloc = vdma_mem_alloc,
16900+ ._dma_setup = vdma_dma_setup
16901 }
16902 };
16903
16904diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16905index 72ba21a..79f3f66 100644
16906--- a/arch/x86/include/asm/fpu-internal.h
16907+++ b/arch/x86/include/asm/fpu-internal.h
16908@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16909 #define user_insn(insn, output, input...) \
16910 ({ \
16911 int err; \
16912+ pax_open_userland(); \
16913 asm volatile(ASM_STAC "\n" \
16914- "1:" #insn "\n\t" \
16915+ "1:" \
16916+ __copyuser_seg \
16917+ #insn "\n\t" \
16918 "2: " ASM_CLAC "\n" \
16919 ".section .fixup,\"ax\"\n" \
16920 "3: movl $-1,%[err]\n" \
16921@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16922 _ASM_EXTABLE(1b, 3b) \
16923 : [err] "=r" (err), output \
16924 : "0"(0), input); \
16925+ pax_close_userland(); \
16926 err; \
16927 })
16928
16929@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16930 "fnclex\n\t"
16931 "emms\n\t"
16932 "fildl %P[addr]" /* set F?P to defined value */
16933- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16934+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16935 }
16936
16937 return fpu_restore_checking(&tsk->thread.fpu);
16938diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16939index b4c1f54..e290c08 100644
16940--- a/arch/x86/include/asm/futex.h
16941+++ b/arch/x86/include/asm/futex.h
16942@@ -12,6 +12,7 @@
16943 #include <asm/smap.h>
16944
16945 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16946+ typecheck(u32 __user *, uaddr); \
16947 asm volatile("\t" ASM_STAC "\n" \
16948 "1:\t" insn "\n" \
16949 "2:\t" ASM_CLAC "\n" \
16950@@ -20,15 +21,16 @@
16951 "\tjmp\t2b\n" \
16952 "\t.previous\n" \
16953 _ASM_EXTABLE(1b, 3b) \
16954- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16955+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16956 : "i" (-EFAULT), "0" (oparg), "1" (0))
16957
16958 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16959+ typecheck(u32 __user *, uaddr); \
16960 asm volatile("\t" ASM_STAC "\n" \
16961 "1:\tmovl %2, %0\n" \
16962 "\tmovl\t%0, %3\n" \
16963 "\t" insn "\n" \
16964- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16965+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16966 "\tjnz\t1b\n" \
16967 "3:\t" ASM_CLAC "\n" \
16968 "\t.section .fixup,\"ax\"\n" \
16969@@ -38,7 +40,7 @@
16970 _ASM_EXTABLE(1b, 4b) \
16971 _ASM_EXTABLE(2b, 4b) \
16972 : "=&a" (oldval), "=&r" (ret), \
16973- "+m" (*uaddr), "=&r" (tem) \
16974+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16975 : "r" (oparg), "i" (-EFAULT), "1" (0))
16976
16977 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16978@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16979
16980 pagefault_disable();
16981
16982+ pax_open_userland();
16983 switch (op) {
16984 case FUTEX_OP_SET:
16985- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16986+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16987 break;
16988 case FUTEX_OP_ADD:
16989- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16990+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16991 uaddr, oparg);
16992 break;
16993 case FUTEX_OP_OR:
16994@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16995 default:
16996 ret = -ENOSYS;
16997 }
16998+ pax_close_userland();
16999
17000 pagefault_enable();
17001
17002diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17003index 9662290..49ca5e5 100644
17004--- a/arch/x86/include/asm/hw_irq.h
17005+++ b/arch/x86/include/asm/hw_irq.h
17006@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17007 #endif /* CONFIG_X86_LOCAL_APIC */
17008
17009 /* Statistics */
17010-extern atomic_t irq_err_count;
17011-extern atomic_t irq_mis_count;
17012+extern atomic_unchecked_t irq_err_count;
17013+extern atomic_unchecked_t irq_mis_count;
17014
17015 /* EISA */
17016 extern void eisa_set_level_irq(unsigned int irq);
17017diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17018index ccffa53..3c90c87 100644
17019--- a/arch/x86/include/asm/i8259.h
17020+++ b/arch/x86/include/asm/i8259.h
17021@@ -62,7 +62,7 @@ struct legacy_pic {
17022 void (*init)(int auto_eoi);
17023 int (*irq_pending)(unsigned int irq);
17024 void (*make_irq)(unsigned int irq);
17025-};
17026+} __do_const;
17027
17028 extern struct legacy_pic *legacy_pic;
17029 extern struct legacy_pic null_legacy_pic;
17030diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17031index 34a5b93..27e40a6 100644
17032--- a/arch/x86/include/asm/io.h
17033+++ b/arch/x86/include/asm/io.h
17034@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17035 "m" (*(volatile type __force *)addr) barrier); }
17036
17037 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17038-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17039-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17040+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17041+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17042
17043 build_mmio_read(__readb, "b", unsigned char, "=q", )
17044-build_mmio_read(__readw, "w", unsigned short, "=r", )
17045-build_mmio_read(__readl, "l", unsigned int, "=r", )
17046+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17047+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17048
17049 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17050 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17051@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17052 * this function
17053 */
17054
17055-static inline phys_addr_t virt_to_phys(volatile void *address)
17056+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17057 {
17058 return __pa(address);
17059 }
17060@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17061 return ioremap_nocache(offset, size);
17062 }
17063
17064-extern void iounmap(volatile void __iomem *addr);
17065+extern void iounmap(const volatile void __iomem *addr);
17066
17067 extern void set_iounmap_nonlazy(void);
17068
17069@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17070
17071 #include <linux/vmalloc.h>
17072
17073+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17074+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17075+{
17076+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17077+}
17078+
17079+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17080+{
17081+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17082+}
17083+
17084 /*
17085 * Convert a virtual cached pointer to an uncached pointer
17086 */
17087diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17088index 0a8b519..80e7d5b 100644
17089--- a/arch/x86/include/asm/irqflags.h
17090+++ b/arch/x86/include/asm/irqflags.h
17091@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17092 sti; \
17093 sysexit
17094
17095+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17096+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17097+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17098+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17099+
17100 #else
17101 #define INTERRUPT_RETURN iret
17102 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17103diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17104index 4421b5d..8543006 100644
17105--- a/arch/x86/include/asm/kprobes.h
17106+++ b/arch/x86/include/asm/kprobes.h
17107@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17108 #define RELATIVEJUMP_SIZE 5
17109 #define RELATIVECALL_OPCODE 0xe8
17110 #define RELATIVE_ADDR_SIZE 4
17111-#define MAX_STACK_SIZE 64
17112-#define MIN_STACK_SIZE(ADDR) \
17113- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17114- THREAD_SIZE - (unsigned long)(ADDR))) \
17115- ? (MAX_STACK_SIZE) \
17116- : (((unsigned long)current_thread_info()) + \
17117- THREAD_SIZE - (unsigned long)(ADDR)))
17118+#define MAX_STACK_SIZE 64UL
17119+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17120
17121 #define flush_insn_slot(p) do { } while (0)
17122
17123diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17124index 4ad6560..75c7bdd 100644
17125--- a/arch/x86/include/asm/local.h
17126+++ b/arch/x86/include/asm/local.h
17127@@ -10,33 +10,97 @@ typedef struct {
17128 atomic_long_t a;
17129 } local_t;
17130
17131+typedef struct {
17132+ atomic_long_unchecked_t a;
17133+} local_unchecked_t;
17134+
17135 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17136
17137 #define local_read(l) atomic_long_read(&(l)->a)
17138+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17139 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17140+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17141
17142 static inline void local_inc(local_t *l)
17143 {
17144- asm volatile(_ASM_INC "%0"
17145+ asm volatile(_ASM_INC "%0\n"
17146+
17147+#ifdef CONFIG_PAX_REFCOUNT
17148+ "jno 0f\n"
17149+ _ASM_DEC "%0\n"
17150+ "int $4\n0:\n"
17151+ _ASM_EXTABLE(0b, 0b)
17152+#endif
17153+
17154+ : "+m" (l->a.counter));
17155+}
17156+
17157+static inline void local_inc_unchecked(local_unchecked_t *l)
17158+{
17159+ asm volatile(_ASM_INC "%0\n"
17160 : "+m" (l->a.counter));
17161 }
17162
17163 static inline void local_dec(local_t *l)
17164 {
17165- asm volatile(_ASM_DEC "%0"
17166+ asm volatile(_ASM_DEC "%0\n"
17167+
17168+#ifdef CONFIG_PAX_REFCOUNT
17169+ "jno 0f\n"
17170+ _ASM_INC "%0\n"
17171+ "int $4\n0:\n"
17172+ _ASM_EXTABLE(0b, 0b)
17173+#endif
17174+
17175+ : "+m" (l->a.counter));
17176+}
17177+
17178+static inline void local_dec_unchecked(local_unchecked_t *l)
17179+{
17180+ asm volatile(_ASM_DEC "%0\n"
17181 : "+m" (l->a.counter));
17182 }
17183
17184 static inline void local_add(long i, local_t *l)
17185 {
17186- asm volatile(_ASM_ADD "%1,%0"
17187+ asm volatile(_ASM_ADD "%1,%0\n"
17188+
17189+#ifdef CONFIG_PAX_REFCOUNT
17190+ "jno 0f\n"
17191+ _ASM_SUB "%1,%0\n"
17192+ "int $4\n0:\n"
17193+ _ASM_EXTABLE(0b, 0b)
17194+#endif
17195+
17196+ : "+m" (l->a.counter)
17197+ : "ir" (i));
17198+}
17199+
17200+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17201+{
17202+ asm volatile(_ASM_ADD "%1,%0\n"
17203 : "+m" (l->a.counter)
17204 : "ir" (i));
17205 }
17206
17207 static inline void local_sub(long i, local_t *l)
17208 {
17209- asm volatile(_ASM_SUB "%1,%0"
17210+ asm volatile(_ASM_SUB "%1,%0\n"
17211+
17212+#ifdef CONFIG_PAX_REFCOUNT
17213+ "jno 0f\n"
17214+ _ASM_ADD "%1,%0\n"
17215+ "int $4\n0:\n"
17216+ _ASM_EXTABLE(0b, 0b)
17217+#endif
17218+
17219+ : "+m" (l->a.counter)
17220+ : "ir" (i));
17221+}
17222+
17223+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17224+{
17225+ asm volatile(_ASM_SUB "%1,%0\n"
17226 : "+m" (l->a.counter)
17227 : "ir" (i));
17228 }
17229@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17230 */
17231 static inline int local_sub_and_test(long i, local_t *l)
17232 {
17233- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17234+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17235 }
17236
17237 /**
17238@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17239 */
17240 static inline int local_dec_and_test(local_t *l)
17241 {
17242- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17243+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17244 }
17245
17246 /**
17247@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17248 */
17249 static inline int local_inc_and_test(local_t *l)
17250 {
17251- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17252+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17253 }
17254
17255 /**
17256@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17257 */
17258 static inline int local_add_negative(long i, local_t *l)
17259 {
17260- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17261+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17262 }
17263
17264 /**
17265@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17266 static inline long local_add_return(long i, local_t *l)
17267 {
17268 long __i = i;
17269+ asm volatile(_ASM_XADD "%0, %1\n"
17270+
17271+#ifdef CONFIG_PAX_REFCOUNT
17272+ "jno 0f\n"
17273+ _ASM_MOV "%0,%1\n"
17274+ "int $4\n0:\n"
17275+ _ASM_EXTABLE(0b, 0b)
17276+#endif
17277+
17278+ : "+r" (i), "+m" (l->a.counter)
17279+ : : "memory");
17280+ return i + __i;
17281+}
17282+
17283+/**
17284+ * local_add_return_unchecked - add and return
17285+ * @i: integer value to add
17286+ * @l: pointer to type local_unchecked_t
17287+ *
17288+ * Atomically adds @i to @l and returns @i + @l
17289+ */
17290+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17291+{
17292+ long __i = i;
17293 asm volatile(_ASM_XADD "%0, %1;"
17294 : "+r" (i), "+m" (l->a.counter)
17295 : : "memory");
17296@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17297
17298 #define local_cmpxchg(l, o, n) \
17299 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17300+#define local_cmpxchg_unchecked(l, o, n) \
17301+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17302 /* Always has a lock prefix */
17303 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17304
17305diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17306new file mode 100644
17307index 0000000..2bfd3ba
17308--- /dev/null
17309+++ b/arch/x86/include/asm/mman.h
17310@@ -0,0 +1,15 @@
17311+#ifndef _X86_MMAN_H
17312+#define _X86_MMAN_H
17313+
17314+#include <uapi/asm/mman.h>
17315+
17316+#ifdef __KERNEL__
17317+#ifndef __ASSEMBLY__
17318+#ifdef CONFIG_X86_32
17319+#define arch_mmap_check i386_mmap_check
17320+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17321+#endif
17322+#endif
17323+#endif
17324+
17325+#endif /* X86_MMAN_H */
17326diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17327index 09b9620..923aecd 100644
17328--- a/arch/x86/include/asm/mmu.h
17329+++ b/arch/x86/include/asm/mmu.h
17330@@ -9,7 +9,7 @@
17331 * we put the segment information here.
17332 */
17333 typedef struct {
17334- void *ldt;
17335+ struct desc_struct *ldt;
17336 int size;
17337
17338 #ifdef CONFIG_X86_64
17339@@ -18,7 +18,19 @@ typedef struct {
17340 #endif
17341
17342 struct mutex lock;
17343- void __user *vdso;
17344+ unsigned long vdso;
17345+
17346+#ifdef CONFIG_X86_32
17347+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17348+ unsigned long user_cs_base;
17349+ unsigned long user_cs_limit;
17350+
17351+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17352+ cpumask_t cpu_user_cs_mask;
17353+#endif
17354+
17355+#endif
17356+#endif
17357
17358 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17359 } mm_context_t;
17360diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17361index 883f6b93..6869d96 100644
17362--- a/arch/x86/include/asm/mmu_context.h
17363+++ b/arch/x86/include/asm/mmu_context.h
17364@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17365
17366 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17367 {
17368+
17369+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17370+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17371+ unsigned int i;
17372+ pgd_t *pgd;
17373+
17374+ pax_open_kernel();
17375+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17376+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17377+ set_pgd_batched(pgd+i, native_make_pgd(0));
17378+ pax_close_kernel();
17379+ }
17380+#endif
17381+
17382 #ifdef CONFIG_SMP
17383 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17384 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17385@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17386 struct task_struct *tsk)
17387 {
17388 unsigned cpu = smp_processor_id();
17389+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17390+ int tlbstate = TLBSTATE_OK;
17391+#endif
17392
17393 if (likely(prev != next)) {
17394 #ifdef CONFIG_SMP
17395+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17396+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17397+#endif
17398 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17399 this_cpu_write(cpu_tlbstate.active_mm, next);
17400 #endif
17401 cpumask_set_cpu(cpu, mm_cpumask(next));
17402
17403 /* Re-load page tables */
17404+#ifdef CONFIG_PAX_PER_CPU_PGD
17405+ pax_open_kernel();
17406+
17407+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17408+ if (static_cpu_has(X86_FEATURE_PCID))
17409+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17410+ else
17411+#endif
17412+
17413+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17414+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17415+ pax_close_kernel();
17416+ 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));
17417+
17418+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17419+ if (static_cpu_has(X86_FEATURE_PCID)) {
17420+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17421+ u64 descriptor[2];
17422+ descriptor[0] = PCID_USER;
17423+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17424+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17425+ descriptor[0] = PCID_KERNEL;
17426+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17427+ }
17428+ } else {
17429+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17430+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17431+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17432+ else
17433+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17434+ }
17435+ } else
17436+#endif
17437+
17438+ load_cr3(get_cpu_pgd(cpu, kernel));
17439+#else
17440 load_cr3(next->pgd);
17441+#endif
17442 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17443
17444 /* Stop flush ipis for the previous mm */
17445@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17446 */
17447 if (unlikely(prev->context.ldt != next->context.ldt))
17448 load_LDT_nolock(&next->context);
17449+
17450+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17451+ if (!(__supported_pte_mask & _PAGE_NX)) {
17452+ smp_mb__before_atomic();
17453+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17454+ smp_mb__after_atomic();
17455+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17456+ }
17457+#endif
17458+
17459+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17460+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17461+ prev->context.user_cs_limit != next->context.user_cs_limit))
17462+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17463+#ifdef CONFIG_SMP
17464+ else if (unlikely(tlbstate != TLBSTATE_OK))
17465+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17466+#endif
17467+#endif
17468+
17469 }
17470+ else {
17471+
17472+#ifdef CONFIG_PAX_PER_CPU_PGD
17473+ pax_open_kernel();
17474+
17475+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17476+ if (static_cpu_has(X86_FEATURE_PCID))
17477+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17478+ else
17479+#endif
17480+
17481+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17482+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17483+ pax_close_kernel();
17484+ 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));
17485+
17486+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17487+ if (static_cpu_has(X86_FEATURE_PCID)) {
17488+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17489+ u64 descriptor[2];
17490+ descriptor[0] = PCID_USER;
17491+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17492+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17493+ descriptor[0] = PCID_KERNEL;
17494+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17495+ }
17496+ } else {
17497+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17498+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17499+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17500+ else
17501+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17502+ }
17503+ } else
17504+#endif
17505+
17506+ load_cr3(get_cpu_pgd(cpu, kernel));
17507+#endif
17508+
17509 #ifdef CONFIG_SMP
17510- else {
17511 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17512 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17513
17514@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17515 * tlb flush IPI delivery. We must reload CR3
17516 * to make sure to use no freed page tables.
17517 */
17518+
17519+#ifndef CONFIG_PAX_PER_CPU_PGD
17520 load_cr3(next->pgd);
17521 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17522+#endif
17523+
17524 load_mm_cr4(next);
17525 load_LDT_nolock(&next->context);
17526+
17527+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17528+ if (!(__supported_pte_mask & _PAGE_NX))
17529+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17530+#endif
17531+
17532+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17533+#ifdef CONFIG_PAX_PAGEEXEC
17534+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17535+#endif
17536+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17537+#endif
17538+
17539 }
17540+#endif
17541 }
17542-#endif
17543 }
17544
17545 #define activate_mm(prev, next) \
17546diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17547index e3b7819..b257c64 100644
17548--- a/arch/x86/include/asm/module.h
17549+++ b/arch/x86/include/asm/module.h
17550@@ -5,6 +5,7 @@
17551
17552 #ifdef CONFIG_X86_64
17553 /* X86_64 does not define MODULE_PROC_FAMILY */
17554+#define MODULE_PROC_FAMILY ""
17555 #elif defined CONFIG_M486
17556 #define MODULE_PROC_FAMILY "486 "
17557 #elif defined CONFIG_M586
17558@@ -57,8 +58,20 @@
17559 #error unknown processor family
17560 #endif
17561
17562-#ifdef CONFIG_X86_32
17563-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17564+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17565+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17566+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17567+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17568+#else
17569+#define MODULE_PAX_KERNEXEC ""
17570 #endif
17571
17572+#ifdef CONFIG_PAX_MEMORY_UDEREF
17573+#define MODULE_PAX_UDEREF "UDEREF "
17574+#else
17575+#define MODULE_PAX_UDEREF ""
17576+#endif
17577+
17578+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17579+
17580 #endif /* _ASM_X86_MODULE_H */
17581diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17582index 5f2fc44..106caa6 100644
17583--- a/arch/x86/include/asm/nmi.h
17584+++ b/arch/x86/include/asm/nmi.h
17585@@ -36,26 +36,35 @@ enum {
17586
17587 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17588
17589+struct nmiaction;
17590+
17591+struct nmiwork {
17592+ const struct nmiaction *action;
17593+ u64 max_duration;
17594+ struct irq_work irq_work;
17595+};
17596+
17597 struct nmiaction {
17598 struct list_head list;
17599 nmi_handler_t handler;
17600- u64 max_duration;
17601- struct irq_work irq_work;
17602 unsigned long flags;
17603 const char *name;
17604-};
17605+ struct nmiwork *work;
17606+} __do_const;
17607
17608 #define register_nmi_handler(t, fn, fg, n, init...) \
17609 ({ \
17610- static struct nmiaction init fn##_na = { \
17611+ static struct nmiwork fn##_nw; \
17612+ static const struct nmiaction init fn##_na = { \
17613 .handler = (fn), \
17614 .name = (n), \
17615 .flags = (fg), \
17616+ .work = &fn##_nw, \
17617 }; \
17618 __register_nmi_handler((t), &fn##_na); \
17619 })
17620
17621-int __register_nmi_handler(unsigned int, struct nmiaction *);
17622+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17623
17624 void unregister_nmi_handler(unsigned int, const char *);
17625
17626diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17627index 802dde3..9183e68 100644
17628--- a/arch/x86/include/asm/page.h
17629+++ b/arch/x86/include/asm/page.h
17630@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17631 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17632
17633 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17634+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17635
17636 #define __boot_va(x) __va(x)
17637 #define __boot_pa(x) __pa(x)
17638@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17639 * virt_to_page(kaddr) returns a valid pointer if and only if
17640 * virt_addr_valid(kaddr) returns true.
17641 */
17642-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17643 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17644 extern bool __virt_addr_valid(unsigned long kaddr);
17645 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17646
17647+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17648+#define virt_to_page(kaddr) \
17649+ ({ \
17650+ const void *__kaddr = (const void *)(kaddr); \
17651+ BUG_ON(!virt_addr_valid(__kaddr)); \
17652+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17653+ })
17654+#else
17655+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17656+#endif
17657+
17658 #endif /* __ASSEMBLY__ */
17659
17660 #include <asm-generic/memory_model.h>
17661diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17662index b3bebf9..13ac22e 100644
17663--- a/arch/x86/include/asm/page_64.h
17664+++ b/arch/x86/include/asm/page_64.h
17665@@ -7,9 +7,9 @@
17666
17667 /* duplicated to the one in bootmem.h */
17668 extern unsigned long max_pfn;
17669-extern unsigned long phys_base;
17670+extern const unsigned long phys_base;
17671
17672-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17673+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17674 {
17675 unsigned long y = x - __START_KERNEL_map;
17676
17677@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17678 }
17679
17680 #ifdef CONFIG_DEBUG_VIRTUAL
17681-extern unsigned long __phys_addr(unsigned long);
17682-extern unsigned long __phys_addr_symbol(unsigned long);
17683+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17684+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17685 #else
17686 #define __phys_addr(x) __phys_addr_nodebug(x)
17687 #define __phys_addr_symbol(x) \
17688diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17689index 965c47d..ffe0af8 100644
17690--- a/arch/x86/include/asm/paravirt.h
17691+++ b/arch/x86/include/asm/paravirt.h
17692@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17693 return (pmd_t) { ret };
17694 }
17695
17696-static inline pmdval_t pmd_val(pmd_t pmd)
17697+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17698 {
17699 pmdval_t ret;
17700
17701@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17702 val);
17703 }
17704
17705+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17706+{
17707+ pgdval_t val = native_pgd_val(pgd);
17708+
17709+ if (sizeof(pgdval_t) > sizeof(long))
17710+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17711+ val, (u64)val >> 32);
17712+ else
17713+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17714+ val);
17715+}
17716+
17717 static inline void pgd_clear(pgd_t *pgdp)
17718 {
17719 set_pgd(pgdp, __pgd(0));
17720@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17721 pv_mmu_ops.set_fixmap(idx, phys, flags);
17722 }
17723
17724+#ifdef CONFIG_PAX_KERNEXEC
17725+static inline unsigned long pax_open_kernel(void)
17726+{
17727+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17728+}
17729+
17730+static inline unsigned long pax_close_kernel(void)
17731+{
17732+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17733+}
17734+#else
17735+static inline unsigned long pax_open_kernel(void) { return 0; }
17736+static inline unsigned long pax_close_kernel(void) { return 0; }
17737+#endif
17738+
17739 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17740
17741 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17742@@ -906,7 +933,7 @@ extern void default_banner(void);
17743
17744 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17745 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17746-#define PARA_INDIRECT(addr) *%cs:addr
17747+#define PARA_INDIRECT(addr) *%ss:addr
17748 #endif
17749
17750 #define INTERRUPT_RETURN \
17751@@ -981,6 +1008,21 @@ extern void default_banner(void);
17752 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17753 CLBR_NONE, \
17754 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17755+
17756+#define GET_CR0_INTO_RDI \
17757+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17758+ mov %rax,%rdi
17759+
17760+#define SET_RDI_INTO_CR0 \
17761+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17762+
17763+#define GET_CR3_INTO_RDI \
17764+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17765+ mov %rax,%rdi
17766+
17767+#define SET_RDI_INTO_CR3 \
17768+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17769+
17770 #endif /* CONFIG_X86_32 */
17771
17772 #endif /* __ASSEMBLY__ */
17773diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17774index 7549b8b..f0edfda 100644
17775--- a/arch/x86/include/asm/paravirt_types.h
17776+++ b/arch/x86/include/asm/paravirt_types.h
17777@@ -84,7 +84,7 @@ struct pv_init_ops {
17778 */
17779 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17780 unsigned long addr, unsigned len);
17781-};
17782+} __no_const __no_randomize_layout;
17783
17784
17785 struct pv_lazy_ops {
17786@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17787 void (*enter)(void);
17788 void (*leave)(void);
17789 void (*flush)(void);
17790-};
17791+} __no_randomize_layout;
17792
17793 struct pv_time_ops {
17794 unsigned long long (*sched_clock)(void);
17795 unsigned long long (*steal_clock)(int cpu);
17796 unsigned long (*get_tsc_khz)(void);
17797-};
17798+} __no_const __no_randomize_layout;
17799
17800 struct pv_cpu_ops {
17801 /* hooks for various privileged instructions */
17802@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17803
17804 void (*start_context_switch)(struct task_struct *prev);
17805 void (*end_context_switch)(struct task_struct *next);
17806-};
17807+} __no_const __no_randomize_layout;
17808
17809 struct pv_irq_ops {
17810 /*
17811@@ -215,7 +215,7 @@ struct pv_irq_ops {
17812 #ifdef CONFIG_X86_64
17813 void (*adjust_exception_frame)(void);
17814 #endif
17815-};
17816+} __no_randomize_layout;
17817
17818 struct pv_apic_ops {
17819 #ifdef CONFIG_X86_LOCAL_APIC
17820@@ -223,7 +223,7 @@ struct pv_apic_ops {
17821 unsigned long start_eip,
17822 unsigned long start_esp);
17823 #endif
17824-};
17825+} __no_const __no_randomize_layout;
17826
17827 struct pv_mmu_ops {
17828 unsigned long (*read_cr2)(void);
17829@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17830 struct paravirt_callee_save make_pud;
17831
17832 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17833+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17834 #endif /* PAGETABLE_LEVELS == 4 */
17835 #endif /* PAGETABLE_LEVELS >= 3 */
17836
17837@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17838 an mfn. We can tell which is which from the index. */
17839 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17840 phys_addr_t phys, pgprot_t flags);
17841-};
17842+
17843+#ifdef CONFIG_PAX_KERNEXEC
17844+ unsigned long (*pax_open_kernel)(void);
17845+ unsigned long (*pax_close_kernel)(void);
17846+#endif
17847+
17848+} __no_randomize_layout;
17849
17850 struct arch_spinlock;
17851 #ifdef CONFIG_SMP
17852@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17853 struct pv_lock_ops {
17854 struct paravirt_callee_save lock_spinning;
17855 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17856-};
17857+} __no_randomize_layout;
17858
17859 /* This contains all the paravirt structures: we get a convenient
17860 * number for each function using the offset which we use to indicate
17861- * what to patch. */
17862+ * what to patch.
17863+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17864+ */
17865+
17866 struct paravirt_patch_template {
17867 struct pv_init_ops pv_init_ops;
17868 struct pv_time_ops pv_time_ops;
17869@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17870 struct pv_apic_ops pv_apic_ops;
17871 struct pv_mmu_ops pv_mmu_ops;
17872 struct pv_lock_ops pv_lock_ops;
17873-};
17874+} __no_randomize_layout;
17875
17876 extern struct pv_info pv_info;
17877 extern struct pv_init_ops pv_init_ops;
17878diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17879index c4412e9..90e88c5 100644
17880--- a/arch/x86/include/asm/pgalloc.h
17881+++ b/arch/x86/include/asm/pgalloc.h
17882@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17883 pmd_t *pmd, pte_t *pte)
17884 {
17885 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17886+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17887+}
17888+
17889+static inline void pmd_populate_user(struct mm_struct *mm,
17890+ pmd_t *pmd, pte_t *pte)
17891+{
17892+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17893 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17894 }
17895
17896@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17897
17898 #ifdef CONFIG_X86_PAE
17899 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17900+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17901+{
17902+ pud_populate(mm, pudp, pmd);
17903+}
17904 #else /* !CONFIG_X86_PAE */
17905 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17906 {
17907 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17908 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17909 }
17910+
17911+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17912+{
17913+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17914+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17915+}
17916 #endif /* CONFIG_X86_PAE */
17917
17918 #if PAGETABLE_LEVELS > 3
17919@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17920 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17921 }
17922
17923+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17924+{
17925+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17926+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17927+}
17928+
17929 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17930 {
17931 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17932diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17933index fd74a11..35fd5af 100644
17934--- a/arch/x86/include/asm/pgtable-2level.h
17935+++ b/arch/x86/include/asm/pgtable-2level.h
17936@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17937
17938 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17939 {
17940+ pax_open_kernel();
17941 *pmdp = pmd;
17942+ pax_close_kernel();
17943 }
17944
17945 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17946diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17947index cdaa58c..e61122b 100644
17948--- a/arch/x86/include/asm/pgtable-3level.h
17949+++ b/arch/x86/include/asm/pgtable-3level.h
17950@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17951
17952 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17953 {
17954+ pax_open_kernel();
17955 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17956+ pax_close_kernel();
17957 }
17958
17959 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17960 {
17961+ pax_open_kernel();
17962 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17963+ pax_close_kernel();
17964 }
17965
17966 /*
17967diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17968index a0c35bf..7045c6a 100644
17969--- a/arch/x86/include/asm/pgtable.h
17970+++ b/arch/x86/include/asm/pgtable.h
17971@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17972
17973 #ifndef __PAGETABLE_PUD_FOLDED
17974 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17975+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17976 #define pgd_clear(pgd) native_pgd_clear(pgd)
17977 #endif
17978
17979@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17980
17981 #define arch_end_context_switch(prev) do {} while(0)
17982
17983+#define pax_open_kernel() native_pax_open_kernel()
17984+#define pax_close_kernel() native_pax_close_kernel()
17985 #endif /* CONFIG_PARAVIRT */
17986
17987+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17988+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17989+
17990+#ifdef CONFIG_PAX_KERNEXEC
17991+static inline unsigned long native_pax_open_kernel(void)
17992+{
17993+ unsigned long cr0;
17994+
17995+ preempt_disable();
17996+ barrier();
17997+ cr0 = read_cr0() ^ X86_CR0_WP;
17998+ BUG_ON(cr0 & X86_CR0_WP);
17999+ write_cr0(cr0);
18000+ barrier();
18001+ return cr0 ^ X86_CR0_WP;
18002+}
18003+
18004+static inline unsigned long native_pax_close_kernel(void)
18005+{
18006+ unsigned long cr0;
18007+
18008+ barrier();
18009+ cr0 = read_cr0() ^ X86_CR0_WP;
18010+ BUG_ON(!(cr0 & X86_CR0_WP));
18011+ write_cr0(cr0);
18012+ barrier();
18013+ preempt_enable_no_resched();
18014+ return cr0 ^ X86_CR0_WP;
18015+}
18016+#else
18017+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18018+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18019+#endif
18020+
18021 /*
18022 * The following only work if pte_present() is true.
18023 * Undefined behaviour if not..
18024 */
18025+static inline int pte_user(pte_t pte)
18026+{
18027+ return pte_val(pte) & _PAGE_USER;
18028+}
18029+
18030 static inline int pte_dirty(pte_t pte)
18031 {
18032 return pte_flags(pte) & _PAGE_DIRTY;
18033@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18034 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18035 }
18036
18037+static inline unsigned long pgd_pfn(pgd_t pgd)
18038+{
18039+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18040+}
18041+
18042 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18043
18044 static inline int pmd_large(pmd_t pte)
18045@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18046 return pte_clear_flags(pte, _PAGE_RW);
18047 }
18048
18049+static inline pte_t pte_mkread(pte_t pte)
18050+{
18051+ return __pte(pte_val(pte) | _PAGE_USER);
18052+}
18053+
18054 static inline pte_t pte_mkexec(pte_t pte)
18055 {
18056- return pte_clear_flags(pte, _PAGE_NX);
18057+#ifdef CONFIG_X86_PAE
18058+ if (__supported_pte_mask & _PAGE_NX)
18059+ return pte_clear_flags(pte, _PAGE_NX);
18060+ else
18061+#endif
18062+ return pte_set_flags(pte, _PAGE_USER);
18063+}
18064+
18065+static inline pte_t pte_exprotect(pte_t pte)
18066+{
18067+#ifdef CONFIG_X86_PAE
18068+ if (__supported_pte_mask & _PAGE_NX)
18069+ return pte_set_flags(pte, _PAGE_NX);
18070+ else
18071+#endif
18072+ return pte_clear_flags(pte, _PAGE_USER);
18073 }
18074
18075 static inline pte_t pte_mkdirty(pte_t pte)
18076@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18077 #endif
18078
18079 #ifndef __ASSEMBLY__
18080+
18081+#ifdef CONFIG_PAX_PER_CPU_PGD
18082+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18083+enum cpu_pgd_type {kernel = 0, user = 1};
18084+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18085+{
18086+ return cpu_pgd[cpu][type];
18087+}
18088+#endif
18089+
18090 #include <linux/mm_types.h>
18091 #include <linux/mmdebug.h>
18092 #include <linux/log2.h>
18093@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18094 * Currently stuck as a macro due to indirect forward reference to
18095 * linux/mmzone.h's __section_mem_map_addr() definition:
18096 */
18097-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18098+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18099
18100 /* Find an entry in the second-level page table.. */
18101 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18102@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18103 * Currently stuck as a macro due to indirect forward reference to
18104 * linux/mmzone.h's __section_mem_map_addr() definition:
18105 */
18106-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18107+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18108
18109 /* to find an entry in a page-table-directory. */
18110 static inline unsigned long pud_index(unsigned long address)
18111@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18112
18113 static inline int pgd_bad(pgd_t pgd)
18114 {
18115- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18116+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18117 }
18118
18119 static inline int pgd_none(pgd_t pgd)
18120@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18121 * pgd_offset() returns a (pgd_t *)
18122 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18123 */
18124-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18125+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18126+
18127+#ifdef CONFIG_PAX_PER_CPU_PGD
18128+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18129+#endif
18130+
18131 /*
18132 * a shortcut which implies the use of the kernel's pgd, instead
18133 * of a process's
18134@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18135 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18136 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18137
18138+#ifdef CONFIG_X86_32
18139+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18140+#else
18141+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18142+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18143+
18144+#ifdef CONFIG_PAX_MEMORY_UDEREF
18145+#ifdef __ASSEMBLY__
18146+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18147+#else
18148+extern unsigned long pax_user_shadow_base;
18149+extern pgdval_t clone_pgd_mask;
18150+#endif
18151+#else
18152+#define pax_user_shadow_base (0UL)
18153+#endif
18154+
18155+#endif
18156+
18157 #ifndef __ASSEMBLY__
18158
18159 extern int direct_gbpages;
18160@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18161 * dst and src can be on the same page, but the range must not overlap,
18162 * and must not cross a page boundary.
18163 */
18164-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18165+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18166 {
18167- memcpy(dst, src, count * sizeof(pgd_t));
18168+ pax_open_kernel();
18169+ while (count--)
18170+ *dst++ = *src++;
18171+ pax_close_kernel();
18172 }
18173
18174+#ifdef CONFIG_PAX_PER_CPU_PGD
18175+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18176+#endif
18177+
18178+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18179+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18180+#else
18181+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18182+#endif
18183+
18184 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18185 static inline int page_level_shift(enum pg_level level)
18186 {
18187diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18188index b6c0b40..3535d47 100644
18189--- a/arch/x86/include/asm/pgtable_32.h
18190+++ b/arch/x86/include/asm/pgtable_32.h
18191@@ -25,9 +25,6 @@
18192 struct mm_struct;
18193 struct vm_area_struct;
18194
18195-extern pgd_t swapper_pg_dir[1024];
18196-extern pgd_t initial_page_table[1024];
18197-
18198 static inline void pgtable_cache_init(void) { }
18199 static inline void check_pgt_cache(void) { }
18200 void paging_init(void);
18201@@ -45,6 +42,12 @@ void paging_init(void);
18202 # include <asm/pgtable-2level.h>
18203 #endif
18204
18205+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18206+extern pgd_t initial_page_table[PTRS_PER_PGD];
18207+#ifdef CONFIG_X86_PAE
18208+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18209+#endif
18210+
18211 #if defined(CONFIG_HIGHPTE)
18212 #define pte_offset_map(dir, address) \
18213 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18214@@ -59,12 +62,17 @@ void paging_init(void);
18215 /* Clear a kernel PTE and flush it from the TLB */
18216 #define kpte_clear_flush(ptep, vaddr) \
18217 do { \
18218+ pax_open_kernel(); \
18219 pte_clear(&init_mm, (vaddr), (ptep)); \
18220+ pax_close_kernel(); \
18221 __flush_tlb_one((vaddr)); \
18222 } while (0)
18223
18224 #endif /* !__ASSEMBLY__ */
18225
18226+#define HAVE_ARCH_UNMAPPED_AREA
18227+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18228+
18229 /*
18230 * kern_addr_valid() is (1) for FLATMEM and (0) for
18231 * SPARSEMEM and DISCONTIGMEM
18232diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18233index 9fb2f2b..b04b4bf 100644
18234--- a/arch/x86/include/asm/pgtable_32_types.h
18235+++ b/arch/x86/include/asm/pgtable_32_types.h
18236@@ -8,7 +8,7 @@
18237 */
18238 #ifdef CONFIG_X86_PAE
18239 # include <asm/pgtable-3level_types.h>
18240-# define PMD_SIZE (1UL << PMD_SHIFT)
18241+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18242 # define PMD_MASK (~(PMD_SIZE - 1))
18243 #else
18244 # include <asm/pgtable-2level_types.h>
18245@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18246 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18247 #endif
18248
18249+#ifdef CONFIG_PAX_KERNEXEC
18250+#ifndef __ASSEMBLY__
18251+extern unsigned char MODULES_EXEC_VADDR[];
18252+extern unsigned char MODULES_EXEC_END[];
18253+#endif
18254+#include <asm/boot.h>
18255+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18256+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18257+#else
18258+#define ktla_ktva(addr) (addr)
18259+#define ktva_ktla(addr) (addr)
18260+#endif
18261+
18262 #define MODULES_VADDR VMALLOC_START
18263 #define MODULES_END VMALLOC_END
18264 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18265diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18266index 2ee7811..55aca24 100644
18267--- a/arch/x86/include/asm/pgtable_64.h
18268+++ b/arch/x86/include/asm/pgtable_64.h
18269@@ -16,11 +16,16 @@
18270
18271 extern pud_t level3_kernel_pgt[512];
18272 extern pud_t level3_ident_pgt[512];
18273+extern pud_t level3_vmalloc_start_pgt[512];
18274+extern pud_t level3_vmalloc_end_pgt[512];
18275+extern pud_t level3_vmemmap_pgt[512];
18276+extern pud_t level2_vmemmap_pgt[512];
18277 extern pmd_t level2_kernel_pgt[512];
18278 extern pmd_t level2_fixmap_pgt[512];
18279-extern pmd_t level2_ident_pgt[512];
18280-extern pte_t level1_fixmap_pgt[512];
18281-extern pgd_t init_level4_pgt[];
18282+extern pmd_t level2_ident_pgt[2][512];
18283+extern pte_t level1_fixmap_pgt[3][512];
18284+extern pte_t level1_vsyscall_pgt[512];
18285+extern pgd_t init_level4_pgt[512];
18286
18287 #define swapper_pg_dir init_level4_pgt
18288
18289@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18290
18291 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18292 {
18293+ pax_open_kernel();
18294 *pmdp = pmd;
18295+ pax_close_kernel();
18296 }
18297
18298 static inline void native_pmd_clear(pmd_t *pmd)
18299@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18300
18301 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18302 {
18303+ pax_open_kernel();
18304 *pudp = pud;
18305+ pax_close_kernel();
18306 }
18307
18308 static inline void native_pud_clear(pud_t *pud)
18309@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18310
18311 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18312 {
18313+ pax_open_kernel();
18314+ *pgdp = pgd;
18315+ pax_close_kernel();
18316+}
18317+
18318+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18319+{
18320 *pgdp = pgd;
18321 }
18322
18323diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18324index 602b602..acb53ed 100644
18325--- a/arch/x86/include/asm/pgtable_64_types.h
18326+++ b/arch/x86/include/asm/pgtable_64_types.h
18327@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18328 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18329 #define MODULES_END _AC(0xffffffffff000000, UL)
18330 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18331+#define MODULES_EXEC_VADDR MODULES_VADDR
18332+#define MODULES_EXEC_END MODULES_END
18333 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18334 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18335 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18336 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18337
18338+#define ktla_ktva(addr) (addr)
18339+#define ktva_ktla(addr) (addr)
18340+
18341 #define EARLY_DYNAMIC_PAGE_TABLES 64
18342
18343 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18344diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18345index 8c7c108..1c1b77f 100644
18346--- a/arch/x86/include/asm/pgtable_types.h
18347+++ b/arch/x86/include/asm/pgtable_types.h
18348@@ -85,8 +85,10 @@
18349
18350 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18351 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18352-#else
18353+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18354 #define _PAGE_NX (_AT(pteval_t, 0))
18355+#else
18356+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18357 #endif
18358
18359 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18360@@ -141,6 +143,9 @@ enum page_cache_mode {
18361 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18362 _PAGE_ACCESSED)
18363
18364+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18365+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18366+
18367 #define __PAGE_KERNEL_EXEC \
18368 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18369 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18370@@ -148,7 +153,7 @@ enum page_cache_mode {
18371 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18372 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18373 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18374-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18375+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18376 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18377 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18378 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18379@@ -194,7 +199,7 @@ enum page_cache_mode {
18380 #ifdef CONFIG_X86_64
18381 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18382 #else
18383-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18384+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18385 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18386 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18387 #endif
18388@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18389 {
18390 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18391 }
18392+#endif
18393
18394+#if PAGETABLE_LEVELS == 3
18395+#include <asm-generic/pgtable-nopud.h>
18396+#endif
18397+
18398+#if PAGETABLE_LEVELS == 2
18399+#include <asm-generic/pgtable-nopmd.h>
18400+#endif
18401+
18402+#ifndef __ASSEMBLY__
18403 #if PAGETABLE_LEVELS > 3
18404 typedef struct { pudval_t pud; } pud_t;
18405
18406@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18407 return pud.pud;
18408 }
18409 #else
18410-#include <asm-generic/pgtable-nopud.h>
18411-
18412 static inline pudval_t native_pud_val(pud_t pud)
18413 {
18414 return native_pgd_val(pud.pgd);
18415@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18416 return pmd.pmd;
18417 }
18418 #else
18419-#include <asm-generic/pgtable-nopmd.h>
18420-
18421 static inline pmdval_t native_pmd_val(pmd_t pmd)
18422 {
18423 return native_pgd_val(pmd.pud.pgd);
18424@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18425
18426 extern pteval_t __supported_pte_mask;
18427 extern void set_nx(void);
18428-extern int nx_enabled;
18429
18430 #define pgprot_writecombine pgprot_writecombine
18431 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18432diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18433index 8f327184..368fb29 100644
18434--- a/arch/x86/include/asm/preempt.h
18435+++ b/arch/x86/include/asm/preempt.h
18436@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18437 */
18438 static __always_inline bool __preempt_count_dec_and_test(void)
18439 {
18440- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18441+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18442 }
18443
18444 /*
18445diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18446index ec1c935..5cc6023 100644
18447--- a/arch/x86/include/asm/processor.h
18448+++ b/arch/x86/include/asm/processor.h
18449@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18450 /* Index into per_cpu list: */
18451 u16 cpu_index;
18452 u32 microcode;
18453-};
18454+} __randomize_layout;
18455
18456 #define X86_VENDOR_INTEL 0
18457 #define X86_VENDOR_CYRIX 1
18458@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18459 : "memory");
18460 }
18461
18462+/* invpcid (%rdx),%rax */
18463+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18464+
18465+#define INVPCID_SINGLE_ADDRESS 0UL
18466+#define INVPCID_SINGLE_CONTEXT 1UL
18467+#define INVPCID_ALL_GLOBAL 2UL
18468+#define INVPCID_ALL_NONGLOBAL 3UL
18469+
18470+#define PCID_KERNEL 0UL
18471+#define PCID_USER 1UL
18472+#define PCID_NOFLUSH (1UL << 63)
18473+
18474 static inline void load_cr3(pgd_t *pgdir)
18475 {
18476- write_cr3(__pa(pgdir));
18477+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18478 }
18479
18480 #ifdef CONFIG_X86_32
18481@@ -282,7 +294,7 @@ struct tss_struct {
18482
18483 } ____cacheline_aligned;
18484
18485-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18486+extern struct tss_struct init_tss[NR_CPUS];
18487
18488 /*
18489 * Save the original ist values for checking stack pointers during debugging
18490@@ -479,6 +491,7 @@ struct thread_struct {
18491 unsigned short ds;
18492 unsigned short fsindex;
18493 unsigned short gsindex;
18494+ unsigned short ss;
18495 #endif
18496 #ifdef CONFIG_X86_32
18497 unsigned long ip;
18498@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
18499 */
18500 #define TASK_SIZE PAGE_OFFSET
18501 #define TASK_SIZE_MAX TASK_SIZE
18502+
18503+#ifdef CONFIG_PAX_SEGMEXEC
18504+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18505+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18506+#else
18507 #define STACK_TOP TASK_SIZE
18508-#define STACK_TOP_MAX STACK_TOP
18509+#endif
18510+
18511+#define STACK_TOP_MAX TASK_SIZE
18512
18513 #define INIT_THREAD { \
18514- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18515+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18516 .vm86_info = NULL, \
18517 .sysenter_cs = __KERNEL_CS, \
18518 .io_bitmap_ptr = NULL, \
18519@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
18520 */
18521 #define INIT_TSS { \
18522 .x86_tss = { \
18523- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18524+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18525 .ss0 = __KERNEL_DS, \
18526 .ss1 = __KERNEL_CS, \
18527 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18528@@ -834,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18529 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18530
18531 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18532-#define KSTK_TOP(info) \
18533-({ \
18534- unsigned long *__ptr = (unsigned long *)(info); \
18535- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18536-})
18537+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18538
18539 /*
18540 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18541@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18542 #define task_pt_regs(task) \
18543 ({ \
18544 struct pt_regs *__regs__; \
18545- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18546+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18547 __regs__ - 1; \
18548 })
18549
18550@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18551 * particular problem by preventing anything from being mapped
18552 * at the maximum canonical address.
18553 */
18554-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18555+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18556
18557 /* This decides where the kernel will search for a free chunk of vm
18558 * space during mmap's.
18559 */
18560 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18561- 0xc0000000 : 0xFFFFe000)
18562+ 0xc0000000 : 0xFFFFf000)
18563
18564 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18565 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18566@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18567 #define STACK_TOP_MAX TASK_SIZE_MAX
18568
18569 #define INIT_THREAD { \
18570- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18571+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18572 }
18573
18574 #define INIT_TSS { \
18575- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18576+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18577 }
18578
18579 /*
18580@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18581 */
18582 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18583
18584+#ifdef CONFIG_PAX_SEGMEXEC
18585+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18586+#endif
18587+
18588 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18589
18590 /* Get/set a process' ability to use the timestamp counter instruction */
18591@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18592 return 0;
18593 }
18594
18595-extern unsigned long arch_align_stack(unsigned long sp);
18596+#define arch_align_stack(x) ((x) & ~0xfUL)
18597 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18598
18599 void default_idle(void);
18600@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
18601 #define xen_set_default_idle 0
18602 #endif
18603
18604-void stop_this_cpu(void *dummy);
18605+void stop_this_cpu(void *dummy) __noreturn;
18606 void df_debug(struct pt_regs *regs, long error_code);
18607 #endif /* _ASM_X86_PROCESSOR_H */
18608diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18609index 86fc2bb..bd5049a 100644
18610--- a/arch/x86/include/asm/ptrace.h
18611+++ b/arch/x86/include/asm/ptrace.h
18612@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18613 }
18614
18615 /*
18616- * user_mode_vm(regs) determines whether a register set came from user mode.
18617+ * user_mode(regs) determines whether a register set came from user mode.
18618 * This is true if V8086 mode was enabled OR if the register set was from
18619 * protected mode with RPL-3 CS value. This tricky test checks that with
18620 * one comparison. Many places in the kernel can bypass this full check
18621- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18622+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18623+ * be used.
18624 */
18625-static inline int user_mode(struct pt_regs *regs)
18626+static inline int user_mode_novm(struct pt_regs *regs)
18627 {
18628 #ifdef CONFIG_X86_32
18629 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18630 #else
18631- return !!(regs->cs & 3);
18632+ return !!(regs->cs & SEGMENT_RPL_MASK);
18633 #endif
18634 }
18635
18636-static inline int user_mode_vm(struct pt_regs *regs)
18637+static inline int user_mode(struct pt_regs *regs)
18638 {
18639 #ifdef CONFIG_X86_32
18640 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18641 USER_RPL;
18642 #else
18643- return user_mode(regs);
18644+ return user_mode_novm(regs);
18645 #endif
18646 }
18647
18648@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18649 #ifdef CONFIG_X86_64
18650 static inline bool user_64bit_mode(struct pt_regs *regs)
18651 {
18652+ unsigned long cs = regs->cs & 0xffff;
18653 #ifndef CONFIG_PARAVIRT
18654 /*
18655 * On non-paravirt systems, this is the only long mode CPL 3
18656 * selector. We do not allow long mode selectors in the LDT.
18657 */
18658- return regs->cs == __USER_CS;
18659+ return cs == __USER_CS;
18660 #else
18661 /* Headers are too twisted for this to go in paravirt.h. */
18662- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18663+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18664 #endif
18665 }
18666
18667@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18668 * Traps from the kernel do not save sp and ss.
18669 * Use the helper function to retrieve sp.
18670 */
18671- if (offset == offsetof(struct pt_regs, sp) &&
18672- regs->cs == __KERNEL_CS)
18673- return kernel_stack_pointer(regs);
18674+ if (offset == offsetof(struct pt_regs, sp)) {
18675+ unsigned long cs = regs->cs & 0xffff;
18676+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18677+ return kernel_stack_pointer(regs);
18678+ }
18679 #endif
18680 return *(unsigned long *)((unsigned long)regs + offset);
18681 }
18682diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18683index ae0e241..e80b10b 100644
18684--- a/arch/x86/include/asm/qrwlock.h
18685+++ b/arch/x86/include/asm/qrwlock.h
18686@@ -7,8 +7,8 @@
18687 #define queue_write_unlock queue_write_unlock
18688 static inline void queue_write_unlock(struct qrwlock *lock)
18689 {
18690- barrier();
18691- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18692+ barrier();
18693+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18694 }
18695 #endif
18696
18697diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18698index 9c6b890..5305f53 100644
18699--- a/arch/x86/include/asm/realmode.h
18700+++ b/arch/x86/include/asm/realmode.h
18701@@ -22,16 +22,14 @@ struct real_mode_header {
18702 #endif
18703 /* APM/BIOS reboot */
18704 u32 machine_real_restart_asm;
18705-#ifdef CONFIG_X86_64
18706 u32 machine_real_restart_seg;
18707-#endif
18708 };
18709
18710 /* This must match data at trampoline_32/64.S */
18711 struct trampoline_header {
18712 #ifdef CONFIG_X86_32
18713 u32 start;
18714- u16 gdt_pad;
18715+ u16 boot_cs;
18716 u16 gdt_limit;
18717 u32 gdt_base;
18718 #else
18719diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18720index a82c4f1..ac45053 100644
18721--- a/arch/x86/include/asm/reboot.h
18722+++ b/arch/x86/include/asm/reboot.h
18723@@ -6,13 +6,13 @@
18724 struct pt_regs;
18725
18726 struct machine_ops {
18727- void (*restart)(char *cmd);
18728- void (*halt)(void);
18729- void (*power_off)(void);
18730+ void (* __noreturn restart)(char *cmd);
18731+ void (* __noreturn halt)(void);
18732+ void (* __noreturn power_off)(void);
18733 void (*shutdown)(void);
18734 void (*crash_shutdown)(struct pt_regs *);
18735- void (*emergency_restart)(void);
18736-};
18737+ void (* __noreturn emergency_restart)(void);
18738+} __no_const;
18739
18740 extern struct machine_ops machine_ops;
18741
18742diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18743index 8f7866a..e442f20 100644
18744--- a/arch/x86/include/asm/rmwcc.h
18745+++ b/arch/x86/include/asm/rmwcc.h
18746@@ -3,7 +3,34 @@
18747
18748 #ifdef CC_HAVE_ASM_GOTO
18749
18750-#define __GEN_RMWcc(fullop, var, cc, ...) \
18751+#ifdef CONFIG_PAX_REFCOUNT
18752+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18753+do { \
18754+ asm_volatile_goto (fullop \
18755+ ";jno 0f\n" \
18756+ fullantiop \
18757+ ";int $4\n0:\n" \
18758+ _ASM_EXTABLE(0b, 0b) \
18759+ ";j" cc " %l[cc_label]" \
18760+ : : "m" (var), ## __VA_ARGS__ \
18761+ : "memory" : cc_label); \
18762+ return 0; \
18763+cc_label: \
18764+ return 1; \
18765+} while (0)
18766+#else
18767+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18768+do { \
18769+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18770+ : : "m" (var), ## __VA_ARGS__ \
18771+ : "memory" : cc_label); \
18772+ return 0; \
18773+cc_label: \
18774+ return 1; \
18775+} while (0)
18776+#endif
18777+
18778+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18779 do { \
18780 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18781 : : "m" (var), ## __VA_ARGS__ \
18782@@ -13,15 +40,46 @@ cc_label: \
18783 return 1; \
18784 } while (0)
18785
18786-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18787- __GEN_RMWcc(op " " arg0, var, cc)
18788+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18789+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18790
18791-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18792- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18793+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18794+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18795+
18796+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18797+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18798+
18799+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18800+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18801
18802 #else /* !CC_HAVE_ASM_GOTO */
18803
18804-#define __GEN_RMWcc(fullop, var, cc, ...) \
18805+#ifdef CONFIG_PAX_REFCOUNT
18806+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18807+do { \
18808+ char c; \
18809+ asm volatile (fullop \
18810+ ";jno 0f\n" \
18811+ fullantiop \
18812+ ";int $4\n0:\n" \
18813+ _ASM_EXTABLE(0b, 0b) \
18814+ "; set" cc " %1" \
18815+ : "+m" (var), "=qm" (c) \
18816+ : __VA_ARGS__ : "memory"); \
18817+ return c != 0; \
18818+} while (0)
18819+#else
18820+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18821+do { \
18822+ char c; \
18823+ asm volatile (fullop "; set" cc " %1" \
18824+ : "+m" (var), "=qm" (c) \
18825+ : __VA_ARGS__ : "memory"); \
18826+ return c != 0; \
18827+} while (0)
18828+#endif
18829+
18830+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18831 do { \
18832 char c; \
18833 asm volatile (fullop "; set" cc " %1" \
18834@@ -30,11 +88,17 @@ do { \
18835 return c != 0; \
18836 } while (0)
18837
18838-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18839- __GEN_RMWcc(op " " arg0, var, cc)
18840+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18841+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18842+
18843+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18844+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18845+
18846+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18847+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18848
18849-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18850- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18851+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18852+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18853
18854 #endif /* CC_HAVE_ASM_GOTO */
18855
18856diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18857index cad82c9..2e5c5c1 100644
18858--- a/arch/x86/include/asm/rwsem.h
18859+++ b/arch/x86/include/asm/rwsem.h
18860@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18861 {
18862 asm volatile("# beginning down_read\n\t"
18863 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18864+
18865+#ifdef CONFIG_PAX_REFCOUNT
18866+ "jno 0f\n"
18867+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18868+ "int $4\n0:\n"
18869+ _ASM_EXTABLE(0b, 0b)
18870+#endif
18871+
18872 /* adds 0x00000001 */
18873 " jns 1f\n"
18874 " call call_rwsem_down_read_failed\n"
18875@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18876 "1:\n\t"
18877 " mov %1,%2\n\t"
18878 " add %3,%2\n\t"
18879+
18880+#ifdef CONFIG_PAX_REFCOUNT
18881+ "jno 0f\n"
18882+ "sub %3,%2\n"
18883+ "int $4\n0:\n"
18884+ _ASM_EXTABLE(0b, 0b)
18885+#endif
18886+
18887 " jle 2f\n\t"
18888 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18889 " jnz 1b\n\t"
18890@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18891 long tmp;
18892 asm volatile("# beginning down_write\n\t"
18893 LOCK_PREFIX " xadd %1,(%2)\n\t"
18894+
18895+#ifdef CONFIG_PAX_REFCOUNT
18896+ "jno 0f\n"
18897+ "mov %1,(%2)\n"
18898+ "int $4\n0:\n"
18899+ _ASM_EXTABLE(0b, 0b)
18900+#endif
18901+
18902 /* adds 0xffff0001, returns the old value */
18903 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18904 /* was the active mask 0 before? */
18905@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18906 long tmp;
18907 asm volatile("# beginning __up_read\n\t"
18908 LOCK_PREFIX " xadd %1,(%2)\n\t"
18909+
18910+#ifdef CONFIG_PAX_REFCOUNT
18911+ "jno 0f\n"
18912+ "mov %1,(%2)\n"
18913+ "int $4\n0:\n"
18914+ _ASM_EXTABLE(0b, 0b)
18915+#endif
18916+
18917 /* subtracts 1, returns the old value */
18918 " jns 1f\n\t"
18919 " call call_rwsem_wake\n" /* expects old value in %edx */
18920@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18921 long tmp;
18922 asm volatile("# beginning __up_write\n\t"
18923 LOCK_PREFIX " xadd %1,(%2)\n\t"
18924+
18925+#ifdef CONFIG_PAX_REFCOUNT
18926+ "jno 0f\n"
18927+ "mov %1,(%2)\n"
18928+ "int $4\n0:\n"
18929+ _ASM_EXTABLE(0b, 0b)
18930+#endif
18931+
18932 /* subtracts 0xffff0001, returns the old value */
18933 " jns 1f\n\t"
18934 " call call_rwsem_wake\n" /* expects old value in %edx */
18935@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18936 {
18937 asm volatile("# beginning __downgrade_write\n\t"
18938 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18939+
18940+#ifdef CONFIG_PAX_REFCOUNT
18941+ "jno 0f\n"
18942+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18943+ "int $4\n0:\n"
18944+ _ASM_EXTABLE(0b, 0b)
18945+#endif
18946+
18947 /*
18948 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18949 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18950@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18951 */
18952 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18953 {
18954- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18955+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18956+
18957+#ifdef CONFIG_PAX_REFCOUNT
18958+ "jno 0f\n"
18959+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18960+ "int $4\n0:\n"
18961+ _ASM_EXTABLE(0b, 0b)
18962+#endif
18963+
18964 : "+m" (sem->count)
18965 : "er" (delta));
18966 }
18967@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18968 */
18969 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18970 {
18971- return delta + xadd(&sem->count, delta);
18972+ return delta + xadd_check_overflow(&sem->count, delta);
18973 }
18974
18975 #endif /* __KERNEL__ */
18976diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18977index db257a5..b91bc77 100644
18978--- a/arch/x86/include/asm/segment.h
18979+++ b/arch/x86/include/asm/segment.h
18980@@ -73,10 +73,15 @@
18981 * 26 - ESPFIX small SS
18982 * 27 - per-cpu [ offset to per-cpu data area ]
18983 * 28 - stack_canary-20 [ for stack protector ]
18984- * 29 - unused
18985- * 30 - unused
18986+ * 29 - PCI BIOS CS
18987+ * 30 - PCI BIOS DS
18988 * 31 - TSS for double fault handler
18989 */
18990+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18991+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18992+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18993+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18994+
18995 #define GDT_ENTRY_TLS_MIN 6
18996 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18997
18998@@ -88,6 +93,8 @@
18999
19000 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19001
19002+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19003+
19004 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19005
19006 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19007@@ -113,6 +120,12 @@
19008 #define __KERNEL_STACK_CANARY 0
19009 #endif
19010
19011+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19012+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19013+
19014+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19015+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19016+
19017 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19018
19019 /*
19020@@ -140,7 +153,7 @@
19021 */
19022
19023 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19024-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19025+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19026
19027
19028 #else
19029@@ -164,6 +177,8 @@
19030 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19031 #define __USER32_DS __USER_DS
19032
19033+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19034+
19035 #define GDT_ENTRY_TSS 8 /* needs two entries */
19036 #define GDT_ENTRY_LDT 10 /* needs two entries */
19037 #define GDT_ENTRY_TLS_MIN 12
19038@@ -172,6 +187,8 @@
19039 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19040 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19041
19042+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19043+
19044 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19045 #define FS_TLS 0
19046 #define GS_TLS 1
19047@@ -179,12 +196,14 @@
19048 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19049 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19050
19051-#define GDT_ENTRIES 16
19052+#define GDT_ENTRIES 17
19053
19054 #endif
19055
19056 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19057+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19058 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19059+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19060 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19061 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19062 #ifndef CONFIG_PARAVIRT
19063@@ -256,7 +275,7 @@ static inline unsigned long get_limit(unsigned long segment)
19064 {
19065 unsigned long __limit;
19066 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19067- return __limit + 1;
19068+ return __limit;
19069 }
19070
19071 #endif /* !__ASSEMBLY__ */
19072diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19073index 8d3120f..352b440 100644
19074--- a/arch/x86/include/asm/smap.h
19075+++ b/arch/x86/include/asm/smap.h
19076@@ -25,11 +25,40 @@
19077
19078 #include <asm/alternative-asm.h>
19079
19080+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19081+#define ASM_PAX_OPEN_USERLAND \
19082+ 661: jmp 663f; \
19083+ .pushsection .altinstr_replacement, "a" ; \
19084+ 662: pushq %rax; nop; \
19085+ .popsection ; \
19086+ .pushsection .altinstructions, "a" ; \
19087+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19088+ .popsection ; \
19089+ call __pax_open_userland; \
19090+ popq %rax; \
19091+ 663:
19092+
19093+#define ASM_PAX_CLOSE_USERLAND \
19094+ 661: jmp 663f; \
19095+ .pushsection .altinstr_replacement, "a" ; \
19096+ 662: pushq %rax; nop; \
19097+ .popsection; \
19098+ .pushsection .altinstructions, "a" ; \
19099+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19100+ .popsection; \
19101+ call __pax_close_userland; \
19102+ popq %rax; \
19103+ 663:
19104+#else
19105+#define ASM_PAX_OPEN_USERLAND
19106+#define ASM_PAX_CLOSE_USERLAND
19107+#endif
19108+
19109 #ifdef CONFIG_X86_SMAP
19110
19111 #define ASM_CLAC \
19112 661: ASM_NOP3 ; \
19113- .pushsection .altinstr_replacement, "ax" ; \
19114+ .pushsection .altinstr_replacement, "a" ; \
19115 662: __ASM_CLAC ; \
19116 .popsection ; \
19117 .pushsection .altinstructions, "a" ; \
19118@@ -38,7 +67,7 @@
19119
19120 #define ASM_STAC \
19121 661: ASM_NOP3 ; \
19122- .pushsection .altinstr_replacement, "ax" ; \
19123+ .pushsection .altinstr_replacement, "a" ; \
19124 662: __ASM_STAC ; \
19125 .popsection ; \
19126 .pushsection .altinstructions, "a" ; \
19127@@ -56,6 +85,37 @@
19128
19129 #include <asm/alternative.h>
19130
19131+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19132+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19133+
19134+extern void __pax_open_userland(void);
19135+static __always_inline unsigned long pax_open_userland(void)
19136+{
19137+
19138+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19139+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19140+ :
19141+ : [open] "i" (__pax_open_userland)
19142+ : "memory", "rax");
19143+#endif
19144+
19145+ return 0;
19146+}
19147+
19148+extern void __pax_close_userland(void);
19149+static __always_inline unsigned long pax_close_userland(void)
19150+{
19151+
19152+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19153+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19154+ :
19155+ : [close] "i" (__pax_close_userland)
19156+ : "memory", "rax");
19157+#endif
19158+
19159+ return 0;
19160+}
19161+
19162 #ifdef CONFIG_X86_SMAP
19163
19164 static __always_inline void clac(void)
19165diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19166index 8cd1cc3..827e09e 100644
19167--- a/arch/x86/include/asm/smp.h
19168+++ b/arch/x86/include/asm/smp.h
19169@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19170 /* cpus sharing the last level cache: */
19171 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19172 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19173-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19174+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19175
19176 static inline struct cpumask *cpu_sibling_mask(int cpu)
19177 {
19178@@ -78,7 +78,7 @@ struct smp_ops {
19179
19180 void (*send_call_func_ipi)(const struct cpumask *mask);
19181 void (*send_call_func_single_ipi)(int cpu);
19182-};
19183+} __no_const;
19184
19185 /* Globals due to paravirt */
19186 extern void set_cpu_sibling_map(int cpu);
19187@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19188 extern int safe_smp_processor_id(void);
19189
19190 #elif defined(CONFIG_X86_64_SMP)
19191-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19192-
19193-#define stack_smp_processor_id() \
19194-({ \
19195- struct thread_info *ti; \
19196- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19197- ti->cpu; \
19198-})
19199+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19200+#define stack_smp_processor_id() raw_smp_processor_id()
19201 #define safe_smp_processor_id() smp_processor_id()
19202
19203 #endif
19204diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19205index 6a99859..03cb807 100644
19206--- a/arch/x86/include/asm/stackprotector.h
19207+++ b/arch/x86/include/asm/stackprotector.h
19208@@ -47,7 +47,7 @@
19209 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19210 */
19211 #define GDT_STACK_CANARY_INIT \
19212- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19213+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19214
19215 /*
19216 * Initialize the stackprotector canary value.
19217@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19218
19219 static inline void load_stack_canary_segment(void)
19220 {
19221-#ifdef CONFIG_X86_32
19222+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19223 asm volatile ("mov %0, %%gs" : : "r" (0));
19224 #endif
19225 }
19226diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19227index 70bbe39..4ae2bd4 100644
19228--- a/arch/x86/include/asm/stacktrace.h
19229+++ b/arch/x86/include/asm/stacktrace.h
19230@@ -11,28 +11,20 @@
19231
19232 extern int kstack_depth_to_print;
19233
19234-struct thread_info;
19235+struct task_struct;
19236 struct stacktrace_ops;
19237
19238-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19239- unsigned long *stack,
19240- unsigned long bp,
19241- const struct stacktrace_ops *ops,
19242- void *data,
19243- unsigned long *end,
19244- int *graph);
19245+typedef unsigned long walk_stack_t(struct task_struct *task,
19246+ void *stack_start,
19247+ unsigned long *stack,
19248+ unsigned long bp,
19249+ const struct stacktrace_ops *ops,
19250+ void *data,
19251+ unsigned long *end,
19252+ int *graph);
19253
19254-extern unsigned long
19255-print_context_stack(struct thread_info *tinfo,
19256- unsigned long *stack, unsigned long bp,
19257- const struct stacktrace_ops *ops, void *data,
19258- unsigned long *end, int *graph);
19259-
19260-extern unsigned long
19261-print_context_stack_bp(struct thread_info *tinfo,
19262- unsigned long *stack, unsigned long bp,
19263- const struct stacktrace_ops *ops, void *data,
19264- unsigned long *end, int *graph);
19265+extern walk_stack_t print_context_stack;
19266+extern walk_stack_t print_context_stack_bp;
19267
19268 /* Generic stack tracer with callbacks */
19269
19270@@ -40,7 +32,7 @@ struct stacktrace_ops {
19271 void (*address)(void *data, unsigned long address, int reliable);
19272 /* On negative return stop dumping */
19273 int (*stack)(void *data, char *name);
19274- walk_stack_t walk_stack;
19275+ walk_stack_t *walk_stack;
19276 };
19277
19278 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19279diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19280index 751bf4b..a1278b5 100644
19281--- a/arch/x86/include/asm/switch_to.h
19282+++ b/arch/x86/include/asm/switch_to.h
19283@@ -112,7 +112,7 @@ do { \
19284 "call __switch_to\n\t" \
19285 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19286 __switch_canary \
19287- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19288+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19289 "movq %%rax,%%rdi\n\t" \
19290 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19291 "jnz ret_from_fork\n\t" \
19292@@ -123,7 +123,7 @@ do { \
19293 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19294 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19295 [_tif_fork] "i" (_TIF_FORK), \
19296- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19297+ [thread_info] "m" (current_tinfo), \
19298 [current_task] "m" (current_task) \
19299 __switch_canary_iparam \
19300 : "memory", "cc" __EXTRA_CLOBBER)
19301diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19302index 1d4e4f2..506db18 100644
19303--- a/arch/x86/include/asm/thread_info.h
19304+++ b/arch/x86/include/asm/thread_info.h
19305@@ -24,7 +24,6 @@ struct exec_domain;
19306 #include <linux/atomic.h>
19307
19308 struct thread_info {
19309- struct task_struct *task; /* main task structure */
19310 struct exec_domain *exec_domain; /* execution domain */
19311 __u32 flags; /* low level flags */
19312 __u32 status; /* thread synchronous flags */
19313@@ -32,13 +31,13 @@ struct thread_info {
19314 int saved_preempt_count;
19315 mm_segment_t addr_limit;
19316 void __user *sysenter_return;
19317+ unsigned long lowest_stack;
19318 unsigned int sig_on_uaccess_error:1;
19319 unsigned int uaccess_err:1; /* uaccess failed */
19320 };
19321
19322-#define INIT_THREAD_INFO(tsk) \
19323+#define INIT_THREAD_INFO \
19324 { \
19325- .task = &tsk, \
19326 .exec_domain = &default_exec_domain, \
19327 .flags = 0, \
19328 .cpu = 0, \
19329@@ -46,7 +45,7 @@ struct thread_info {
19330 .addr_limit = KERNEL_DS, \
19331 }
19332
19333-#define init_thread_info (init_thread_union.thread_info)
19334+#define init_thread_info (init_thread_union.stack)
19335 #define init_stack (init_thread_union.stack)
19336
19337 #else /* !__ASSEMBLY__ */
19338@@ -86,6 +85,7 @@ struct thread_info {
19339 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19340 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19341 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19342+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19343
19344 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19345 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19346@@ -109,17 +109,18 @@ struct thread_info {
19347 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19348 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19349 #define _TIF_X32 (1 << TIF_X32)
19350+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19351
19352 /* work to do in syscall_trace_enter() */
19353 #define _TIF_WORK_SYSCALL_ENTRY \
19354 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19355 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19356- _TIF_NOHZ)
19357+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19358
19359 /* work to do in syscall_trace_leave() */
19360 #define _TIF_WORK_SYSCALL_EXIT \
19361 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19362- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19363+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19364
19365 /* work to do on interrupt/exception return */
19366 #define _TIF_WORK_MASK \
19367@@ -130,7 +131,7 @@ struct thread_info {
19368 /* work to do on any return to user space */
19369 #define _TIF_ALLWORK_MASK \
19370 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19371- _TIF_NOHZ)
19372+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19373
19374 /* Only used for 64 bit */
19375 #define _TIF_DO_NOTIFY_MASK \
19376@@ -145,7 +146,6 @@ struct thread_info {
19377 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19378
19379 #define STACK_WARN (THREAD_SIZE/8)
19380-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19381
19382 /*
19383 * macros/functions for gaining access to the thread information structure
19384@@ -156,12 +156,11 @@ struct thread_info {
19385
19386 DECLARE_PER_CPU(unsigned long, kernel_stack);
19387
19388+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19389+
19390 static inline struct thread_info *current_thread_info(void)
19391 {
19392- struct thread_info *ti;
19393- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19394- KERNEL_STACK_OFFSET - THREAD_SIZE);
19395- return ti;
19396+ return this_cpu_read_stable(current_tinfo);
19397 }
19398
19399 static inline unsigned long current_stack_pointer(void)
19400@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
19401
19402 /* how to get the thread information struct from ASM */
19403 #define GET_THREAD_INFO(reg) \
19404- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19405- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19406-
19407-/*
19408- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19409- * a certain register (to be used in assembler memory operands).
19410- */
19411-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19412+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19413
19414 #endif
19415
19416@@ -242,5 +234,12 @@ static inline bool is_ia32_task(void)
19417 extern void arch_task_cache_init(void);
19418 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19419 extern void arch_release_task_struct(struct task_struct *tsk);
19420+
19421+#define __HAVE_THREAD_FUNCTIONS
19422+#define task_thread_info(task) (&(task)->tinfo)
19423+#define task_stack_page(task) ((task)->stack)
19424+#define setup_thread_stack(p, org) do {} while (0)
19425+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19426+
19427 #endif
19428 #endif /* _ASM_X86_THREAD_INFO_H */
19429diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19430index cd79194..e7a9491 100644
19431--- a/arch/x86/include/asm/tlbflush.h
19432+++ b/arch/x86/include/asm/tlbflush.h
19433@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19434
19435 static inline void __native_flush_tlb(void)
19436 {
19437+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19438+ u64 descriptor[2];
19439+
19440+ descriptor[0] = PCID_KERNEL;
19441+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19442+ return;
19443+ }
19444+
19445+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19446+ if (static_cpu_has(X86_FEATURE_PCID)) {
19447+ unsigned int cpu = raw_get_cpu();
19448+
19449+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19450+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19451+ raw_put_cpu_no_resched();
19452+ return;
19453+ }
19454+#endif
19455+
19456 native_write_cr3(native_read_cr3());
19457 }
19458
19459 static inline void __native_flush_tlb_global_irq_disabled(void)
19460 {
19461- unsigned long cr4;
19462+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19463+ u64 descriptor[2];
19464
19465- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19466- /* clear PGE */
19467- native_write_cr4(cr4 & ~X86_CR4_PGE);
19468- /* write old PGE again and flush TLBs */
19469- native_write_cr4(cr4);
19470+ descriptor[0] = PCID_KERNEL;
19471+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19472+ } else {
19473+ unsigned long cr4;
19474+
19475+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19476+ /* clear PGE */
19477+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19478+ /* write old PGE again and flush TLBs */
19479+ native_write_cr4(cr4);
19480+ }
19481 }
19482
19483 static inline void __native_flush_tlb_global(void)
19484@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19485
19486 static inline void __native_flush_tlb_single(unsigned long addr)
19487 {
19488+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19489+ u64 descriptor[2];
19490+
19491+ descriptor[0] = PCID_KERNEL;
19492+ descriptor[1] = addr;
19493+
19494+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19495+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19496+ if (addr < TASK_SIZE_MAX)
19497+ descriptor[1] += pax_user_shadow_base;
19498+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19499+ }
19500+
19501+ descriptor[0] = PCID_USER;
19502+ descriptor[1] = addr;
19503+#endif
19504+
19505+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19506+ return;
19507+ }
19508+
19509+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19510+ if (static_cpu_has(X86_FEATURE_PCID)) {
19511+ unsigned int cpu = raw_get_cpu();
19512+
19513+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19514+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19515+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19516+ raw_put_cpu_no_resched();
19517+
19518+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19519+ addr += pax_user_shadow_base;
19520+ }
19521+#endif
19522+
19523 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19524 }
19525
19526diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19527index ace9dec..3f9e253 100644
19528--- a/arch/x86/include/asm/uaccess.h
19529+++ b/arch/x86/include/asm/uaccess.h
19530@@ -7,6 +7,7 @@
19531 #include <linux/compiler.h>
19532 #include <linux/thread_info.h>
19533 #include <linux/string.h>
19534+#include <linux/spinlock.h>
19535 #include <asm/asm.h>
19536 #include <asm/page.h>
19537 #include <asm/smap.h>
19538@@ -29,7 +30,12 @@
19539
19540 #define get_ds() (KERNEL_DS)
19541 #define get_fs() (current_thread_info()->addr_limit)
19542+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19543+void __set_fs(mm_segment_t x);
19544+void set_fs(mm_segment_t x);
19545+#else
19546 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19547+#endif
19548
19549 #define segment_eq(a, b) ((a).seg == (b).seg)
19550
19551@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19552 * checks that the pointer is in the user space range - after calling
19553 * this function, memory access functions may still return -EFAULT.
19554 */
19555-#define access_ok(type, addr, size) \
19556- likely(!__range_not_ok(addr, size, user_addr_max()))
19557+extern int _cond_resched(void);
19558+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19559+#define access_ok(type, addr, size) \
19560+({ \
19561+ unsigned long __size = size; \
19562+ unsigned long __addr = (unsigned long)addr; \
19563+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19564+ if (__ret_ao && __size) { \
19565+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19566+ unsigned long __end_ao = __addr + __size - 1; \
19567+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19568+ while (__addr_ao <= __end_ao) { \
19569+ char __c_ao; \
19570+ __addr_ao += PAGE_SIZE; \
19571+ if (__size > PAGE_SIZE) \
19572+ _cond_resched(); \
19573+ if (__get_user(__c_ao, (char __user *)__addr)) \
19574+ break; \
19575+ if (type != VERIFY_WRITE) { \
19576+ __addr = __addr_ao; \
19577+ continue; \
19578+ } \
19579+ if (__put_user(__c_ao, (char __user *)__addr)) \
19580+ break; \
19581+ __addr = __addr_ao; \
19582+ } \
19583+ } \
19584+ } \
19585+ __ret_ao; \
19586+})
19587
19588 /*
19589 * The exception table consists of pairs of addresses relative to the
19590@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19591 extern int __get_user_bad(void);
19592
19593 /*
19594- * This is a type: either unsigned long, if the argument fits into
19595- * that type, or otherwise unsigned long long.
19596+ * This is a type: either (un)signed int, if the argument fits into
19597+ * that type, or otherwise (un)signed long long.
19598 */
19599 #define __inttype(x) \
19600-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19601+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19602+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19603+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19604
19605 /**
19606 * get_user: - Get a simple variable from user space.
19607@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19608 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19609 __chk_user_ptr(ptr); \
19610 might_fault(); \
19611+ pax_open_userland(); \
19612 asm volatile("call __get_user_%P3" \
19613 : "=a" (__ret_gu), "=r" (__val_gu) \
19614 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19615 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19616+ pax_close_userland(); \
19617 __ret_gu; \
19618 })
19619
19620@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19621 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19622 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19623
19624-
19625+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19626+#define __copyuser_seg "gs;"
19627+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19628+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19629+#else
19630+#define __copyuser_seg
19631+#define __COPYUSER_SET_ES
19632+#define __COPYUSER_RESTORE_ES
19633+#endif
19634
19635 #ifdef CONFIG_X86_32
19636 #define __put_user_asm_u64(x, addr, err, errret) \
19637 asm volatile(ASM_STAC "\n" \
19638- "1: movl %%eax,0(%2)\n" \
19639- "2: movl %%edx,4(%2)\n" \
19640+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19641+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19642 "3: " ASM_CLAC "\n" \
19643 ".section .fixup,\"ax\"\n" \
19644 "4: movl %3,%0\n" \
19645@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19646
19647 #define __put_user_asm_ex_u64(x, addr) \
19648 asm volatile(ASM_STAC "\n" \
19649- "1: movl %%eax,0(%1)\n" \
19650- "2: movl %%edx,4(%1)\n" \
19651+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19652+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19653 "3: " ASM_CLAC "\n" \
19654 _ASM_EXTABLE_EX(1b, 2b) \
19655 _ASM_EXTABLE_EX(2b, 3b) \
19656@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19657 __typeof__(*(ptr)) __pu_val; \
19658 __chk_user_ptr(ptr); \
19659 might_fault(); \
19660- __pu_val = x; \
19661+ __pu_val = (x); \
19662+ pax_open_userland(); \
19663 switch (sizeof(*(ptr))) { \
19664 case 1: \
19665 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19666@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19667 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19668 break; \
19669 } \
19670+ pax_close_userland(); \
19671 __ret_pu; \
19672 })
19673
19674@@ -355,8 +403,10 @@ do { \
19675 } while (0)
19676
19677 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19678+do { \
19679+ pax_open_userland(); \
19680 asm volatile(ASM_STAC "\n" \
19681- "1: mov"itype" %2,%"rtype"1\n" \
19682+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19683 "2: " ASM_CLAC "\n" \
19684 ".section .fixup,\"ax\"\n" \
19685 "3: mov %3,%0\n" \
19686@@ -364,8 +414,10 @@ do { \
19687 " jmp 2b\n" \
19688 ".previous\n" \
19689 _ASM_EXTABLE(1b, 3b) \
19690- : "=r" (err), ltype(x) \
19691- : "m" (__m(addr)), "i" (errret), "0" (err))
19692+ : "=r" (err), ltype (x) \
19693+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19694+ pax_close_userland(); \
19695+} while (0)
19696
19697 #define __get_user_size_ex(x, ptr, size) \
19698 do { \
19699@@ -389,7 +441,7 @@ do { \
19700 } while (0)
19701
19702 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19703- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19704+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19705 "2:\n" \
19706 _ASM_EXTABLE_EX(1b, 2b) \
19707 : ltype(x) : "m" (__m(addr)))
19708@@ -406,13 +458,24 @@ do { \
19709 int __gu_err; \
19710 unsigned long __gu_val; \
19711 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19712- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19713+ (x) = (__typeof__(*(ptr)))__gu_val; \
19714 __gu_err; \
19715 })
19716
19717 /* FIXME: this hack is definitely wrong -AK */
19718 struct __large_struct { unsigned long buf[100]; };
19719-#define __m(x) (*(struct __large_struct __user *)(x))
19720+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19721+#define ____m(x) \
19722+({ \
19723+ unsigned long ____x = (unsigned long)(x); \
19724+ if (____x < pax_user_shadow_base) \
19725+ ____x += pax_user_shadow_base; \
19726+ (typeof(x))____x; \
19727+})
19728+#else
19729+#define ____m(x) (x)
19730+#endif
19731+#define __m(x) (*(struct __large_struct __user *)____m(x))
19732
19733 /*
19734 * Tell gcc we read from memory instead of writing: this is because
19735@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19736 * aliasing issues.
19737 */
19738 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19739+do { \
19740+ pax_open_userland(); \
19741 asm volatile(ASM_STAC "\n" \
19742- "1: mov"itype" %"rtype"1,%2\n" \
19743+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19744 "2: " ASM_CLAC "\n" \
19745 ".section .fixup,\"ax\"\n" \
19746 "3: mov %3,%0\n" \
19747@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19748 ".previous\n" \
19749 _ASM_EXTABLE(1b, 3b) \
19750 : "=r"(err) \
19751- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19752+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19753+ pax_close_userland(); \
19754+} while (0)
19755
19756 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19757- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19758+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19759 "2:\n" \
19760 _ASM_EXTABLE_EX(1b, 2b) \
19761 : : ltype(x), "m" (__m(addr)))
19762@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19763 */
19764 #define uaccess_try do { \
19765 current_thread_info()->uaccess_err = 0; \
19766+ pax_open_userland(); \
19767 stac(); \
19768 barrier();
19769
19770 #define uaccess_catch(err) \
19771 clac(); \
19772+ pax_close_userland(); \
19773 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19774 } while (0)
19775
19776@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19777 * On error, the variable @x is set to zero.
19778 */
19779
19780+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19781+#define __get_user(x, ptr) get_user((x), (ptr))
19782+#else
19783 #define __get_user(x, ptr) \
19784 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19785+#endif
19786
19787 /**
19788 * __put_user: - Write a simple value into user space, with less checking.
19789@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19790 * Returns zero on success, or -EFAULT on error.
19791 */
19792
19793+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19794+#define __put_user(x, ptr) put_user((x), (ptr))
19795+#else
19796 #define __put_user(x, ptr) \
19797 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19798+#endif
19799
19800 #define __get_user_unaligned __get_user
19801 #define __put_user_unaligned __put_user
19802@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19803 #define get_user_ex(x, ptr) do { \
19804 unsigned long __gue_val; \
19805 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19806- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19807+ (x) = (__typeof__(*(ptr)))__gue_val; \
19808 } while (0)
19809
19810 #define put_user_try uaccess_try
19811@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19812 extern __must_check long strnlen_user(const char __user *str, long n);
19813
19814 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19815-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19816+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19817
19818 extern void __cmpxchg_wrong_size(void)
19819 __compiletime_error("Bad argument size for cmpxchg");
19820@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19821 __typeof__(ptr) __uval = (uval); \
19822 __typeof__(*(ptr)) __old = (old); \
19823 __typeof__(*(ptr)) __new = (new); \
19824+ pax_open_userland(); \
19825 switch (size) { \
19826 case 1: \
19827 { \
19828 asm volatile("\t" ASM_STAC "\n" \
19829- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19830+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19831 "2:\t" ASM_CLAC "\n" \
19832 "\t.section .fixup, \"ax\"\n" \
19833 "3:\tmov %3, %0\n" \
19834 "\tjmp 2b\n" \
19835 "\t.previous\n" \
19836 _ASM_EXTABLE(1b, 3b) \
19837- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19838+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19839 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19840 : "memory" \
19841 ); \
19842@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19843 case 2: \
19844 { \
19845 asm volatile("\t" ASM_STAC "\n" \
19846- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19847+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19848 "2:\t" ASM_CLAC "\n" \
19849 "\t.section .fixup, \"ax\"\n" \
19850 "3:\tmov %3, %0\n" \
19851 "\tjmp 2b\n" \
19852 "\t.previous\n" \
19853 _ASM_EXTABLE(1b, 3b) \
19854- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19855+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19856 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19857 : "memory" \
19858 ); \
19859@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19860 case 4: \
19861 { \
19862 asm volatile("\t" ASM_STAC "\n" \
19863- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19864+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19865 "2:\t" ASM_CLAC "\n" \
19866 "\t.section .fixup, \"ax\"\n" \
19867 "3:\tmov %3, %0\n" \
19868 "\tjmp 2b\n" \
19869 "\t.previous\n" \
19870 _ASM_EXTABLE(1b, 3b) \
19871- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19872+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19873 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19874 : "memory" \
19875 ); \
19876@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19877 __cmpxchg_wrong_size(); \
19878 \
19879 asm volatile("\t" ASM_STAC "\n" \
19880- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19881+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19882 "2:\t" ASM_CLAC "\n" \
19883 "\t.section .fixup, \"ax\"\n" \
19884 "3:\tmov %3, %0\n" \
19885 "\tjmp 2b\n" \
19886 "\t.previous\n" \
19887 _ASM_EXTABLE(1b, 3b) \
19888- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19889+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19890 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19891 : "memory" \
19892 ); \
19893@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19894 default: \
19895 __cmpxchg_wrong_size(); \
19896 } \
19897+ pax_close_userland(); \
19898 *__uval = __old; \
19899 __ret; \
19900 })
19901@@ -636,17 +715,6 @@ extern struct movsl_mask {
19902
19903 #define ARCH_HAS_NOCACHE_UACCESS 1
19904
19905-#ifdef CONFIG_X86_32
19906-# include <asm/uaccess_32.h>
19907-#else
19908-# include <asm/uaccess_64.h>
19909-#endif
19910-
19911-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19912- unsigned n);
19913-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19914- unsigned n);
19915-
19916 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19917 # define copy_user_diag __compiletime_error
19918 #else
19919@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19920 extern void copy_user_diag("copy_from_user() buffer size is too small")
19921 copy_from_user_overflow(void);
19922 extern void copy_user_diag("copy_to_user() buffer size is too small")
19923-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19924+copy_to_user_overflow(void);
19925
19926 #undef copy_user_diag
19927
19928@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19929
19930 extern void
19931 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19932-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19933+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19934 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19935
19936 #else
19937@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19938
19939 #endif
19940
19941+#ifdef CONFIG_X86_32
19942+# include <asm/uaccess_32.h>
19943+#else
19944+# include <asm/uaccess_64.h>
19945+#endif
19946+
19947 static inline unsigned long __must_check
19948 copy_from_user(void *to, const void __user *from, unsigned long n)
19949 {
19950- int sz = __compiletime_object_size(to);
19951+ size_t sz = __compiletime_object_size(to);
19952
19953 might_fault();
19954
19955@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19956 * case, and do only runtime checking for non-constant sizes.
19957 */
19958
19959- if (likely(sz < 0 || sz >= n))
19960- n = _copy_from_user(to, from, n);
19961- else if(__builtin_constant_p(n))
19962- copy_from_user_overflow();
19963- else
19964- __copy_from_user_overflow(sz, n);
19965+ if (likely(sz != (size_t)-1 && sz < n)) {
19966+ if(__builtin_constant_p(n))
19967+ copy_from_user_overflow();
19968+ else
19969+ __copy_from_user_overflow(sz, n);
19970+ } else if (access_ok(VERIFY_READ, from, n))
19971+ n = __copy_from_user(to, from, n);
19972+ else if ((long)n > 0)
19973+ memset(to, 0, n);
19974
19975 return n;
19976 }
19977@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19978 static inline unsigned long __must_check
19979 copy_to_user(void __user *to, const void *from, unsigned long n)
19980 {
19981- int sz = __compiletime_object_size(from);
19982+ size_t sz = __compiletime_object_size(from);
19983
19984 might_fault();
19985
19986 /* See the comment in copy_from_user() above. */
19987- if (likely(sz < 0 || sz >= n))
19988- n = _copy_to_user(to, from, n);
19989- else if(__builtin_constant_p(n))
19990- copy_to_user_overflow();
19991- else
19992- __copy_to_user_overflow(sz, n);
19993+ if (likely(sz != (size_t)-1 && sz < n)) {
19994+ if(__builtin_constant_p(n))
19995+ copy_to_user_overflow();
19996+ else
19997+ __copy_to_user_overflow(sz, n);
19998+ } else if (access_ok(VERIFY_WRITE, to, n))
19999+ n = __copy_to_user(to, from, n);
20000
20001 return n;
20002 }
20003diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20004index 3c03a5d..edb68ae 100644
20005--- a/arch/x86/include/asm/uaccess_32.h
20006+++ b/arch/x86/include/asm/uaccess_32.h
20007@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20008 * anything, so this is accurate.
20009 */
20010
20011-static __always_inline unsigned long __must_check
20012+static __always_inline __size_overflow(3) unsigned long __must_check
20013 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20014 {
20015+ if ((long)n < 0)
20016+ return n;
20017+
20018+ check_object_size(from, n, true);
20019+
20020 if (__builtin_constant_p(n)) {
20021 unsigned long ret;
20022
20023@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20024 __copy_to_user(void __user *to, const void *from, unsigned long n)
20025 {
20026 might_fault();
20027+
20028 return __copy_to_user_inatomic(to, from, n);
20029 }
20030
20031-static __always_inline unsigned long
20032+static __always_inline __size_overflow(3) unsigned long
20033 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20034 {
20035+ if ((long)n < 0)
20036+ return n;
20037+
20038 /* Avoid zeroing the tail if the copy fails..
20039 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20040 * but as the zeroing behaviour is only significant when n is not
20041@@ -137,6 +146,12 @@ static __always_inline unsigned long
20042 __copy_from_user(void *to, const void __user *from, unsigned long n)
20043 {
20044 might_fault();
20045+
20046+ if ((long)n < 0)
20047+ return n;
20048+
20049+ check_object_size(to, n, false);
20050+
20051 if (__builtin_constant_p(n)) {
20052 unsigned long ret;
20053
20054@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20055 const void __user *from, unsigned long n)
20056 {
20057 might_fault();
20058+
20059+ if ((long)n < 0)
20060+ return n;
20061+
20062 if (__builtin_constant_p(n)) {
20063 unsigned long ret;
20064
20065@@ -181,7 +200,10 @@ static __always_inline unsigned long
20066 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20067 unsigned long n)
20068 {
20069- return __copy_from_user_ll_nocache_nozero(to, from, n);
20070+ if ((long)n < 0)
20071+ return n;
20072+
20073+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20074 }
20075
20076 #endif /* _ASM_X86_UACCESS_32_H */
20077diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20078index f2f9b39..2ae1bf8 100644
20079--- a/arch/x86/include/asm/uaccess_64.h
20080+++ b/arch/x86/include/asm/uaccess_64.h
20081@@ -10,6 +10,9 @@
20082 #include <asm/alternative.h>
20083 #include <asm/cpufeature.h>
20084 #include <asm/page.h>
20085+#include <asm/pgtable.h>
20086+
20087+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20088
20089 /*
20090 * Copy To/From Userspace
20091@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20092 __must_check unsigned long
20093 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20094
20095-static __always_inline __must_check unsigned long
20096-copy_user_generic(void *to, const void *from, unsigned len)
20097+static __always_inline __must_check __size_overflow(3) unsigned long
20098+copy_user_generic(void *to, const void *from, unsigned long len)
20099 {
20100 unsigned ret;
20101
20102@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20103 }
20104
20105 __must_check unsigned long
20106-copy_in_user(void __user *to, const void __user *from, unsigned len);
20107+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20108
20109 static __always_inline __must_check
20110-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20111+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20112 {
20113- int ret = 0;
20114+ size_t sz = __compiletime_object_size(dst);
20115+ unsigned ret = 0;
20116+
20117+ if (size > INT_MAX)
20118+ return size;
20119+
20120+ check_object_size(dst, size, false);
20121+
20122+#ifdef CONFIG_PAX_MEMORY_UDEREF
20123+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20124+ return size;
20125+#endif
20126+
20127+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20128+ if(__builtin_constant_p(size))
20129+ copy_from_user_overflow();
20130+ else
20131+ __copy_from_user_overflow(sz, size);
20132+ return size;
20133+ }
20134
20135 if (!__builtin_constant_p(size))
20136- return copy_user_generic(dst, (__force void *)src, size);
20137+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20138 switch (size) {
20139- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20140+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20141 ret, "b", "b", "=q", 1);
20142 return ret;
20143- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20144+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20145 ret, "w", "w", "=r", 2);
20146 return ret;
20147- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20148+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20149 ret, "l", "k", "=r", 4);
20150 return ret;
20151- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20152+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20153 ret, "q", "", "=r", 8);
20154 return ret;
20155 case 10:
20156- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20157+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20158 ret, "q", "", "=r", 10);
20159 if (unlikely(ret))
20160 return ret;
20161 __get_user_asm(*(u16 *)(8 + (char *)dst),
20162- (u16 __user *)(8 + (char __user *)src),
20163+ (const u16 __user *)(8 + (const char __user *)src),
20164 ret, "w", "w", "=r", 2);
20165 return ret;
20166 case 16:
20167- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20168+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20169 ret, "q", "", "=r", 16);
20170 if (unlikely(ret))
20171 return ret;
20172 __get_user_asm(*(u64 *)(8 + (char *)dst),
20173- (u64 __user *)(8 + (char __user *)src),
20174+ (const u64 __user *)(8 + (const char __user *)src),
20175 ret, "q", "", "=r", 8);
20176 return ret;
20177 default:
20178- return copy_user_generic(dst, (__force void *)src, size);
20179+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20180 }
20181 }
20182
20183 static __always_inline __must_check
20184-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20185+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20186 {
20187 might_fault();
20188 return __copy_from_user_nocheck(dst, src, size);
20189 }
20190
20191 static __always_inline __must_check
20192-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20193+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20194 {
20195- int ret = 0;
20196+ size_t sz = __compiletime_object_size(src);
20197+ unsigned ret = 0;
20198+
20199+ if (size > INT_MAX)
20200+ return size;
20201+
20202+ check_object_size(src, size, true);
20203+
20204+#ifdef CONFIG_PAX_MEMORY_UDEREF
20205+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20206+ return size;
20207+#endif
20208+
20209+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20210+ if(__builtin_constant_p(size))
20211+ copy_to_user_overflow();
20212+ else
20213+ __copy_to_user_overflow(sz, size);
20214+ return size;
20215+ }
20216
20217 if (!__builtin_constant_p(size))
20218- return copy_user_generic((__force void *)dst, src, size);
20219+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20220 switch (size) {
20221- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20222+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20223 ret, "b", "b", "iq", 1);
20224 return ret;
20225- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20226+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20227 ret, "w", "w", "ir", 2);
20228 return ret;
20229- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20230+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20231 ret, "l", "k", "ir", 4);
20232 return ret;
20233- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20234+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20235 ret, "q", "", "er", 8);
20236 return ret;
20237 case 10:
20238- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20239+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20240 ret, "q", "", "er", 10);
20241 if (unlikely(ret))
20242 return ret;
20243 asm("":::"memory");
20244- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20245+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20246 ret, "w", "w", "ir", 2);
20247 return ret;
20248 case 16:
20249- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20250+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20251 ret, "q", "", "er", 16);
20252 if (unlikely(ret))
20253 return ret;
20254 asm("":::"memory");
20255- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20256+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20257 ret, "q", "", "er", 8);
20258 return ret;
20259 default:
20260- return copy_user_generic((__force void *)dst, src, size);
20261+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20262 }
20263 }
20264
20265 static __always_inline __must_check
20266-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20267+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20268 {
20269 might_fault();
20270 return __copy_to_user_nocheck(dst, src, size);
20271 }
20272
20273 static __always_inline __must_check
20274-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20275+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20276 {
20277- int ret = 0;
20278+ unsigned ret = 0;
20279
20280 might_fault();
20281+
20282+ if (size > INT_MAX)
20283+ return size;
20284+
20285+#ifdef CONFIG_PAX_MEMORY_UDEREF
20286+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20287+ return size;
20288+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20289+ return size;
20290+#endif
20291+
20292 if (!__builtin_constant_p(size))
20293- return copy_user_generic((__force void *)dst,
20294- (__force void *)src, size);
20295+ return copy_user_generic((__force_kernel void *)____m(dst),
20296+ (__force_kernel const void *)____m(src), size);
20297 switch (size) {
20298 case 1: {
20299 u8 tmp;
20300- __get_user_asm(tmp, (u8 __user *)src,
20301+ __get_user_asm(tmp, (const u8 __user *)src,
20302 ret, "b", "b", "=q", 1);
20303 if (likely(!ret))
20304 __put_user_asm(tmp, (u8 __user *)dst,
20305@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20306 }
20307 case 2: {
20308 u16 tmp;
20309- __get_user_asm(tmp, (u16 __user *)src,
20310+ __get_user_asm(tmp, (const u16 __user *)src,
20311 ret, "w", "w", "=r", 2);
20312 if (likely(!ret))
20313 __put_user_asm(tmp, (u16 __user *)dst,
20314@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20315
20316 case 4: {
20317 u32 tmp;
20318- __get_user_asm(tmp, (u32 __user *)src,
20319+ __get_user_asm(tmp, (const u32 __user *)src,
20320 ret, "l", "k", "=r", 4);
20321 if (likely(!ret))
20322 __put_user_asm(tmp, (u32 __user *)dst,
20323@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20324 }
20325 case 8: {
20326 u64 tmp;
20327- __get_user_asm(tmp, (u64 __user *)src,
20328+ __get_user_asm(tmp, (const u64 __user *)src,
20329 ret, "q", "", "=r", 8);
20330 if (likely(!ret))
20331 __put_user_asm(tmp, (u64 __user *)dst,
20332@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20333 return ret;
20334 }
20335 default:
20336- return copy_user_generic((__force void *)dst,
20337- (__force void *)src, size);
20338+ return copy_user_generic((__force_kernel void *)____m(dst),
20339+ (__force_kernel const void *)____m(src), size);
20340 }
20341 }
20342
20343-static __must_check __always_inline int
20344-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20345+static __must_check __always_inline unsigned long
20346+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20347 {
20348 return __copy_from_user_nocheck(dst, src, size);
20349 }
20350
20351-static __must_check __always_inline int
20352-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20353+static __must_check __always_inline unsigned long
20354+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20355 {
20356 return __copy_to_user_nocheck(dst, src, size);
20357 }
20358
20359-extern long __copy_user_nocache(void *dst, const void __user *src,
20360- unsigned size, int zerorest);
20361+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20362+ unsigned long size, int zerorest);
20363
20364-static inline int
20365-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20366+static inline unsigned long
20367+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20368 {
20369 might_fault();
20370+
20371+ if (size > INT_MAX)
20372+ return size;
20373+
20374+#ifdef CONFIG_PAX_MEMORY_UDEREF
20375+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20376+ return size;
20377+#endif
20378+
20379 return __copy_user_nocache(dst, src, size, 1);
20380 }
20381
20382-static inline int
20383+static inline unsigned long
20384 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20385- unsigned size)
20386+ unsigned long size)
20387 {
20388+ if (size > INT_MAX)
20389+ return size;
20390+
20391+#ifdef CONFIG_PAX_MEMORY_UDEREF
20392+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20393+ return size;
20394+#endif
20395+
20396 return __copy_user_nocache(dst, src, size, 0);
20397 }
20398
20399 unsigned long
20400-copy_user_handle_tail(char *to, char *from, unsigned len);
20401+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20402
20403 #endif /* _ASM_X86_UACCESS_64_H */
20404diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20405index 5b238981..77fdd78 100644
20406--- a/arch/x86/include/asm/word-at-a-time.h
20407+++ b/arch/x86/include/asm/word-at-a-time.h
20408@@ -11,7 +11,7 @@
20409 * and shift, for example.
20410 */
20411 struct word_at_a_time {
20412- const unsigned long one_bits, high_bits;
20413+ unsigned long one_bits, high_bits;
20414 };
20415
20416 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20417diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20418index f58a9c7..dc378042a 100644
20419--- a/arch/x86/include/asm/x86_init.h
20420+++ b/arch/x86/include/asm/x86_init.h
20421@@ -129,7 +129,7 @@ struct x86_init_ops {
20422 struct x86_init_timers timers;
20423 struct x86_init_iommu iommu;
20424 struct x86_init_pci pci;
20425-};
20426+} __no_const;
20427
20428 /**
20429 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20430@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20431 void (*setup_percpu_clockev)(void);
20432 void (*early_percpu_clock_init)(void);
20433 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20434-};
20435+} __no_const;
20436
20437 struct timespec;
20438
20439@@ -168,7 +168,7 @@ struct x86_platform_ops {
20440 void (*save_sched_clock_state)(void);
20441 void (*restore_sched_clock_state)(void);
20442 void (*apic_post_init)(void);
20443-};
20444+} __no_const;
20445
20446 struct pci_dev;
20447 struct msi_msg;
20448@@ -182,7 +182,7 @@ struct x86_msi_ops {
20449 void (*teardown_msi_irqs)(struct pci_dev *dev);
20450 void (*restore_msi_irqs)(struct pci_dev *dev);
20451 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20452-};
20453+} __no_const;
20454
20455 struct IO_APIC_route_entry;
20456 struct io_apic_irq_attr;
20457@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20458 unsigned int destination, int vector,
20459 struct io_apic_irq_attr *attr);
20460 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20461-};
20462+} __no_const;
20463
20464 extern struct x86_init_ops x86_init;
20465 extern struct x86_cpuinit_ops x86_cpuinit;
20466diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20467index 358dcd3..23c0bf1 100644
20468--- a/arch/x86/include/asm/xen/page.h
20469+++ b/arch/x86/include/asm/xen/page.h
20470@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20471 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20472 * cases needing an extended handling.
20473 */
20474-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20475+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20476 {
20477 unsigned long mfn;
20478
20479diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20480index c9a6d68..cb57f42 100644
20481--- a/arch/x86/include/asm/xsave.h
20482+++ b/arch/x86/include/asm/xsave.h
20483@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20484 if (unlikely(err))
20485 return -EFAULT;
20486
20487+ pax_open_userland();
20488 __asm__ __volatile__(ASM_STAC "\n"
20489- "1:"XSAVE"\n"
20490+ "1:"
20491+ __copyuser_seg
20492+ XSAVE"\n"
20493 "2: " ASM_CLAC "\n"
20494 xstate_fault
20495 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20496 : "memory");
20497+ pax_close_userland();
20498 return err;
20499 }
20500
20501@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20502 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20503 {
20504 int err = 0;
20505- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20506+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20507 u32 lmask = mask;
20508 u32 hmask = mask >> 32;
20509
20510+ pax_open_userland();
20511 __asm__ __volatile__(ASM_STAC "\n"
20512- "1:"XRSTOR"\n"
20513+ "1:"
20514+ __copyuser_seg
20515+ XRSTOR"\n"
20516 "2: " ASM_CLAC "\n"
20517 xstate_fault
20518 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20519 : "memory"); /* memory required? */
20520+ pax_close_userland();
20521 return err;
20522 }
20523
20524diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20525index d993e33..8db1b18 100644
20526--- a/arch/x86/include/uapi/asm/e820.h
20527+++ b/arch/x86/include/uapi/asm/e820.h
20528@@ -58,7 +58,7 @@ struct e820map {
20529 #define ISA_START_ADDRESS 0xa0000
20530 #define ISA_END_ADDRESS 0x100000
20531
20532-#define BIOS_BEGIN 0x000a0000
20533+#define BIOS_BEGIN 0x000c0000
20534 #define BIOS_END 0x00100000
20535
20536 #define BIOS_ROM_BASE 0xffe00000
20537diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20538index 7b0a55a..ad115bf 100644
20539--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20540+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20541@@ -49,7 +49,6 @@
20542 #define EFLAGS 144
20543 #define RSP 152
20544 #define SS 160
20545-#define ARGOFFSET R11
20546 #endif /* __ASSEMBLY__ */
20547
20548 /* top of stack page */
20549diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20550index cdb1b70..426434c 100644
20551--- a/arch/x86/kernel/Makefile
20552+++ b/arch/x86/kernel/Makefile
20553@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20554 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20555 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20556 obj-y += probe_roms.o
20557-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20558+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20559 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20560 obj-$(CONFIG_X86_64) += mcount_64.o
20561 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20562diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20563index 803b684..68c64f1 100644
20564--- a/arch/x86/kernel/acpi/boot.c
20565+++ b/arch/x86/kernel/acpi/boot.c
20566@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20567 * If your system is blacklisted here, but you find that acpi=force
20568 * works for you, please contact linux-acpi@vger.kernel.org
20569 */
20570-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20571+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20572 /*
20573 * Boxes that need ACPI disabled
20574 */
20575@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20576 };
20577
20578 /* second table for DMI checks that should run after early-quirks */
20579-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20580+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20581 /*
20582 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20583 * which includes some code which overrides all temperature
20584diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20585index d1daead..acd77e2 100644
20586--- a/arch/x86/kernel/acpi/sleep.c
20587+++ b/arch/x86/kernel/acpi/sleep.c
20588@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20589 #else /* CONFIG_64BIT */
20590 #ifdef CONFIG_SMP
20591 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20592+
20593+ pax_open_kernel();
20594 early_gdt_descr.address =
20595 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20596+ pax_close_kernel();
20597+
20598 initial_gs = per_cpu_offset(smp_processor_id());
20599 #endif
20600 initial_code = (unsigned long)wakeup_long64;
20601diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20602index 665c6b7..eae4d56 100644
20603--- a/arch/x86/kernel/acpi/wakeup_32.S
20604+++ b/arch/x86/kernel/acpi/wakeup_32.S
20605@@ -29,13 +29,11 @@ wakeup_pmode_return:
20606 # and restore the stack ... but you need gdt for this to work
20607 movl saved_context_esp, %esp
20608
20609- movl %cs:saved_magic, %eax
20610- cmpl $0x12345678, %eax
20611+ cmpl $0x12345678, saved_magic
20612 jne bogus_magic
20613
20614 # jump to place where we left off
20615- movl saved_eip, %eax
20616- jmp *%eax
20617+ jmp *(saved_eip)
20618
20619 bogus_magic:
20620 jmp bogus_magic
20621diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20622index 703130f..27a155d 100644
20623--- a/arch/x86/kernel/alternative.c
20624+++ b/arch/x86/kernel/alternative.c
20625@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20626 */
20627 for (a = start; a < end; a++) {
20628 instr = (u8 *)&a->instr_offset + a->instr_offset;
20629+
20630+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20631+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20632+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20633+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20634+#endif
20635+
20636 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20637 BUG_ON(a->replacementlen > a->instrlen);
20638 BUG_ON(a->instrlen > sizeof(insnbuf));
20639@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20640 add_nops(insnbuf + a->replacementlen,
20641 a->instrlen - a->replacementlen);
20642
20643+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20644+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20645+ instr = ktva_ktla(instr);
20646+#endif
20647+
20648 text_poke_early(instr, insnbuf, a->instrlen);
20649 }
20650 }
20651@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20652 for (poff = start; poff < end; poff++) {
20653 u8 *ptr = (u8 *)poff + *poff;
20654
20655+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20656+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20657+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20658+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20659+#endif
20660+
20661 if (!*poff || ptr < text || ptr >= text_end)
20662 continue;
20663 /* turn DS segment override prefix into lock prefix */
20664- if (*ptr == 0x3e)
20665+ if (*ktla_ktva(ptr) == 0x3e)
20666 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20667 }
20668 mutex_unlock(&text_mutex);
20669@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20670 for (poff = start; poff < end; poff++) {
20671 u8 *ptr = (u8 *)poff + *poff;
20672
20673+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20674+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20675+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20676+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20677+#endif
20678+
20679 if (!*poff || ptr < text || ptr >= text_end)
20680 continue;
20681 /* turn lock prefix into DS segment override prefix */
20682- if (*ptr == 0xf0)
20683+ if (*ktla_ktva(ptr) == 0xf0)
20684 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20685 }
20686 mutex_unlock(&text_mutex);
20687@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20688
20689 BUG_ON(p->len > MAX_PATCH_LEN);
20690 /* prep the buffer with the original instructions */
20691- memcpy(insnbuf, p->instr, p->len);
20692+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20693 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20694 (unsigned long)p->instr, p->len);
20695
20696@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20697 if (!uniproc_patched || num_possible_cpus() == 1)
20698 free_init_pages("SMP alternatives",
20699 (unsigned long)__smp_locks,
20700- (unsigned long)__smp_locks_end);
20701+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20702 #endif
20703
20704 apply_paravirt(__parainstructions, __parainstructions_end);
20705@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20706 * instructions. And on the local CPU you need to be protected again NMI or MCE
20707 * handlers seeing an inconsistent instruction while you patch.
20708 */
20709-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20710+void *__kprobes text_poke_early(void *addr, const void *opcode,
20711 size_t len)
20712 {
20713 unsigned long flags;
20714 local_irq_save(flags);
20715- memcpy(addr, opcode, len);
20716+
20717+ pax_open_kernel();
20718+ memcpy(ktla_ktva(addr), opcode, len);
20719 sync_core();
20720+ pax_close_kernel();
20721+
20722 local_irq_restore(flags);
20723 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20724 that causes hangs on some VIA CPUs. */
20725@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20726 */
20727 void *text_poke(void *addr, const void *opcode, size_t len)
20728 {
20729- unsigned long flags;
20730- char *vaddr;
20731+ unsigned char *vaddr = ktla_ktva(addr);
20732 struct page *pages[2];
20733- int i;
20734+ size_t i;
20735
20736 if (!core_kernel_text((unsigned long)addr)) {
20737- pages[0] = vmalloc_to_page(addr);
20738- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20739+ pages[0] = vmalloc_to_page(vaddr);
20740+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20741 } else {
20742- pages[0] = virt_to_page(addr);
20743+ pages[0] = virt_to_page(vaddr);
20744 WARN_ON(!PageReserved(pages[0]));
20745- pages[1] = virt_to_page(addr + PAGE_SIZE);
20746+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20747 }
20748 BUG_ON(!pages[0]);
20749- local_irq_save(flags);
20750- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20751- if (pages[1])
20752- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20753- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20754- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20755- clear_fixmap(FIX_TEXT_POKE0);
20756- if (pages[1])
20757- clear_fixmap(FIX_TEXT_POKE1);
20758- local_flush_tlb();
20759- sync_core();
20760- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20761- that causes hangs on some VIA CPUs. */
20762+ text_poke_early(addr, opcode, len);
20763 for (i = 0; i < len; i++)
20764- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20765- local_irq_restore(flags);
20766+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20767 return addr;
20768 }
20769
20770@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20771 if (likely(!bp_patching_in_progress))
20772 return 0;
20773
20774- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20775+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20776 return 0;
20777
20778 /* set up the specified breakpoint handler */
20779@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20780 */
20781 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20782 {
20783- unsigned char int3 = 0xcc;
20784+ const unsigned char int3 = 0xcc;
20785
20786 bp_int3_handler = handler;
20787 bp_int3_addr = (u8 *)addr + sizeof(int3);
20788diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20789index ad3639a..bd4253c 100644
20790--- a/arch/x86/kernel/apic/apic.c
20791+++ b/arch/x86/kernel/apic/apic.c
20792@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20793 /*
20794 * Debug level, exported for io_apic.c
20795 */
20796-unsigned int apic_verbosity;
20797+int apic_verbosity;
20798
20799 int pic_mode;
20800
20801@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20802 apic_write(APIC_ESR, 0);
20803 v = apic_read(APIC_ESR);
20804 ack_APIC_irq();
20805- atomic_inc(&irq_err_count);
20806+ atomic_inc_unchecked(&irq_err_count);
20807
20808 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20809 smp_processor_id(), v);
20810diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20811index de918c4..32eed23 100644
20812--- a/arch/x86/kernel/apic/apic_flat_64.c
20813+++ b/arch/x86/kernel/apic/apic_flat_64.c
20814@@ -154,7 +154,7 @@ static int flat_probe(void)
20815 return 1;
20816 }
20817
20818-static struct apic apic_flat = {
20819+static struct apic apic_flat __read_only = {
20820 .name = "flat",
20821 .probe = flat_probe,
20822 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20823@@ -260,7 +260,7 @@ static int physflat_probe(void)
20824 return 0;
20825 }
20826
20827-static struct apic apic_physflat = {
20828+static struct apic apic_physflat __read_only = {
20829
20830 .name = "physical flat",
20831 .probe = physflat_probe,
20832diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20833index b205cdb..d8503ff 100644
20834--- a/arch/x86/kernel/apic/apic_noop.c
20835+++ b/arch/x86/kernel/apic/apic_noop.c
20836@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20837 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20838 }
20839
20840-struct apic apic_noop = {
20841+struct apic apic_noop __read_only = {
20842 .name = "noop",
20843 .probe = noop_probe,
20844 .acpi_madt_oem_check = NULL,
20845diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20846index c4a8d63..fe893ac 100644
20847--- a/arch/x86/kernel/apic/bigsmp_32.c
20848+++ b/arch/x86/kernel/apic/bigsmp_32.c
20849@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20850 return dmi_bigsmp;
20851 }
20852
20853-static struct apic apic_bigsmp = {
20854+static struct apic apic_bigsmp __read_only = {
20855
20856 .name = "bigsmp",
20857 .probe = probe_bigsmp,
20858diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20859index f4dc246..fbab133 100644
20860--- a/arch/x86/kernel/apic/io_apic.c
20861+++ b/arch/x86/kernel/apic/io_apic.c
20862@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20863 return ret;
20864 }
20865
20866-atomic_t irq_mis_count;
20867+atomic_unchecked_t irq_mis_count;
20868
20869 #ifdef CONFIG_GENERIC_PENDING_IRQ
20870 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20871@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20872 * at the cpu.
20873 */
20874 if (!(v & (1 << (i & 0x1f)))) {
20875- atomic_inc(&irq_mis_count);
20876+ atomic_inc_unchecked(&irq_mis_count);
20877
20878 eoi_ioapic_irq(irq, cfg);
20879 }
20880@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20881 ioapic_irqd_unmask(data, cfg, masked);
20882 }
20883
20884-static struct irq_chip ioapic_chip __read_mostly = {
20885+static struct irq_chip ioapic_chip = {
20886 .name = "IO-APIC",
20887 .irq_startup = startup_ioapic_irq,
20888 .irq_mask = mask_ioapic_irq,
20889@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20890 ack_APIC_irq();
20891 }
20892
20893-static struct irq_chip lapic_chip __read_mostly = {
20894+static struct irq_chip lapic_chip = {
20895 .name = "local-APIC",
20896 .irq_mask = mask_lapic_irq,
20897 .irq_unmask = unmask_lapic_irq,
20898diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20899index bda4886..f9c7195 100644
20900--- a/arch/x86/kernel/apic/probe_32.c
20901+++ b/arch/x86/kernel/apic/probe_32.c
20902@@ -72,7 +72,7 @@ static int probe_default(void)
20903 return 1;
20904 }
20905
20906-static struct apic apic_default = {
20907+static struct apic apic_default __read_only = {
20908
20909 .name = "default",
20910 .probe = probe_default,
20911diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20912index 6cedd79..023ff8e 100644
20913--- a/arch/x86/kernel/apic/vector.c
20914+++ b/arch/x86/kernel/apic/vector.c
20915@@ -21,7 +21,7 @@
20916
20917 static DEFINE_RAW_SPINLOCK(vector_lock);
20918
20919-void lock_vector_lock(void)
20920+void lock_vector_lock(void) __acquires(vector_lock)
20921 {
20922 /* Used to the online set of cpus does not change
20923 * during assign_irq_vector.
20924@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20925 raw_spin_lock(&vector_lock);
20926 }
20927
20928-void unlock_vector_lock(void)
20929+void unlock_vector_lock(void) __releases(vector_lock)
20930 {
20931 raw_spin_unlock(&vector_lock);
20932 }
20933diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20934index e658f21..b695a1a 100644
20935--- a/arch/x86/kernel/apic/x2apic_cluster.c
20936+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20937@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20938 return notifier_from_errno(err);
20939 }
20940
20941-static struct notifier_block __refdata x2apic_cpu_notifier = {
20942+static struct notifier_block x2apic_cpu_notifier = {
20943 .notifier_call = update_clusterinfo,
20944 };
20945
20946@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20947 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20948 }
20949
20950-static struct apic apic_x2apic_cluster = {
20951+static struct apic apic_x2apic_cluster __read_only = {
20952
20953 .name = "cluster x2apic",
20954 .probe = x2apic_cluster_probe,
20955diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20956index 6fae733..5ca17af 100644
20957--- a/arch/x86/kernel/apic/x2apic_phys.c
20958+++ b/arch/x86/kernel/apic/x2apic_phys.c
20959@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20960 return apic == &apic_x2apic_phys;
20961 }
20962
20963-static struct apic apic_x2apic_phys = {
20964+static struct apic apic_x2apic_phys __read_only = {
20965
20966 .name = "physical x2apic",
20967 .probe = x2apic_phys_probe,
20968diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20969index 8e9dcfd..c61b3e4 100644
20970--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20971+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20972@@ -348,7 +348,7 @@ static int uv_probe(void)
20973 return apic == &apic_x2apic_uv_x;
20974 }
20975
20976-static struct apic __refdata apic_x2apic_uv_x = {
20977+static struct apic apic_x2apic_uv_x __read_only = {
20978
20979 .name = "UV large system",
20980 .probe = uv_probe,
20981diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20982index 927ec92..de68f32 100644
20983--- a/arch/x86/kernel/apm_32.c
20984+++ b/arch/x86/kernel/apm_32.c
20985@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20986 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20987 * even though they are called in protected mode.
20988 */
20989-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20990+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20991 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20992
20993 static const char driver_version[] = "1.16ac"; /* no spaces */
20994@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
20995 BUG_ON(cpu != 0);
20996 gdt = get_cpu_gdt_table(cpu);
20997 save_desc_40 = gdt[0x40 / 8];
20998+
20999+ pax_open_kernel();
21000 gdt[0x40 / 8] = bad_bios_desc;
21001+ pax_close_kernel();
21002
21003 apm_irq_save(flags);
21004 APM_DO_SAVE_SEGS;
21005@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21006 &call->esi);
21007 APM_DO_RESTORE_SEGS;
21008 apm_irq_restore(flags);
21009+
21010+ pax_open_kernel();
21011 gdt[0x40 / 8] = save_desc_40;
21012+ pax_close_kernel();
21013+
21014 put_cpu();
21015
21016 return call->eax & 0xff;
21017@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21018 BUG_ON(cpu != 0);
21019 gdt = get_cpu_gdt_table(cpu);
21020 save_desc_40 = gdt[0x40 / 8];
21021+
21022+ pax_open_kernel();
21023 gdt[0x40 / 8] = bad_bios_desc;
21024+ pax_close_kernel();
21025
21026 apm_irq_save(flags);
21027 APM_DO_SAVE_SEGS;
21028@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21029 &call->eax);
21030 APM_DO_RESTORE_SEGS;
21031 apm_irq_restore(flags);
21032+
21033+ pax_open_kernel();
21034 gdt[0x40 / 8] = save_desc_40;
21035+ pax_close_kernel();
21036+
21037 put_cpu();
21038 return error;
21039 }
21040@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21041 return 0;
21042 }
21043
21044-static struct dmi_system_id __initdata apm_dmi_table[] = {
21045+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21046 {
21047 print_if_true,
21048 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21049@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21050 * code to that CPU.
21051 */
21052 gdt = get_cpu_gdt_table(0);
21053+
21054+ pax_open_kernel();
21055 set_desc_base(&gdt[APM_CS >> 3],
21056 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21057 set_desc_base(&gdt[APM_CS_16 >> 3],
21058 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21059 set_desc_base(&gdt[APM_DS >> 3],
21060 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21061+ pax_close_kernel();
21062
21063 proc_create("apm", 0, NULL, &apm_file_ops);
21064
21065diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21066index 9f6b934..cf5ffb3 100644
21067--- a/arch/x86/kernel/asm-offsets.c
21068+++ b/arch/x86/kernel/asm-offsets.c
21069@@ -32,6 +32,8 @@ void common(void) {
21070 OFFSET(TI_flags, thread_info, flags);
21071 OFFSET(TI_status, thread_info, status);
21072 OFFSET(TI_addr_limit, thread_info, addr_limit);
21073+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21074+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21075
21076 BLANK();
21077 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21078@@ -52,8 +54,26 @@ void common(void) {
21079 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21080 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21081 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21082+
21083+#ifdef CONFIG_PAX_KERNEXEC
21084+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21085 #endif
21086
21087+#ifdef CONFIG_PAX_MEMORY_UDEREF
21088+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21089+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21090+#ifdef CONFIG_X86_64
21091+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21092+#endif
21093+#endif
21094+
21095+#endif
21096+
21097+ BLANK();
21098+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21099+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21100+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21101+
21102 #ifdef CONFIG_XEN
21103 BLANK();
21104 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21105diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21106index fdcbb4d..036dd93 100644
21107--- a/arch/x86/kernel/asm-offsets_64.c
21108+++ b/arch/x86/kernel/asm-offsets_64.c
21109@@ -80,6 +80,7 @@ int main(void)
21110 BLANK();
21111 #undef ENTRY
21112
21113+ DEFINE(TSS_size, sizeof(struct tss_struct));
21114 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21115 BLANK();
21116
21117diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21118index 80091ae..0c5184f 100644
21119--- a/arch/x86/kernel/cpu/Makefile
21120+++ b/arch/x86/kernel/cpu/Makefile
21121@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21122 CFLAGS_REMOVE_perf_event.o = -pg
21123 endif
21124
21125-# Make sure load_percpu_segment has no stackprotector
21126-nostackp := $(call cc-option, -fno-stack-protector)
21127-CFLAGS_common.o := $(nostackp)
21128-
21129 obj-y := intel_cacheinfo.o scattered.o topology.o
21130 obj-y += common.o
21131 obj-y += rdrand.o
21132diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21133index a220239..607fc38 100644
21134--- a/arch/x86/kernel/cpu/amd.c
21135+++ b/arch/x86/kernel/cpu/amd.c
21136@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21137 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21138 {
21139 /* AMD errata T13 (order #21922) */
21140- if ((c->x86 == 6)) {
21141+ if (c->x86 == 6) {
21142 /* Duron Rev A0 */
21143 if (c->x86_model == 3 && c->x86_mask == 0)
21144 size = 64;
21145diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21146index 2346c95..c061472 100644
21147--- a/arch/x86/kernel/cpu/common.c
21148+++ b/arch/x86/kernel/cpu/common.c
21149@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21150
21151 static const struct cpu_dev *this_cpu = &default_cpu;
21152
21153-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21154-#ifdef CONFIG_X86_64
21155- /*
21156- * We need valid kernel segments for data and code in long mode too
21157- * IRET will check the segment types kkeil 2000/10/28
21158- * Also sysret mandates a special GDT layout
21159- *
21160- * TLS descriptors are currently at a different place compared to i386.
21161- * Hopefully nobody expects them at a fixed place (Wine?)
21162- */
21163- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21164- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21165- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21166- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21167- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21168- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21169-#else
21170- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21171- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21172- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21173- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21174- /*
21175- * Segments used for calling PnP BIOS have byte granularity.
21176- * They code segments and data segments have fixed 64k limits,
21177- * the transfer segment sizes are set at run time.
21178- */
21179- /* 32-bit code */
21180- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21181- /* 16-bit code */
21182- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21183- /* 16-bit data */
21184- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21185- /* 16-bit data */
21186- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21187- /* 16-bit data */
21188- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21189- /*
21190- * The APM segments have byte granularity and their bases
21191- * are set at run time. All have 64k limits.
21192- */
21193- /* 32-bit code */
21194- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21195- /* 16-bit code */
21196- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21197- /* data */
21198- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21199-
21200- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21201- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21202- GDT_STACK_CANARY_INIT
21203-#endif
21204-} };
21205-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21206-
21207 static int __init x86_xsave_setup(char *s)
21208 {
21209 if (strlen(s))
21210@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21211 }
21212 }
21213
21214+#ifdef CONFIG_X86_64
21215+static __init int setup_disable_pcid(char *arg)
21216+{
21217+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21218+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21219+
21220+#ifdef CONFIG_PAX_MEMORY_UDEREF
21221+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21222+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21223+#endif
21224+
21225+ return 1;
21226+}
21227+__setup("nopcid", setup_disable_pcid);
21228+
21229+static void setup_pcid(struct cpuinfo_x86 *c)
21230+{
21231+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21232+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21233+
21234+#ifdef CONFIG_PAX_MEMORY_UDEREF
21235+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21236+ pax_open_kernel();
21237+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21238+ pax_close_kernel();
21239+ printk("PAX: slow and weak UDEREF enabled\n");
21240+ } else
21241+ printk("PAX: UDEREF disabled\n");
21242+#endif
21243+
21244+ return;
21245+ }
21246+
21247+ printk("PAX: PCID detected\n");
21248+ cr4_set_bits(X86_CR4_PCIDE);
21249+
21250+#ifdef CONFIG_PAX_MEMORY_UDEREF
21251+ pax_open_kernel();
21252+ clone_pgd_mask = ~(pgdval_t)0UL;
21253+ pax_close_kernel();
21254+ if (pax_user_shadow_base)
21255+ printk("PAX: weak UDEREF enabled\n");
21256+ else {
21257+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21258+ printk("PAX: strong UDEREF enabled\n");
21259+ }
21260+#endif
21261+
21262+ if (cpu_has(c, X86_FEATURE_INVPCID))
21263+ printk("PAX: INVPCID detected\n");
21264+}
21265+#endif
21266+
21267 /*
21268 * Some CPU features depend on higher CPUID levels, which may not always
21269 * be available due to CPUID level capping or broken virtualization
21270@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
21271 {
21272 struct desc_ptr gdt_descr;
21273
21274- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21275+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21276 gdt_descr.size = GDT_SIZE - 1;
21277 load_gdt(&gdt_descr);
21278 /* Reload the per-cpu base */
21279@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21280 setup_smep(c);
21281 setup_smap(c);
21282
21283+#ifdef CONFIG_X86_32
21284+#ifdef CONFIG_PAX_PAGEEXEC
21285+ if (!(__supported_pte_mask & _PAGE_NX))
21286+ clear_cpu_cap(c, X86_FEATURE_PSE);
21287+#endif
21288+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21289+ clear_cpu_cap(c, X86_FEATURE_SEP);
21290+#endif
21291+#endif
21292+
21293+#ifdef CONFIG_X86_64
21294+ setup_pcid(c);
21295+#endif
21296+
21297 /*
21298 * The vendor-specific functions might have changed features.
21299 * Now we do "generic changes."
21300@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
21301 void enable_sep_cpu(void)
21302 {
21303 int cpu = get_cpu();
21304- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21305+ struct tss_struct *tss = init_tss + cpu;
21306
21307 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21308 put_cpu();
21309@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
21310 }
21311 __setup("clearcpuid=", setup_disablecpuid);
21312
21313+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21314+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21315+
21316 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21317- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21318+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21319 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21320
21321 #ifdef CONFIG_X86_64
21322-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21323-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21324- (unsigned long) debug_idt_table };
21325+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21326+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21327
21328 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21329 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21330@@ -1307,7 +1322,7 @@ void cpu_init(void)
21331 */
21332 load_ucode_ap();
21333
21334- t = &per_cpu(init_tss, cpu);
21335+ t = init_tss + cpu;
21336 oist = &per_cpu(orig_ist, cpu);
21337
21338 #ifdef CONFIG_NUMA
21339@@ -1339,7 +1354,6 @@ void cpu_init(void)
21340 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21341 barrier();
21342
21343- x86_configure_nx();
21344 x2apic_setup();
21345
21346 /*
21347@@ -1391,7 +1405,7 @@ void cpu_init(void)
21348 {
21349 int cpu = smp_processor_id();
21350 struct task_struct *curr = current;
21351- struct tss_struct *t = &per_cpu(init_tss, cpu);
21352+ struct tss_struct *t = init_tss + cpu;
21353 struct thread_struct *thread = &curr->thread;
21354
21355 wait_for_master_cpu(cpu);
21356diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21357index 6596433..1ad6eaf 100644
21358--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21359+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21360@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
21361 };
21362
21363 #ifdef CONFIG_AMD_NB
21364+static struct attribute *default_attrs_amd_nb[] = {
21365+ &type.attr,
21366+ &level.attr,
21367+ &coherency_line_size.attr,
21368+ &physical_line_partition.attr,
21369+ &ways_of_associativity.attr,
21370+ &number_of_sets.attr,
21371+ &size.attr,
21372+ &shared_cpu_map.attr,
21373+ &shared_cpu_list.attr,
21374+ NULL,
21375+ NULL,
21376+ NULL,
21377+ NULL
21378+};
21379+
21380 static struct attribute **amd_l3_attrs(void)
21381 {
21382 static struct attribute **attrs;
21383@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
21384
21385 n = ARRAY_SIZE(default_attrs);
21386
21387- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21388- n += 2;
21389-
21390- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21391- n += 1;
21392-
21393- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21394- if (attrs == NULL)
21395- return attrs = default_attrs;
21396-
21397- for (n = 0; default_attrs[n]; n++)
21398- attrs[n] = default_attrs[n];
21399+ attrs = default_attrs_amd_nb;
21400
21401 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21402 attrs[n++] = &cache_disable_0.attr;
21403@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
21404 .default_attrs = default_attrs,
21405 };
21406
21407+#ifdef CONFIG_AMD_NB
21408+static struct kobj_type ktype_cache_amd_nb = {
21409+ .sysfs_ops = &sysfs_ops,
21410+ .default_attrs = default_attrs_amd_nb,
21411+};
21412+#endif
21413+
21414 static struct kobj_type ktype_percpu_entry = {
21415 .sysfs_ops = &sysfs_ops,
21416 };
21417@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
21418 return retval;
21419 }
21420
21421+#ifdef CONFIG_AMD_NB
21422+ amd_l3_attrs();
21423+#endif
21424+
21425 for (i = 0; i < num_cache_leaves; i++) {
21426+ struct kobj_type *ktype;
21427+
21428 this_object = INDEX_KOBJECT_PTR(cpu, i);
21429 this_object->cpu = cpu;
21430 this_object->index = i;
21431
21432 this_leaf = CPUID4_INFO_IDX(cpu, i);
21433
21434- ktype_cache.default_attrs = default_attrs;
21435+ ktype = &ktype_cache;
21436 #ifdef CONFIG_AMD_NB
21437 if (this_leaf->base.nb)
21438- ktype_cache.default_attrs = amd_l3_attrs();
21439+ ktype = &ktype_cache_amd_nb;
21440 #endif
21441 retval = kobject_init_and_add(&(this_object->kobj),
21442- &ktype_cache,
21443+ ktype,
21444 per_cpu(ici_cache_kobject, cpu),
21445 "index%1lu", i);
21446 if (unlikely(retval)) {
21447diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21448index 11dd8f2..fd88f68 100644
21449--- a/arch/x86/kernel/cpu/mcheck/mce.c
21450+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21451@@ -47,6 +47,7 @@
21452 #include <asm/tlbflush.h>
21453 #include <asm/mce.h>
21454 #include <asm/msr.h>
21455+#include <asm/local.h>
21456
21457 #include "mce-internal.h"
21458
21459@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21460 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21461 m->cs, m->ip);
21462
21463- if (m->cs == __KERNEL_CS)
21464+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21465 print_symbol("{%s}", m->ip);
21466 pr_cont("\n");
21467 }
21468@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21469
21470 #define PANIC_TIMEOUT 5 /* 5 seconds */
21471
21472-static atomic_t mce_panicked;
21473+static atomic_unchecked_t mce_panicked;
21474
21475 static int fake_panic;
21476-static atomic_t mce_fake_panicked;
21477+static atomic_unchecked_t mce_fake_panicked;
21478
21479 /* Panic in progress. Enable interrupts and wait for final IPI */
21480 static void wait_for_panic(void)
21481@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21482 /*
21483 * Make sure only one CPU runs in machine check panic
21484 */
21485- if (atomic_inc_return(&mce_panicked) > 1)
21486+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21487 wait_for_panic();
21488 barrier();
21489
21490@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21491 console_verbose();
21492 } else {
21493 /* Don't log too much for fake panic */
21494- if (atomic_inc_return(&mce_fake_panicked) > 1)
21495+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21496 return;
21497 }
21498 /* First print corrected ones that are still unlogged */
21499@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21500 if (!fake_panic) {
21501 if (panic_timeout == 0)
21502 panic_timeout = mca_cfg.panic_timeout;
21503- panic(msg);
21504+ panic("%s", msg);
21505 } else
21506 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21507 }
21508@@ -746,7 +747,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21509 * might have been modified by someone else.
21510 */
21511 rmb();
21512- if (atomic_read(&mce_panicked))
21513+ if (atomic_read_unchecked(&mce_panicked))
21514 wait_for_panic();
21515 if (!mca_cfg.monarch_timeout)
21516 goto out;
21517@@ -1672,7 +1673,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21518 }
21519
21520 /* Call the installed machine check handler for this CPU setup. */
21521-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21522+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21523 unexpected_machine_check;
21524
21525 /*
21526@@ -1695,7 +1696,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21527 return;
21528 }
21529
21530+ pax_open_kernel();
21531 machine_check_vector = do_machine_check;
21532+ pax_close_kernel();
21533
21534 __mcheck_cpu_init_generic();
21535 __mcheck_cpu_init_vendor(c);
21536@@ -1709,7 +1712,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21537 */
21538
21539 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21540-static int mce_chrdev_open_count; /* #times opened */
21541+static local_t mce_chrdev_open_count; /* #times opened */
21542 static int mce_chrdev_open_exclu; /* already open exclusive? */
21543
21544 static int mce_chrdev_open(struct inode *inode, struct file *file)
21545@@ -1717,7 +1720,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21546 spin_lock(&mce_chrdev_state_lock);
21547
21548 if (mce_chrdev_open_exclu ||
21549- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21550+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21551 spin_unlock(&mce_chrdev_state_lock);
21552
21553 return -EBUSY;
21554@@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21555
21556 if (file->f_flags & O_EXCL)
21557 mce_chrdev_open_exclu = 1;
21558- mce_chrdev_open_count++;
21559+ local_inc(&mce_chrdev_open_count);
21560
21561 spin_unlock(&mce_chrdev_state_lock);
21562
21563@@ -1736,7 +1739,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21564 {
21565 spin_lock(&mce_chrdev_state_lock);
21566
21567- mce_chrdev_open_count--;
21568+ local_dec(&mce_chrdev_open_count);
21569 mce_chrdev_open_exclu = 0;
21570
21571 spin_unlock(&mce_chrdev_state_lock);
21572@@ -2411,7 +2414,7 @@ static __init void mce_init_banks(void)
21573
21574 for (i = 0; i < mca_cfg.banks; i++) {
21575 struct mce_bank *b = &mce_banks[i];
21576- struct device_attribute *a = &b->attr;
21577+ device_attribute_no_const *a = &b->attr;
21578
21579 sysfs_attr_init(&a->attr);
21580 a->attr.name = b->attrname;
21581@@ -2518,7 +2521,7 @@ struct dentry *mce_get_debugfs_dir(void)
21582 static void mce_reset(void)
21583 {
21584 cpu_missing = 0;
21585- atomic_set(&mce_fake_panicked, 0);
21586+ atomic_set_unchecked(&mce_fake_panicked, 0);
21587 atomic_set(&mce_executing, 0);
21588 atomic_set(&mce_callin, 0);
21589 atomic_set(&global_nwo, 0);
21590diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21591index 737b0ad..09ec66e 100644
21592--- a/arch/x86/kernel/cpu/mcheck/p5.c
21593+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21594@@ -12,6 +12,7 @@
21595 #include <asm/tlbflush.h>
21596 #include <asm/mce.h>
21597 #include <asm/msr.h>
21598+#include <asm/pgtable.h>
21599
21600 /* By default disabled */
21601 int mce_p5_enabled __read_mostly;
21602@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21603 if (!cpu_has(c, X86_FEATURE_MCE))
21604 return;
21605
21606+ pax_open_kernel();
21607 machine_check_vector = pentium_machine_check;
21608+ pax_close_kernel();
21609 /* Make sure the vector pointer is visible before we enable MCEs: */
21610 wmb();
21611
21612diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21613index 44f1382..315b292 100644
21614--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21615+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21616@@ -11,6 +11,7 @@
21617 #include <asm/tlbflush.h>
21618 #include <asm/mce.h>
21619 #include <asm/msr.h>
21620+#include <asm/pgtable.h>
21621
21622 /* Machine check handler for WinChip C6: */
21623 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21624@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21625 {
21626 u32 lo, hi;
21627
21628+ pax_open_kernel();
21629 machine_check_vector = winchip_machine_check;
21630+ pax_close_kernel();
21631 /* Make sure the vector pointer is visible before we enable MCEs: */
21632 wmb();
21633
21634diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21635index 36a8361..e7058c2 100644
21636--- a/arch/x86/kernel/cpu/microcode/core.c
21637+++ b/arch/x86/kernel/cpu/microcode/core.c
21638@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21639 return NOTIFY_OK;
21640 }
21641
21642-static struct notifier_block __refdata mc_cpu_notifier = {
21643+static struct notifier_block mc_cpu_notifier = {
21644 .notifier_call = mc_cpu_callback,
21645 };
21646
21647diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21648index 746e7fd..8dc677e 100644
21649--- a/arch/x86/kernel/cpu/microcode/intel.c
21650+++ b/arch/x86/kernel/cpu/microcode/intel.c
21651@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21652
21653 static int get_ucode_user(void *to, const void *from, size_t n)
21654 {
21655- return copy_from_user(to, from, n);
21656+ return copy_from_user(to, (const void __force_user *)from, n);
21657 }
21658
21659 static enum ucode_state
21660 request_microcode_user(int cpu, const void __user *buf, size_t size)
21661 {
21662- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21663+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21664 }
21665
21666 static void microcode_fini_cpu(int cpu)
21667diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21668index ea5f363..cb0e905 100644
21669--- a/arch/x86/kernel/cpu/mtrr/main.c
21670+++ b/arch/x86/kernel/cpu/mtrr/main.c
21671@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21672 u64 size_or_mask, size_and_mask;
21673 static bool mtrr_aps_delayed_init;
21674
21675-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21676+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21677
21678 const struct mtrr_ops *mtrr_if;
21679
21680diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21681index df5e41f..816c719 100644
21682--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21683+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21684@@ -25,7 +25,7 @@ struct mtrr_ops {
21685 int (*validate_add_page)(unsigned long base, unsigned long size,
21686 unsigned int type);
21687 int (*have_wrcomb)(void);
21688-};
21689+} __do_const;
21690
21691 extern int generic_get_free_region(unsigned long base, unsigned long size,
21692 int replace_reg);
21693diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21694index b71a7f8..534af0e 100644
21695--- a/arch/x86/kernel/cpu/perf_event.c
21696+++ b/arch/x86/kernel/cpu/perf_event.c
21697@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
21698
21699 }
21700
21701-static struct attribute_group x86_pmu_format_group = {
21702+static attribute_group_no_const x86_pmu_format_group = {
21703 .name = "format",
21704 .attrs = NULL,
21705 };
21706@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
21707 NULL,
21708 };
21709
21710-static struct attribute_group x86_pmu_events_group = {
21711+static attribute_group_no_const x86_pmu_events_group = {
21712 .name = "events",
21713 .attrs = events_attr,
21714 };
21715@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
21716 if (idx > GDT_ENTRIES)
21717 return 0;
21718
21719- desc = raw_cpu_ptr(gdt_page.gdt);
21720+ desc = get_cpu_gdt_table(smp_processor_id());
21721 }
21722
21723 return get_desc_base(desc + idx);
21724@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21725 break;
21726
21727 perf_callchain_store(entry, frame.return_address);
21728- fp = frame.next_frame;
21729+ fp = (const void __force_user *)frame.next_frame;
21730 }
21731 }
21732
21733diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21734index 97242a9..cf9c30e 100644
21735--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21736+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21737@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21738 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21739 {
21740 struct attribute **attrs;
21741- struct attribute_group *attr_group;
21742+ attribute_group_no_const *attr_group;
21743 int i = 0, j;
21744
21745 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21746diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21747index 2589906..1ca1000 100644
21748--- a/arch/x86/kernel/cpu/perf_event_intel.c
21749+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21750@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21751 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21752
21753 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21754- u64 capabilities;
21755+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21756
21757- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21758- x86_pmu.intel_cap.capabilities = capabilities;
21759+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21760+ x86_pmu.intel_cap.capabilities = capabilities;
21761 }
21762
21763 intel_ds_init();
21764diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21765index 76d8cbe..e5f9681 100644
21766--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21767+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21768@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21769 NULL,
21770 };
21771
21772-static struct attribute_group rapl_pmu_events_group = {
21773+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21774 .name = "events",
21775 .attrs = NULL, /* patched at runtime */
21776 };
21777diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21778index c635b8b..b78835e 100644
21779--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21780+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21781@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21782 static int __init uncore_type_init(struct intel_uncore_type *type)
21783 {
21784 struct intel_uncore_pmu *pmus;
21785- struct attribute_group *attr_group;
21786+ attribute_group_no_const *attr_group;
21787 struct attribute **attrs;
21788 int i, j;
21789
21790diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21791index 6c8c1e7..515b98a 100644
21792--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21793+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21794@@ -114,7 +114,7 @@ struct intel_uncore_box {
21795 struct uncore_event_desc {
21796 struct kobj_attribute attr;
21797 const char *config;
21798-};
21799+} __do_const;
21800
21801 ssize_t uncore_event_show(struct kobject *kobj,
21802 struct kobj_attribute *attr, char *buf);
21803diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21804index 83741a7..bd3507d 100644
21805--- a/arch/x86/kernel/cpuid.c
21806+++ b/arch/x86/kernel/cpuid.c
21807@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21808 return notifier_from_errno(err);
21809 }
21810
21811-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21812+static struct notifier_block cpuid_class_cpu_notifier =
21813 {
21814 .notifier_call = cpuid_class_cpu_callback,
21815 };
21816diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21817index aceb2f9..c76d3e3 100644
21818--- a/arch/x86/kernel/crash.c
21819+++ b/arch/x86/kernel/crash.c
21820@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21821 #ifdef CONFIG_X86_32
21822 struct pt_regs fixed_regs;
21823
21824- if (!user_mode_vm(regs)) {
21825+ if (!user_mode(regs)) {
21826 crash_fixup_ss_esp(&fixed_regs, regs);
21827 regs = &fixed_regs;
21828 }
21829diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21830index afa64ad..dce67dd 100644
21831--- a/arch/x86/kernel/crash_dump_64.c
21832+++ b/arch/x86/kernel/crash_dump_64.c
21833@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21834 return -ENOMEM;
21835
21836 if (userbuf) {
21837- if (copy_to_user(buf, vaddr + offset, csize)) {
21838+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21839 iounmap(vaddr);
21840 return -EFAULT;
21841 }
21842diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21843index f6dfd93..892ade4 100644
21844--- a/arch/x86/kernel/doublefault.c
21845+++ b/arch/x86/kernel/doublefault.c
21846@@ -12,7 +12,7 @@
21847
21848 #define DOUBLEFAULT_STACKSIZE (1024)
21849 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21850-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21851+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21852
21853 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21854
21855@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21856 unsigned long gdt, tss;
21857
21858 native_store_gdt(&gdt_desc);
21859- gdt = gdt_desc.address;
21860+ gdt = (unsigned long)gdt_desc.address;
21861
21862 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21863
21864@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21865 /* 0x2 bit is always set */
21866 .flags = X86_EFLAGS_SF | 0x2,
21867 .sp = STACK_START,
21868- .es = __USER_DS,
21869+ .es = __KERNEL_DS,
21870 .cs = __KERNEL_CS,
21871 .ss = __KERNEL_DS,
21872- .ds = __USER_DS,
21873+ .ds = __KERNEL_DS,
21874 .fs = __KERNEL_PERCPU,
21875
21876 .__cr3 = __pa_nodebug(swapper_pg_dir),
21877diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21878index cf3df1d..b637d9a 100644
21879--- a/arch/x86/kernel/dumpstack.c
21880+++ b/arch/x86/kernel/dumpstack.c
21881@@ -2,6 +2,9 @@
21882 * Copyright (C) 1991, 1992 Linus Torvalds
21883 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21884 */
21885+#ifdef CONFIG_GRKERNSEC_HIDESYM
21886+#define __INCLUDED_BY_HIDESYM 1
21887+#endif
21888 #include <linux/kallsyms.h>
21889 #include <linux/kprobes.h>
21890 #include <linux/uaccess.h>
21891@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21892
21893 void printk_address(unsigned long address)
21894 {
21895- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21896+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21897 }
21898
21899 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21900 static void
21901 print_ftrace_graph_addr(unsigned long addr, void *data,
21902 const struct stacktrace_ops *ops,
21903- struct thread_info *tinfo, int *graph)
21904+ struct task_struct *task, int *graph)
21905 {
21906- struct task_struct *task;
21907 unsigned long ret_addr;
21908 int index;
21909
21910 if (addr != (unsigned long)return_to_handler)
21911 return;
21912
21913- task = tinfo->task;
21914 index = task->curr_ret_stack;
21915
21916 if (!task->ret_stack || index < *graph)
21917@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21918 static inline void
21919 print_ftrace_graph_addr(unsigned long addr, void *data,
21920 const struct stacktrace_ops *ops,
21921- struct thread_info *tinfo, int *graph)
21922+ struct task_struct *task, int *graph)
21923 { }
21924 #endif
21925
21926@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21927 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21928 */
21929
21930-static inline int valid_stack_ptr(struct thread_info *tinfo,
21931- void *p, unsigned int size, void *end)
21932+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21933 {
21934- void *t = tinfo;
21935 if (end) {
21936 if (p < end && p >= (end-THREAD_SIZE))
21937 return 1;
21938@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21939 }
21940
21941 unsigned long
21942-print_context_stack(struct thread_info *tinfo,
21943+print_context_stack(struct task_struct *task, void *stack_start,
21944 unsigned long *stack, unsigned long bp,
21945 const struct stacktrace_ops *ops, void *data,
21946 unsigned long *end, int *graph)
21947 {
21948 struct stack_frame *frame = (struct stack_frame *)bp;
21949
21950- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21951+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21952 unsigned long addr;
21953
21954 addr = *stack;
21955@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21956 } else {
21957 ops->address(data, addr, 0);
21958 }
21959- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21960+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21961 }
21962 stack++;
21963 }
21964@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21965 EXPORT_SYMBOL_GPL(print_context_stack);
21966
21967 unsigned long
21968-print_context_stack_bp(struct thread_info *tinfo,
21969+print_context_stack_bp(struct task_struct *task, void *stack_start,
21970 unsigned long *stack, unsigned long bp,
21971 const struct stacktrace_ops *ops, void *data,
21972 unsigned long *end, int *graph)
21973@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21974 struct stack_frame *frame = (struct stack_frame *)bp;
21975 unsigned long *ret_addr = &frame->return_address;
21976
21977- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21978+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21979 unsigned long addr = *ret_addr;
21980
21981 if (!__kernel_text_address(addr))
21982@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21983 ops->address(data, addr, 1);
21984 frame = frame->next_frame;
21985 ret_addr = &frame->return_address;
21986- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21987+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21988 }
21989
21990 return (unsigned long)frame;
21991@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21992 static void print_trace_address(void *data, unsigned long addr, int reliable)
21993 {
21994 touch_nmi_watchdog();
21995- printk(data);
21996+ printk("%s", (char *)data);
21997 printk_stack_address(addr, reliable);
21998 }
21999
22000@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22001 EXPORT_SYMBOL_GPL(oops_begin);
22002 NOKPROBE_SYMBOL(oops_begin);
22003
22004+extern void gr_handle_kernel_exploit(void);
22005+
22006 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22007 {
22008 if (regs && kexec_should_crash(current))
22009@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22010 panic("Fatal exception in interrupt");
22011 if (panic_on_oops)
22012 panic("Fatal exception");
22013- do_exit(signr);
22014+
22015+ gr_handle_kernel_exploit();
22016+
22017+ do_group_exit(signr);
22018 }
22019 NOKPROBE_SYMBOL(oops_end);
22020
22021@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22022 print_modules();
22023 show_regs(regs);
22024 #ifdef CONFIG_X86_32
22025- if (user_mode_vm(regs)) {
22026+ if (user_mode(regs)) {
22027 sp = regs->sp;
22028 ss = regs->ss & 0xffff;
22029 } else {
22030@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22031 unsigned long flags = oops_begin();
22032 int sig = SIGSEGV;
22033
22034- if (!user_mode_vm(regs))
22035+ if (!user_mode(regs))
22036 report_bug(regs->ip, regs);
22037
22038 if (__die(str, regs, err))
22039diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22040index 5abd4cd..c65733b 100644
22041--- a/arch/x86/kernel/dumpstack_32.c
22042+++ b/arch/x86/kernel/dumpstack_32.c
22043@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22044 bp = stack_frame(task, regs);
22045
22046 for (;;) {
22047- struct thread_info *context;
22048+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22049 void *end_stack;
22050
22051 end_stack = is_hardirq_stack(stack, cpu);
22052 if (!end_stack)
22053 end_stack = is_softirq_stack(stack, cpu);
22054
22055- context = task_thread_info(task);
22056- bp = ops->walk_stack(context, stack, bp, ops, data,
22057+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22058 end_stack, &graph);
22059
22060 /* Stop if not on irq stack */
22061@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22062 int i;
22063
22064 show_regs_print_info(KERN_EMERG);
22065- __show_regs(regs, !user_mode_vm(regs));
22066+ __show_regs(regs, !user_mode(regs));
22067
22068 /*
22069 * When in-kernel, we also print out the stack and code at the
22070 * time of the fault..
22071 */
22072- if (!user_mode_vm(regs)) {
22073+ if (!user_mode(regs)) {
22074 unsigned int code_prologue = code_bytes * 43 / 64;
22075 unsigned int code_len = code_bytes;
22076 unsigned char c;
22077 u8 *ip;
22078+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22079
22080 pr_emerg("Stack:\n");
22081 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22082
22083 pr_emerg("Code:");
22084
22085- ip = (u8 *)regs->ip - code_prologue;
22086+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22087 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22088 /* try starting at IP */
22089- ip = (u8 *)regs->ip;
22090+ ip = (u8 *)regs->ip + cs_base;
22091 code_len = code_len - code_prologue + 1;
22092 }
22093 for (i = 0; i < code_len; i++, ip++) {
22094@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22095 pr_cont(" Bad EIP value.");
22096 break;
22097 }
22098- if (ip == (u8 *)regs->ip)
22099+ if (ip == (u8 *)regs->ip + cs_base)
22100 pr_cont(" <%02x>", c);
22101 else
22102 pr_cont(" %02x", c);
22103@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22104 {
22105 unsigned short ud2;
22106
22107+ ip = ktla_ktva(ip);
22108 if (ip < PAGE_OFFSET)
22109 return 0;
22110 if (probe_kernel_address((unsigned short *)ip, ud2))
22111@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22112
22113 return ud2 == 0x0b0f;
22114 }
22115+
22116+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22117+void pax_check_alloca(unsigned long size)
22118+{
22119+ unsigned long sp = (unsigned long)&sp, stack_left;
22120+
22121+ /* all kernel stacks are of the same size */
22122+ stack_left = sp & (THREAD_SIZE - 1);
22123+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22124+}
22125+EXPORT_SYMBOL(pax_check_alloca);
22126+#endif
22127diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22128index ff86f19..73eabf4 100644
22129--- a/arch/x86/kernel/dumpstack_64.c
22130+++ b/arch/x86/kernel/dumpstack_64.c
22131@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22132 const struct stacktrace_ops *ops, void *data)
22133 {
22134 const unsigned cpu = get_cpu();
22135- struct thread_info *tinfo;
22136 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22137 unsigned long dummy;
22138 unsigned used = 0;
22139 int graph = 0;
22140 int done = 0;
22141+ void *stack_start;
22142
22143 if (!task)
22144 task = current;
22145@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22146 * current stack address. If the stacks consist of nested
22147 * exceptions
22148 */
22149- tinfo = task_thread_info(task);
22150 while (!done) {
22151 unsigned long *stack_end;
22152 enum stack_type stype;
22153@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22154 if (ops->stack(data, id) < 0)
22155 break;
22156
22157- bp = ops->walk_stack(tinfo, stack, bp, ops,
22158+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22159 data, stack_end, &graph);
22160 ops->stack(data, "<EOE>");
22161 /*
22162@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22163 * second-to-last pointer (index -2 to end) in the
22164 * exception stack:
22165 */
22166+ if ((u16)stack_end[-1] != __KERNEL_DS)
22167+ goto out;
22168 stack = (unsigned long *) stack_end[-2];
22169 done = 0;
22170 break;
22171@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22172
22173 if (ops->stack(data, "IRQ") < 0)
22174 break;
22175- bp = ops->walk_stack(tinfo, stack, bp,
22176+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22177 ops, data, stack_end, &graph);
22178 /*
22179 * We link to the next stack (which would be
22180@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22181 /*
22182 * This handles the process stack:
22183 */
22184- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22185+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22186+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22187+out:
22188 put_cpu();
22189 }
22190 EXPORT_SYMBOL(dump_trace);
22191@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22192 {
22193 unsigned short ud2;
22194
22195- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22196+ if (probe_kernel_address((unsigned short *)ip, ud2))
22197 return 0;
22198
22199 return ud2 == 0x0b0f;
22200 }
22201+
22202+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22203+void pax_check_alloca(unsigned long size)
22204+{
22205+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22206+ unsigned cpu, used;
22207+ char *id;
22208+
22209+ /* check the process stack first */
22210+ stack_start = (unsigned long)task_stack_page(current);
22211+ stack_end = stack_start + THREAD_SIZE;
22212+ if (likely(stack_start <= sp && sp < stack_end)) {
22213+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22214+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22215+ return;
22216+ }
22217+
22218+ cpu = get_cpu();
22219+
22220+ /* check the irq stacks */
22221+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22222+ stack_start = stack_end - IRQ_STACK_SIZE;
22223+ if (stack_start <= sp && sp < stack_end) {
22224+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22225+ put_cpu();
22226+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22227+ return;
22228+ }
22229+
22230+ /* check the exception stacks */
22231+ used = 0;
22232+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22233+ stack_start = stack_end - EXCEPTION_STKSZ;
22234+ if (stack_end && stack_start <= sp && sp < stack_end) {
22235+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22236+ put_cpu();
22237+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22238+ return;
22239+ }
22240+
22241+ put_cpu();
22242+
22243+ /* unknown stack */
22244+ BUG();
22245+}
22246+EXPORT_SYMBOL(pax_check_alloca);
22247+#endif
22248diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22249index 46201de..ebffabf 100644
22250--- a/arch/x86/kernel/e820.c
22251+++ b/arch/x86/kernel/e820.c
22252@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22253
22254 static void early_panic(char *msg)
22255 {
22256- early_printk(msg);
22257- panic(msg);
22258+ early_printk("%s", msg);
22259+ panic("%s", msg);
22260 }
22261
22262 static int userdef __initdata;
22263diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22264index a62536a..8444df4 100644
22265--- a/arch/x86/kernel/early_printk.c
22266+++ b/arch/x86/kernel/early_printk.c
22267@@ -7,6 +7,7 @@
22268 #include <linux/pci_regs.h>
22269 #include <linux/pci_ids.h>
22270 #include <linux/errno.h>
22271+#include <linux/sched.h>
22272 #include <asm/io.h>
22273 #include <asm/processor.h>
22274 #include <asm/fcntl.h>
22275diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22276index 31e2d5b..b31c76d 100644
22277--- a/arch/x86/kernel/entry_32.S
22278+++ b/arch/x86/kernel/entry_32.S
22279@@ -177,13 +177,154 @@
22280 /*CFI_REL_OFFSET gs, PT_GS*/
22281 .endm
22282 .macro SET_KERNEL_GS reg
22283+
22284+#ifdef CONFIG_CC_STACKPROTECTOR
22285 movl $(__KERNEL_STACK_CANARY), \reg
22286+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22287+ movl $(__USER_DS), \reg
22288+#else
22289+ xorl \reg, \reg
22290+#endif
22291+
22292 movl \reg, %gs
22293 .endm
22294
22295 #endif /* CONFIG_X86_32_LAZY_GS */
22296
22297-.macro SAVE_ALL
22298+.macro pax_enter_kernel
22299+#ifdef CONFIG_PAX_KERNEXEC
22300+ call pax_enter_kernel
22301+#endif
22302+.endm
22303+
22304+.macro pax_exit_kernel
22305+#ifdef CONFIG_PAX_KERNEXEC
22306+ call pax_exit_kernel
22307+#endif
22308+.endm
22309+
22310+#ifdef CONFIG_PAX_KERNEXEC
22311+ENTRY(pax_enter_kernel)
22312+#ifdef CONFIG_PARAVIRT
22313+ pushl %eax
22314+ pushl %ecx
22315+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22316+ mov %eax, %esi
22317+#else
22318+ mov %cr0, %esi
22319+#endif
22320+ bts $16, %esi
22321+ jnc 1f
22322+ mov %cs, %esi
22323+ cmp $__KERNEL_CS, %esi
22324+ jz 3f
22325+ ljmp $__KERNEL_CS, $3f
22326+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22327+2:
22328+#ifdef CONFIG_PARAVIRT
22329+ mov %esi, %eax
22330+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22331+#else
22332+ mov %esi, %cr0
22333+#endif
22334+3:
22335+#ifdef CONFIG_PARAVIRT
22336+ popl %ecx
22337+ popl %eax
22338+#endif
22339+ ret
22340+ENDPROC(pax_enter_kernel)
22341+
22342+ENTRY(pax_exit_kernel)
22343+#ifdef CONFIG_PARAVIRT
22344+ pushl %eax
22345+ pushl %ecx
22346+#endif
22347+ mov %cs, %esi
22348+ cmp $__KERNEXEC_KERNEL_CS, %esi
22349+ jnz 2f
22350+#ifdef CONFIG_PARAVIRT
22351+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22352+ mov %eax, %esi
22353+#else
22354+ mov %cr0, %esi
22355+#endif
22356+ btr $16, %esi
22357+ ljmp $__KERNEL_CS, $1f
22358+1:
22359+#ifdef CONFIG_PARAVIRT
22360+ mov %esi, %eax
22361+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22362+#else
22363+ mov %esi, %cr0
22364+#endif
22365+2:
22366+#ifdef CONFIG_PARAVIRT
22367+ popl %ecx
22368+ popl %eax
22369+#endif
22370+ ret
22371+ENDPROC(pax_exit_kernel)
22372+#endif
22373+
22374+ .macro pax_erase_kstack
22375+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22376+ call pax_erase_kstack
22377+#endif
22378+ .endm
22379+
22380+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22381+/*
22382+ * ebp: thread_info
22383+ */
22384+ENTRY(pax_erase_kstack)
22385+ pushl %edi
22386+ pushl %ecx
22387+ pushl %eax
22388+
22389+ mov TI_lowest_stack(%ebp), %edi
22390+ mov $-0xBEEF, %eax
22391+ std
22392+
22393+1: mov %edi, %ecx
22394+ and $THREAD_SIZE_asm - 1, %ecx
22395+ shr $2, %ecx
22396+ repne scasl
22397+ jecxz 2f
22398+
22399+ cmp $2*16, %ecx
22400+ jc 2f
22401+
22402+ mov $2*16, %ecx
22403+ repe scasl
22404+ jecxz 2f
22405+ jne 1b
22406+
22407+2: cld
22408+ or $2*4, %edi
22409+ mov %esp, %ecx
22410+ sub %edi, %ecx
22411+
22412+ cmp $THREAD_SIZE_asm, %ecx
22413+ jb 3f
22414+ ud2
22415+3:
22416+
22417+ shr $2, %ecx
22418+ rep stosl
22419+
22420+ mov TI_task_thread_sp0(%ebp), %edi
22421+ sub $128, %edi
22422+ mov %edi, TI_lowest_stack(%ebp)
22423+
22424+ popl %eax
22425+ popl %ecx
22426+ popl %edi
22427+ ret
22428+ENDPROC(pax_erase_kstack)
22429+#endif
22430+
22431+.macro __SAVE_ALL _DS
22432 cld
22433 PUSH_GS
22434 pushl_cfi %fs
22435@@ -206,7 +347,7 @@
22436 CFI_REL_OFFSET ecx, 0
22437 pushl_cfi %ebx
22438 CFI_REL_OFFSET ebx, 0
22439- movl $(__USER_DS), %edx
22440+ movl $\_DS, %edx
22441 movl %edx, %ds
22442 movl %edx, %es
22443 movl $(__KERNEL_PERCPU), %edx
22444@@ -214,6 +355,15 @@
22445 SET_KERNEL_GS %edx
22446 .endm
22447
22448+.macro SAVE_ALL
22449+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22450+ __SAVE_ALL __KERNEL_DS
22451+ pax_enter_kernel
22452+#else
22453+ __SAVE_ALL __USER_DS
22454+#endif
22455+.endm
22456+
22457 .macro RESTORE_INT_REGS
22458 popl_cfi %ebx
22459 CFI_RESTORE ebx
22460@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22461 popfl_cfi
22462 jmp syscall_exit
22463 CFI_ENDPROC
22464-END(ret_from_fork)
22465+ENDPROC(ret_from_fork)
22466
22467 ENTRY(ret_from_kernel_thread)
22468 CFI_STARTPROC
22469@@ -340,7 +490,15 @@ ret_from_intr:
22470 andl $SEGMENT_RPL_MASK, %eax
22471 #endif
22472 cmpl $USER_RPL, %eax
22473+
22474+#ifdef CONFIG_PAX_KERNEXEC
22475+ jae resume_userspace
22476+
22477+ pax_exit_kernel
22478+ jmp resume_kernel
22479+#else
22480 jb resume_kernel # not returning to v8086 or userspace
22481+#endif
22482
22483 ENTRY(resume_userspace)
22484 LOCKDEP_SYS_EXIT
22485@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22486 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22487 # int/exception return?
22488 jne work_pending
22489- jmp restore_all
22490-END(ret_from_exception)
22491+ jmp restore_all_pax
22492+ENDPROC(ret_from_exception)
22493
22494 #ifdef CONFIG_PREEMPT
22495 ENTRY(resume_kernel)
22496@@ -365,7 +523,7 @@ need_resched:
22497 jz restore_all
22498 call preempt_schedule_irq
22499 jmp need_resched
22500-END(resume_kernel)
22501+ENDPROC(resume_kernel)
22502 #endif
22503 CFI_ENDPROC
22504
22505@@ -395,30 +553,45 @@ sysenter_past_esp:
22506 /*CFI_REL_OFFSET cs, 0*/
22507 /*
22508 * Push current_thread_info()->sysenter_return to the stack.
22509- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22510- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22511 */
22512- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22513+ pushl_cfi $0
22514 CFI_REL_OFFSET eip, 0
22515
22516 pushl_cfi %eax
22517 SAVE_ALL
22518+ GET_THREAD_INFO(%ebp)
22519+ movl TI_sysenter_return(%ebp),%ebp
22520+ movl %ebp,PT_EIP(%esp)
22521 ENABLE_INTERRUPTS(CLBR_NONE)
22522
22523 /*
22524 * Load the potential sixth argument from user stack.
22525 * Careful about security.
22526 */
22527+ movl PT_OLDESP(%esp),%ebp
22528+
22529+#ifdef CONFIG_PAX_MEMORY_UDEREF
22530+ mov PT_OLDSS(%esp),%ds
22531+1: movl %ds:(%ebp),%ebp
22532+ push %ss
22533+ pop %ds
22534+#else
22535 cmpl $__PAGE_OFFSET-3,%ebp
22536 jae syscall_fault
22537 ASM_STAC
22538 1: movl (%ebp),%ebp
22539 ASM_CLAC
22540+#endif
22541+
22542 movl %ebp,PT_EBP(%esp)
22543 _ASM_EXTABLE(1b,syscall_fault)
22544
22545 GET_THREAD_INFO(%ebp)
22546
22547+#ifdef CONFIG_PAX_RANDKSTACK
22548+ pax_erase_kstack
22549+#endif
22550+
22551 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22552 jnz sysenter_audit
22553 sysenter_do_call:
22554@@ -434,12 +607,24 @@ sysenter_after_call:
22555 testl $_TIF_ALLWORK_MASK, %ecx
22556 jne sysexit_audit
22557 sysenter_exit:
22558+
22559+#ifdef CONFIG_PAX_RANDKSTACK
22560+ pushl_cfi %eax
22561+ movl %esp, %eax
22562+ call pax_randomize_kstack
22563+ popl_cfi %eax
22564+#endif
22565+
22566+ pax_erase_kstack
22567+
22568 /* if something modifies registers it must also disable sysexit */
22569 movl PT_EIP(%esp), %edx
22570 movl PT_OLDESP(%esp), %ecx
22571 xorl %ebp,%ebp
22572 TRACE_IRQS_ON
22573 1: mov PT_FS(%esp), %fs
22574+2: mov PT_DS(%esp), %ds
22575+3: mov PT_ES(%esp), %es
22576 PTGS_TO_GS
22577 ENABLE_INTERRUPTS_SYSEXIT
22578
22579@@ -453,6 +638,9 @@ sysenter_audit:
22580 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22581 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22582 call __audit_syscall_entry
22583+
22584+ pax_erase_kstack
22585+
22586 popl_cfi %ecx /* get that remapped edx off the stack */
22587 popl_cfi %ecx /* get that remapped esi off the stack */
22588 movl PT_EAX(%esp),%eax /* reload syscall number */
22589@@ -479,10 +667,16 @@ sysexit_audit:
22590
22591 CFI_ENDPROC
22592 .pushsection .fixup,"ax"
22593-2: movl $0,PT_FS(%esp)
22594+4: movl $0,PT_FS(%esp)
22595+ jmp 1b
22596+5: movl $0,PT_DS(%esp)
22597+ jmp 1b
22598+6: movl $0,PT_ES(%esp)
22599 jmp 1b
22600 .popsection
22601- _ASM_EXTABLE(1b,2b)
22602+ _ASM_EXTABLE(1b,4b)
22603+ _ASM_EXTABLE(2b,5b)
22604+ _ASM_EXTABLE(3b,6b)
22605 PTGS_TO_GS_EX
22606 ENDPROC(ia32_sysenter_target)
22607
22608@@ -493,6 +687,11 @@ ENTRY(system_call)
22609 pushl_cfi %eax # save orig_eax
22610 SAVE_ALL
22611 GET_THREAD_INFO(%ebp)
22612+
22613+#ifdef CONFIG_PAX_RANDKSTACK
22614+ pax_erase_kstack
22615+#endif
22616+
22617 # system call tracing in operation / emulation
22618 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22619 jnz syscall_trace_entry
22620@@ -512,6 +711,15 @@ syscall_exit:
22621 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22622 jne syscall_exit_work
22623
22624+restore_all_pax:
22625+
22626+#ifdef CONFIG_PAX_RANDKSTACK
22627+ movl %esp, %eax
22628+ call pax_randomize_kstack
22629+#endif
22630+
22631+ pax_erase_kstack
22632+
22633 restore_all:
22634 TRACE_IRQS_IRET
22635 restore_all_notrace:
22636@@ -566,14 +774,34 @@ ldt_ss:
22637 * compensating for the offset by changing to the ESPFIX segment with
22638 * a base address that matches for the difference.
22639 */
22640-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22641+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22642 mov %esp, %edx /* load kernel esp */
22643 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22644 mov %dx, %ax /* eax: new kernel esp */
22645 sub %eax, %edx /* offset (low word is 0) */
22646+#ifdef CONFIG_SMP
22647+ movl PER_CPU_VAR(cpu_number), %ebx
22648+ shll $PAGE_SHIFT_asm, %ebx
22649+ addl $cpu_gdt_table, %ebx
22650+#else
22651+ movl $cpu_gdt_table, %ebx
22652+#endif
22653 shr $16, %edx
22654- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22655- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22656+
22657+#ifdef CONFIG_PAX_KERNEXEC
22658+ mov %cr0, %esi
22659+ btr $16, %esi
22660+ mov %esi, %cr0
22661+#endif
22662+
22663+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22664+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22665+
22666+#ifdef CONFIG_PAX_KERNEXEC
22667+ bts $16, %esi
22668+ mov %esi, %cr0
22669+#endif
22670+
22671 pushl_cfi $__ESPFIX_SS
22672 pushl_cfi %eax /* new kernel esp */
22673 /* Disable interrupts, but do not irqtrace this section: we
22674@@ -603,20 +831,18 @@ work_resched:
22675 movl TI_flags(%ebp), %ecx
22676 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22677 # than syscall tracing?
22678- jz restore_all
22679+ jz restore_all_pax
22680 testb $_TIF_NEED_RESCHED, %cl
22681 jnz work_resched
22682
22683 work_notifysig: # deal with pending signals and
22684 # notify-resume requests
22685+ movl %esp, %eax
22686 #ifdef CONFIG_VM86
22687 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22688- movl %esp, %eax
22689 jne work_notifysig_v86 # returning to kernel-space or
22690 # vm86-space
22691 1:
22692-#else
22693- movl %esp, %eax
22694 #endif
22695 TRACE_IRQS_ON
22696 ENABLE_INTERRUPTS(CLBR_NONE)
22697@@ -637,7 +863,7 @@ work_notifysig_v86:
22698 movl %eax, %esp
22699 jmp 1b
22700 #endif
22701-END(work_pending)
22702+ENDPROC(work_pending)
22703
22704 # perform syscall exit tracing
22705 ALIGN
22706@@ -645,11 +871,14 @@ syscall_trace_entry:
22707 movl $-ENOSYS,PT_EAX(%esp)
22708 movl %esp, %eax
22709 call syscall_trace_enter
22710+
22711+ pax_erase_kstack
22712+
22713 /* What it returned is what we'll actually use. */
22714 cmpl $(NR_syscalls), %eax
22715 jnae syscall_call
22716 jmp syscall_exit
22717-END(syscall_trace_entry)
22718+ENDPROC(syscall_trace_entry)
22719
22720 # perform syscall exit tracing
22721 ALIGN
22722@@ -662,26 +891,30 @@ syscall_exit_work:
22723 movl %esp, %eax
22724 call syscall_trace_leave
22725 jmp resume_userspace
22726-END(syscall_exit_work)
22727+ENDPROC(syscall_exit_work)
22728 CFI_ENDPROC
22729
22730 RING0_INT_FRAME # can't unwind into user space anyway
22731 syscall_fault:
22732+#ifdef CONFIG_PAX_MEMORY_UDEREF
22733+ push %ss
22734+ pop %ds
22735+#endif
22736 ASM_CLAC
22737 GET_THREAD_INFO(%ebp)
22738 movl $-EFAULT,PT_EAX(%esp)
22739 jmp resume_userspace
22740-END(syscall_fault)
22741+ENDPROC(syscall_fault)
22742
22743 syscall_badsys:
22744 movl $-ENOSYS,%eax
22745 jmp syscall_after_call
22746-END(syscall_badsys)
22747+ENDPROC(syscall_badsys)
22748
22749 sysenter_badsys:
22750 movl $-ENOSYS,%eax
22751 jmp sysenter_after_call
22752-END(sysenter_badsys)
22753+ENDPROC(sysenter_badsys)
22754 CFI_ENDPROC
22755
22756 .macro FIXUP_ESPFIX_STACK
22757@@ -694,8 +927,15 @@ END(sysenter_badsys)
22758 */
22759 #ifdef CONFIG_X86_ESPFIX32
22760 /* fixup the stack */
22761- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22762- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22763+#ifdef CONFIG_SMP
22764+ movl PER_CPU_VAR(cpu_number), %ebx
22765+ shll $PAGE_SHIFT_asm, %ebx
22766+ addl $cpu_gdt_table, %ebx
22767+#else
22768+ movl $cpu_gdt_table, %ebx
22769+#endif
22770+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22771+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22772 shl $16, %eax
22773 addl %esp, %eax /* the adjusted stack pointer */
22774 pushl_cfi $__KERNEL_DS
22775@@ -751,7 +991,7 @@ vector=vector+1
22776 .endr
22777 2: jmp common_interrupt
22778 .endr
22779-END(irq_entries_start)
22780+ENDPROC(irq_entries_start)
22781
22782 .previous
22783 END(interrupt)
22784@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22785 pushl_cfi $do_coprocessor_error
22786 jmp error_code
22787 CFI_ENDPROC
22788-END(coprocessor_error)
22789+ENDPROC(coprocessor_error)
22790
22791 ENTRY(simd_coprocessor_error)
22792 RING0_INT_FRAME
22793@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22794 .section .altinstructions,"a"
22795 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22796 .previous
22797-.section .altinstr_replacement,"ax"
22798+.section .altinstr_replacement,"a"
22799 663: pushl $do_simd_coprocessor_error
22800 664:
22801 .previous
22802@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22803 #endif
22804 jmp error_code
22805 CFI_ENDPROC
22806-END(simd_coprocessor_error)
22807+ENDPROC(simd_coprocessor_error)
22808
22809 ENTRY(device_not_available)
22810 RING0_INT_FRAME
22811@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22812 pushl_cfi $do_device_not_available
22813 jmp error_code
22814 CFI_ENDPROC
22815-END(device_not_available)
22816+ENDPROC(device_not_available)
22817
22818 #ifdef CONFIG_PARAVIRT
22819 ENTRY(native_iret)
22820 iret
22821 _ASM_EXTABLE(native_iret, iret_exc)
22822-END(native_iret)
22823+ENDPROC(native_iret)
22824
22825 ENTRY(native_irq_enable_sysexit)
22826 sti
22827 sysexit
22828-END(native_irq_enable_sysexit)
22829+ENDPROC(native_irq_enable_sysexit)
22830 #endif
22831
22832 ENTRY(overflow)
22833@@ -860,7 +1100,7 @@ ENTRY(overflow)
22834 pushl_cfi $do_overflow
22835 jmp error_code
22836 CFI_ENDPROC
22837-END(overflow)
22838+ENDPROC(overflow)
22839
22840 ENTRY(bounds)
22841 RING0_INT_FRAME
22842@@ -869,7 +1109,7 @@ ENTRY(bounds)
22843 pushl_cfi $do_bounds
22844 jmp error_code
22845 CFI_ENDPROC
22846-END(bounds)
22847+ENDPROC(bounds)
22848
22849 ENTRY(invalid_op)
22850 RING0_INT_FRAME
22851@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22852 pushl_cfi $do_invalid_op
22853 jmp error_code
22854 CFI_ENDPROC
22855-END(invalid_op)
22856+ENDPROC(invalid_op)
22857
22858 ENTRY(coprocessor_segment_overrun)
22859 RING0_INT_FRAME
22860@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22861 pushl_cfi $do_coprocessor_segment_overrun
22862 jmp error_code
22863 CFI_ENDPROC
22864-END(coprocessor_segment_overrun)
22865+ENDPROC(coprocessor_segment_overrun)
22866
22867 ENTRY(invalid_TSS)
22868 RING0_EC_FRAME
22869@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22870 pushl_cfi $do_invalid_TSS
22871 jmp error_code
22872 CFI_ENDPROC
22873-END(invalid_TSS)
22874+ENDPROC(invalid_TSS)
22875
22876 ENTRY(segment_not_present)
22877 RING0_EC_FRAME
22878@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22879 pushl_cfi $do_segment_not_present
22880 jmp error_code
22881 CFI_ENDPROC
22882-END(segment_not_present)
22883+ENDPROC(segment_not_present)
22884
22885 ENTRY(stack_segment)
22886 RING0_EC_FRAME
22887@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22888 pushl_cfi $do_stack_segment
22889 jmp error_code
22890 CFI_ENDPROC
22891-END(stack_segment)
22892+ENDPROC(stack_segment)
22893
22894 ENTRY(alignment_check)
22895 RING0_EC_FRAME
22896@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22897 pushl_cfi $do_alignment_check
22898 jmp error_code
22899 CFI_ENDPROC
22900-END(alignment_check)
22901+ENDPROC(alignment_check)
22902
22903 ENTRY(divide_error)
22904 RING0_INT_FRAME
22905@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22906 pushl_cfi $do_divide_error
22907 jmp error_code
22908 CFI_ENDPROC
22909-END(divide_error)
22910+ENDPROC(divide_error)
22911
22912 #ifdef CONFIG_X86_MCE
22913 ENTRY(machine_check)
22914@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22915 pushl_cfi machine_check_vector
22916 jmp error_code
22917 CFI_ENDPROC
22918-END(machine_check)
22919+ENDPROC(machine_check)
22920 #endif
22921
22922 ENTRY(spurious_interrupt_bug)
22923@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22924 pushl_cfi $do_spurious_interrupt_bug
22925 jmp error_code
22926 CFI_ENDPROC
22927-END(spurious_interrupt_bug)
22928+ENDPROC(spurious_interrupt_bug)
22929
22930 #ifdef CONFIG_XEN
22931 /* Xen doesn't set %esp to be precisely what the normal sysenter
22932@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22933
22934 ENTRY(mcount)
22935 ret
22936-END(mcount)
22937+ENDPROC(mcount)
22938
22939 ENTRY(ftrace_caller)
22940 pushl %eax
22941@@ -1087,7 +1327,7 @@ ftrace_graph_call:
22942 .globl ftrace_stub
22943 ftrace_stub:
22944 ret
22945-END(ftrace_caller)
22946+ENDPROC(ftrace_caller)
22947
22948 ENTRY(ftrace_regs_caller)
22949 pushf /* push flags before compare (in cs location) */
22950@@ -1185,7 +1425,7 @@ trace:
22951 popl %ecx
22952 popl %eax
22953 jmp ftrace_stub
22954-END(mcount)
22955+ENDPROC(mcount)
22956 #endif /* CONFIG_DYNAMIC_FTRACE */
22957 #endif /* CONFIG_FUNCTION_TRACER */
22958
22959@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
22960 popl %ecx
22961 popl %eax
22962 ret
22963-END(ftrace_graph_caller)
22964+ENDPROC(ftrace_graph_caller)
22965
22966 .globl return_to_handler
22967 return_to_handler:
22968@@ -1264,15 +1504,18 @@ error_code:
22969 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22970 REG_TO_PTGS %ecx
22971 SET_KERNEL_GS %ecx
22972- movl $(__USER_DS), %ecx
22973+ movl $(__KERNEL_DS), %ecx
22974 movl %ecx, %ds
22975 movl %ecx, %es
22976+
22977+ pax_enter_kernel
22978+
22979 TRACE_IRQS_OFF
22980 movl %esp,%eax # pt_regs pointer
22981 call *%edi
22982 jmp ret_from_exception
22983 CFI_ENDPROC
22984-END(page_fault)
22985+ENDPROC(page_fault)
22986
22987 /*
22988 * Debug traps and NMI can happen at the one SYSENTER instruction
22989@@ -1315,7 +1558,7 @@ debug_stack_correct:
22990 call do_debug
22991 jmp ret_from_exception
22992 CFI_ENDPROC
22993-END(debug)
22994+ENDPROC(debug)
22995
22996 /*
22997 * NMI is doubly nasty. It can happen _while_ we're handling
22998@@ -1355,6 +1598,9 @@ nmi_stack_correct:
22999 xorl %edx,%edx # zero error code
23000 movl %esp,%eax # pt_regs pointer
23001 call do_nmi
23002+
23003+ pax_exit_kernel
23004+
23005 jmp restore_all_notrace
23006 CFI_ENDPROC
23007
23008@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
23009 FIXUP_ESPFIX_STACK # %eax == %esp
23010 xorl %edx,%edx # zero error code
23011 call do_nmi
23012+
23013+ pax_exit_kernel
23014+
23015 RESTORE_REGS
23016 lss 12+4(%esp), %esp # back to espfix stack
23017 CFI_ADJUST_CFA_OFFSET -24
23018 jmp irq_return
23019 #endif
23020 CFI_ENDPROC
23021-END(nmi)
23022+ENDPROC(nmi)
23023
23024 ENTRY(int3)
23025 RING0_INT_FRAME
23026@@ -1411,14 +1660,14 @@ ENTRY(int3)
23027 call do_int3
23028 jmp ret_from_exception
23029 CFI_ENDPROC
23030-END(int3)
23031+ENDPROC(int3)
23032
23033 ENTRY(general_protection)
23034 RING0_EC_FRAME
23035 pushl_cfi $do_general_protection
23036 jmp error_code
23037 CFI_ENDPROC
23038-END(general_protection)
23039+ENDPROC(general_protection)
23040
23041 #ifdef CONFIG_KVM_GUEST
23042 ENTRY(async_page_fault)
23043@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
23044 pushl_cfi $do_async_page_fault
23045 jmp error_code
23046 CFI_ENDPROC
23047-END(async_page_fault)
23048+ENDPROC(async_page_fault)
23049 #endif
23050
23051diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23052index f0095a7..ec77893 100644
23053--- a/arch/x86/kernel/entry_64.S
23054+++ b/arch/x86/kernel/entry_64.S
23055@@ -59,6 +59,8 @@
23056 #include <asm/smap.h>
23057 #include <asm/pgtable_types.h>
23058 #include <linux/err.h>
23059+#include <asm/pgtable.h>
23060+#include <asm/alternative-asm.h>
23061
23062 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23063 #include <linux/elf-em.h>
23064@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23065 ENDPROC(native_usergs_sysret64)
23066 #endif /* CONFIG_PARAVIRT */
23067
23068+ .macro ljmpq sel, off
23069+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23070+ .byte 0x48; ljmp *1234f(%rip)
23071+ .pushsection .rodata
23072+ .align 16
23073+ 1234: .quad \off; .word \sel
23074+ .popsection
23075+#else
23076+ pushq $\sel
23077+ pushq $\off
23078+ lretq
23079+#endif
23080+ .endm
23081+
23082+ .macro pax_enter_kernel
23083+ pax_set_fptr_mask
23084+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23085+ call pax_enter_kernel
23086+#endif
23087+ .endm
23088+
23089+ .macro pax_exit_kernel
23090+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23091+ call pax_exit_kernel
23092+#endif
23093+
23094+ .endm
23095+
23096+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23097+ENTRY(pax_enter_kernel)
23098+ pushq %rdi
23099+
23100+#ifdef CONFIG_PARAVIRT
23101+ PV_SAVE_REGS(CLBR_RDI)
23102+#endif
23103+
23104+#ifdef CONFIG_PAX_KERNEXEC
23105+ GET_CR0_INTO_RDI
23106+ bts $16,%rdi
23107+ jnc 3f
23108+ mov %cs,%edi
23109+ cmp $__KERNEL_CS,%edi
23110+ jnz 2f
23111+1:
23112+#endif
23113+
23114+#ifdef CONFIG_PAX_MEMORY_UDEREF
23115+ 661: jmp 111f
23116+ .pushsection .altinstr_replacement, "a"
23117+ 662: ASM_NOP2
23118+ .popsection
23119+ .pushsection .altinstructions, "a"
23120+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23121+ .popsection
23122+ GET_CR3_INTO_RDI
23123+ cmp $0,%dil
23124+ jnz 112f
23125+ mov $__KERNEL_DS,%edi
23126+ mov %edi,%ss
23127+ jmp 111f
23128+112: cmp $1,%dil
23129+ jz 113f
23130+ ud2
23131+113: sub $4097,%rdi
23132+ bts $63,%rdi
23133+ SET_RDI_INTO_CR3
23134+ mov $__UDEREF_KERNEL_DS,%edi
23135+ mov %edi,%ss
23136+111:
23137+#endif
23138+
23139+#ifdef CONFIG_PARAVIRT
23140+ PV_RESTORE_REGS(CLBR_RDI)
23141+#endif
23142+
23143+ popq %rdi
23144+ pax_force_retaddr
23145+ retq
23146+
23147+#ifdef CONFIG_PAX_KERNEXEC
23148+2: ljmpq __KERNEL_CS,1b
23149+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23150+4: SET_RDI_INTO_CR0
23151+ jmp 1b
23152+#endif
23153+ENDPROC(pax_enter_kernel)
23154+
23155+ENTRY(pax_exit_kernel)
23156+ pushq %rdi
23157+
23158+#ifdef CONFIG_PARAVIRT
23159+ PV_SAVE_REGS(CLBR_RDI)
23160+#endif
23161+
23162+#ifdef CONFIG_PAX_KERNEXEC
23163+ mov %cs,%rdi
23164+ cmp $__KERNEXEC_KERNEL_CS,%edi
23165+ jz 2f
23166+ GET_CR0_INTO_RDI
23167+ bts $16,%rdi
23168+ jnc 4f
23169+1:
23170+#endif
23171+
23172+#ifdef CONFIG_PAX_MEMORY_UDEREF
23173+ 661: jmp 111f
23174+ .pushsection .altinstr_replacement, "a"
23175+ 662: ASM_NOP2
23176+ .popsection
23177+ .pushsection .altinstructions, "a"
23178+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23179+ .popsection
23180+ mov %ss,%edi
23181+ cmp $__UDEREF_KERNEL_DS,%edi
23182+ jnz 111f
23183+ GET_CR3_INTO_RDI
23184+ cmp $0,%dil
23185+ jz 112f
23186+ ud2
23187+112: add $4097,%rdi
23188+ bts $63,%rdi
23189+ SET_RDI_INTO_CR3
23190+ mov $__KERNEL_DS,%edi
23191+ mov %edi,%ss
23192+111:
23193+#endif
23194+
23195+#ifdef CONFIG_PARAVIRT
23196+ PV_RESTORE_REGS(CLBR_RDI);
23197+#endif
23198+
23199+ popq %rdi
23200+ pax_force_retaddr
23201+ retq
23202+
23203+#ifdef CONFIG_PAX_KERNEXEC
23204+2: GET_CR0_INTO_RDI
23205+ btr $16,%rdi
23206+ jnc 4f
23207+ ljmpq __KERNEL_CS,3f
23208+3: SET_RDI_INTO_CR0
23209+ jmp 1b
23210+4: ud2
23211+ jmp 4b
23212+#endif
23213+ENDPROC(pax_exit_kernel)
23214+#endif
23215+
23216+ .macro pax_enter_kernel_user
23217+ pax_set_fptr_mask
23218+#ifdef CONFIG_PAX_MEMORY_UDEREF
23219+ call pax_enter_kernel_user
23220+#endif
23221+ .endm
23222+
23223+ .macro pax_exit_kernel_user
23224+#ifdef CONFIG_PAX_MEMORY_UDEREF
23225+ call pax_exit_kernel_user
23226+#endif
23227+#ifdef CONFIG_PAX_RANDKSTACK
23228+ pushq %rax
23229+ pushq %r11
23230+ call pax_randomize_kstack
23231+ popq %r11
23232+ popq %rax
23233+#endif
23234+ .endm
23235+
23236+#ifdef CONFIG_PAX_MEMORY_UDEREF
23237+ENTRY(pax_enter_kernel_user)
23238+ pushq %rdi
23239+ pushq %rbx
23240+
23241+#ifdef CONFIG_PARAVIRT
23242+ PV_SAVE_REGS(CLBR_RDI)
23243+#endif
23244+
23245+ 661: jmp 111f
23246+ .pushsection .altinstr_replacement, "a"
23247+ 662: ASM_NOP2
23248+ .popsection
23249+ .pushsection .altinstructions, "a"
23250+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23251+ .popsection
23252+ GET_CR3_INTO_RDI
23253+ cmp $1,%dil
23254+ jnz 4f
23255+ sub $4097,%rdi
23256+ bts $63,%rdi
23257+ SET_RDI_INTO_CR3
23258+ jmp 3f
23259+111:
23260+
23261+ GET_CR3_INTO_RDI
23262+ mov %rdi,%rbx
23263+ add $__START_KERNEL_map,%rbx
23264+ sub phys_base(%rip),%rbx
23265+
23266+#ifdef CONFIG_PARAVIRT
23267+ cmpl $0, pv_info+PARAVIRT_enabled
23268+ jz 1f
23269+ pushq %rdi
23270+ i = 0
23271+ .rept USER_PGD_PTRS
23272+ mov i*8(%rbx),%rsi
23273+ mov $0,%sil
23274+ lea i*8(%rbx),%rdi
23275+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23276+ i = i + 1
23277+ .endr
23278+ popq %rdi
23279+ jmp 2f
23280+1:
23281+#endif
23282+
23283+ i = 0
23284+ .rept USER_PGD_PTRS
23285+ movb $0,i*8(%rbx)
23286+ i = i + 1
23287+ .endr
23288+
23289+2: SET_RDI_INTO_CR3
23290+
23291+#ifdef CONFIG_PAX_KERNEXEC
23292+ GET_CR0_INTO_RDI
23293+ bts $16,%rdi
23294+ SET_RDI_INTO_CR0
23295+#endif
23296+
23297+3:
23298+
23299+#ifdef CONFIG_PARAVIRT
23300+ PV_RESTORE_REGS(CLBR_RDI)
23301+#endif
23302+
23303+ popq %rbx
23304+ popq %rdi
23305+ pax_force_retaddr
23306+ retq
23307+4: ud2
23308+ENDPROC(pax_enter_kernel_user)
23309+
23310+ENTRY(pax_exit_kernel_user)
23311+ pushq %rdi
23312+ pushq %rbx
23313+
23314+#ifdef CONFIG_PARAVIRT
23315+ PV_SAVE_REGS(CLBR_RDI)
23316+#endif
23317+
23318+ GET_CR3_INTO_RDI
23319+ 661: jmp 1f
23320+ .pushsection .altinstr_replacement, "a"
23321+ 662: ASM_NOP2
23322+ .popsection
23323+ .pushsection .altinstructions, "a"
23324+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23325+ .popsection
23326+ cmp $0,%dil
23327+ jnz 3f
23328+ add $4097,%rdi
23329+ bts $63,%rdi
23330+ SET_RDI_INTO_CR3
23331+ jmp 2f
23332+1:
23333+
23334+ mov %rdi,%rbx
23335+
23336+#ifdef CONFIG_PAX_KERNEXEC
23337+ GET_CR0_INTO_RDI
23338+ btr $16,%rdi
23339+ jnc 3f
23340+ SET_RDI_INTO_CR0
23341+#endif
23342+
23343+ add $__START_KERNEL_map,%rbx
23344+ sub phys_base(%rip),%rbx
23345+
23346+#ifdef CONFIG_PARAVIRT
23347+ cmpl $0, pv_info+PARAVIRT_enabled
23348+ jz 1f
23349+ i = 0
23350+ .rept USER_PGD_PTRS
23351+ mov i*8(%rbx),%rsi
23352+ mov $0x67,%sil
23353+ lea i*8(%rbx),%rdi
23354+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23355+ i = i + 1
23356+ .endr
23357+ jmp 2f
23358+1:
23359+#endif
23360+
23361+ i = 0
23362+ .rept USER_PGD_PTRS
23363+ movb $0x67,i*8(%rbx)
23364+ i = i + 1
23365+ .endr
23366+2:
23367+
23368+#ifdef CONFIG_PARAVIRT
23369+ PV_RESTORE_REGS(CLBR_RDI)
23370+#endif
23371+
23372+ popq %rbx
23373+ popq %rdi
23374+ pax_force_retaddr
23375+ retq
23376+3: ud2
23377+ENDPROC(pax_exit_kernel_user)
23378+#endif
23379+
23380+ .macro pax_enter_kernel_nmi
23381+ pax_set_fptr_mask
23382+
23383+#ifdef CONFIG_PAX_KERNEXEC
23384+ GET_CR0_INTO_RDI
23385+ bts $16,%rdi
23386+ jc 110f
23387+ SET_RDI_INTO_CR0
23388+ or $2,%ebx
23389+110:
23390+#endif
23391+
23392+#ifdef CONFIG_PAX_MEMORY_UDEREF
23393+ 661: jmp 111f
23394+ .pushsection .altinstr_replacement, "a"
23395+ 662: ASM_NOP2
23396+ .popsection
23397+ .pushsection .altinstructions, "a"
23398+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23399+ .popsection
23400+ GET_CR3_INTO_RDI
23401+ cmp $0,%dil
23402+ jz 111f
23403+ sub $4097,%rdi
23404+ or $4,%ebx
23405+ bts $63,%rdi
23406+ SET_RDI_INTO_CR3
23407+ mov $__UDEREF_KERNEL_DS,%edi
23408+ mov %edi,%ss
23409+111:
23410+#endif
23411+ .endm
23412+
23413+ .macro pax_exit_kernel_nmi
23414+#ifdef CONFIG_PAX_KERNEXEC
23415+ btr $1,%ebx
23416+ jnc 110f
23417+ GET_CR0_INTO_RDI
23418+ btr $16,%rdi
23419+ SET_RDI_INTO_CR0
23420+110:
23421+#endif
23422+
23423+#ifdef CONFIG_PAX_MEMORY_UDEREF
23424+ btr $2,%ebx
23425+ jnc 111f
23426+ GET_CR3_INTO_RDI
23427+ add $4097,%rdi
23428+ bts $63,%rdi
23429+ SET_RDI_INTO_CR3
23430+ mov $__KERNEL_DS,%edi
23431+ mov %edi,%ss
23432+111:
23433+#endif
23434+ .endm
23435+
23436+ .macro pax_erase_kstack
23437+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23438+ call pax_erase_kstack
23439+#endif
23440+ .endm
23441+
23442+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23443+ENTRY(pax_erase_kstack)
23444+ pushq %rdi
23445+ pushq %rcx
23446+ pushq %rax
23447+ pushq %r11
23448+
23449+ GET_THREAD_INFO(%r11)
23450+ mov TI_lowest_stack(%r11), %rdi
23451+ mov $-0xBEEF, %rax
23452+ std
23453+
23454+1: mov %edi, %ecx
23455+ and $THREAD_SIZE_asm - 1, %ecx
23456+ shr $3, %ecx
23457+ repne scasq
23458+ jecxz 2f
23459+
23460+ cmp $2*8, %ecx
23461+ jc 2f
23462+
23463+ mov $2*8, %ecx
23464+ repe scasq
23465+ jecxz 2f
23466+ jne 1b
23467+
23468+2: cld
23469+ or $2*8, %rdi
23470+ mov %esp, %ecx
23471+ sub %edi, %ecx
23472+
23473+ cmp $THREAD_SIZE_asm, %rcx
23474+ jb 3f
23475+ ud2
23476+3:
23477+
23478+ shr $3, %ecx
23479+ rep stosq
23480+
23481+ mov TI_task_thread_sp0(%r11), %rdi
23482+ sub $256, %rdi
23483+ mov %rdi, TI_lowest_stack(%r11)
23484+
23485+ popq %r11
23486+ popq %rax
23487+ popq %rcx
23488+ popq %rdi
23489+ pax_force_retaddr
23490+ ret
23491+ENDPROC(pax_erase_kstack)
23492+#endif
23493
23494 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23495 #ifdef CONFIG_TRACE_IRQFLAGS
23496@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23497 .endm
23498
23499 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23500- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23501+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23502 jnc 1f
23503 TRACE_IRQS_ON_DEBUG
23504 1:
23505@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
23506 js 1f /* negative -> in kernel */
23507 SWAPGS
23508 xorl %ebx,%ebx
23509-1: ret
23510+1:
23511+#ifdef CONFIG_PAX_MEMORY_UDEREF
23512+ testb $3, CS+8(%rsp)
23513+ jnz 1f
23514+ pax_enter_kernel
23515+ jmp 2f
23516+1: pax_enter_kernel_user
23517+2:
23518+#else
23519+ pax_enter_kernel
23520+#endif
23521+ pax_force_retaddr
23522+ ret
23523 CFI_ENDPROC
23524-END(save_paranoid)
23525+ENDPROC(save_paranoid)
23526+
23527+ENTRY(save_paranoid_nmi)
23528+ XCPT_FRAME 1 RDI+8
23529+ cld
23530+ movq_cfi rdi, RDI+8
23531+ movq_cfi rsi, RSI+8
23532+ movq_cfi rdx, RDX+8
23533+ movq_cfi rcx, RCX+8
23534+ movq_cfi rax, RAX+8
23535+ movq_cfi r8, R8+8
23536+ movq_cfi r9, R9+8
23537+ movq_cfi r10, R10+8
23538+ movq_cfi r11, R11+8
23539+ movq_cfi rbx, RBX+8
23540+ movq_cfi rbp, RBP+8
23541+ movq_cfi r12, R12+8
23542+ movq_cfi r13, R13+8
23543+ movq_cfi r14, R14+8
23544+ movq_cfi r15, R15+8
23545+ movl $1,%ebx
23546+ movl $MSR_GS_BASE,%ecx
23547+ rdmsr
23548+ testl %edx,%edx
23549+ js 1f /* negative -> in kernel */
23550+ SWAPGS
23551+ xorl %ebx,%ebx
23552+1: pax_enter_kernel_nmi
23553+ pax_force_retaddr
23554+ ret
23555+ CFI_ENDPROC
23556+ENDPROC(save_paranoid_nmi)
23557
23558 /*
23559 * A newly forked process directly context switches into this address.
23560@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
23561
23562 RESTORE_REST
23563
23564- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23565+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23566 jz 1f
23567
23568 /*
23569@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
23570 jmp int_ret_from_sys_call
23571
23572 1:
23573- subq $REST_SKIP, %rsp # leave space for volatiles
23574- CFI_ADJUST_CFA_OFFSET REST_SKIP
23575 movq %rbp, %rdi
23576 call *%rbx
23577 movl $0, RAX(%rsp)
23578 RESTORE_REST
23579 jmp int_ret_from_sys_call
23580 CFI_ENDPROC
23581-END(ret_from_fork)
23582+ENDPROC(ret_from_fork)
23583
23584 /*
23585 * System call entry. Up to 6 arguments in registers are supported.
23586@@ -324,7 +792,7 @@ END(ret_from_fork)
23587 ENTRY(system_call)
23588 CFI_STARTPROC simple
23589 CFI_SIGNAL_FRAME
23590- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23591+ CFI_DEF_CFA rsp,0
23592 CFI_REGISTER rip,rcx
23593 /*CFI_REGISTER rflags,r11*/
23594 SWAPGS_UNSAFE_STACK
23595@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
23596
23597 movq %rsp,PER_CPU_VAR(old_rsp)
23598 movq PER_CPU_VAR(kernel_stack),%rsp
23599+ SAVE_ARGS 8*6, 0, rax_enosys=1
23600+ pax_enter_kernel_user
23601+
23602+#ifdef CONFIG_PAX_RANDKSTACK
23603+ pax_erase_kstack
23604+#endif
23605+
23606 /*
23607 * No need to follow this irqs off/on section - it's straight
23608 * and short:
23609 */
23610 ENABLE_INTERRUPTS(CLBR_NONE)
23611- SAVE_ARGS 8, 0, rax_enosys=1
23612 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23613 movq %rcx,RIP-ARGOFFSET(%rsp)
23614 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23615- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23616+ GET_THREAD_INFO(%rcx)
23617+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23618 jnz tracesys
23619 system_call_fastpath:
23620 #if __SYSCALL_MASK == ~0
23621@@ -376,10 +851,13 @@ ret_from_sys_call:
23622 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23623 * very bad.
23624 */
23625- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23626+ GET_THREAD_INFO(%rcx)
23627+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23628 jnz int_ret_from_sys_call_fixup /* Go the the slow path */
23629
23630 CFI_REMEMBER_STATE
23631+ pax_exit_kernel_user
23632+ pax_erase_kstack
23633 /*
23634 * sysretq will re-enable interrupts:
23635 */
23636@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
23637
23638 /* Do syscall tracing */
23639 tracesys:
23640- leaq -REST_SKIP(%rsp), %rdi
23641+ movq %rsp, %rdi
23642 movq $AUDIT_ARCH_X86_64, %rsi
23643 call syscall_trace_enter_phase1
23644 test %rax, %rax
23645 jnz tracesys_phase2 /* if needed, run the slow path */
23646- LOAD_ARGS 0 /* else restore clobbered regs */
23647+
23648+ pax_erase_kstack
23649+
23650+ LOAD_ARGS /* else restore clobbered regs */
23651 jmp system_call_fastpath /* and return to the fast path */
23652
23653 tracesys_phase2:
23654@@ -415,12 +896,14 @@ tracesys_phase2:
23655 movq %rax,%rdx
23656 call syscall_trace_enter_phase2
23657
23658+ pax_erase_kstack
23659+
23660 /*
23661 * Reload arg registers from stack in case ptrace changed them.
23662 * We don't reload %rax because syscall_trace_entry_phase2() returned
23663 * the value it wants us to use in the table lookup.
23664 */
23665- LOAD_ARGS ARGOFFSET, 1
23666+ LOAD_ARGS 1
23667 RESTORE_REST
23668 #if __SYSCALL_MASK == ~0
23669 cmpq $__NR_syscall_max,%rax
23670@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
23671 andl %edi,%edx
23672 jnz int_careful
23673 andl $~TS_COMPAT,TI_status(%rcx)
23674- jmp retint_swapgs
23675+ pax_exit_kernel_user
23676+ pax_erase_kstack
23677+ jmp retint_swapgs_pax
23678
23679 /* Either reschedule or signal or syscall exit tracking needed. */
23680 /* First do a reschedule test. */
23681@@ -497,7 +982,7 @@ int_restore_rest:
23682 TRACE_IRQS_OFF
23683 jmp int_with_check
23684 CFI_ENDPROC
23685-END(system_call)
23686+ENDPROC(system_call)
23687
23688 .macro FORK_LIKE func
23689 ENTRY(stub_\func)
23690@@ -510,9 +995,10 @@ ENTRY(stub_\func)
23691 DEFAULT_FRAME 0 8 /* offset 8: return address */
23692 call sys_\func
23693 RESTORE_TOP_OF_STACK %r11, 8
23694- ret $REST_SKIP /* pop extended registers */
23695+ pax_force_retaddr
23696+ ret
23697 CFI_ENDPROC
23698-END(stub_\func)
23699+ENDPROC(stub_\func)
23700 .endm
23701
23702 .macro FIXED_FRAME label,func
23703@@ -522,9 +1008,10 @@ ENTRY(\label)
23704 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23705 call \func
23706 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23707+ pax_force_retaddr
23708 ret
23709 CFI_ENDPROC
23710-END(\label)
23711+ENDPROC(\label)
23712 .endm
23713
23714 FORK_LIKE clone
23715@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
23716 RESTORE_REST
23717 jmp int_ret_from_sys_call
23718 CFI_ENDPROC
23719-END(stub_execve)
23720+ENDPROC(stub_execve)
23721
23722 ENTRY(stub_execveat)
23723 CFI_STARTPROC
23724@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
23725 RESTORE_REST
23726 jmp int_ret_from_sys_call
23727 CFI_ENDPROC
23728-END(stub_execveat)
23729+ENDPROC(stub_execveat)
23730
23731 /*
23732 * sigreturn is special because it needs to restore all registers on return.
23733@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
23734 RESTORE_REST
23735 jmp int_ret_from_sys_call
23736 CFI_ENDPROC
23737-END(stub_rt_sigreturn)
23738+ENDPROC(stub_rt_sigreturn)
23739
23740 #ifdef CONFIG_X86_X32_ABI
23741 ENTRY(stub_x32_rt_sigreturn)
23742@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
23743 RESTORE_REST
23744 jmp int_ret_from_sys_call
23745 CFI_ENDPROC
23746-END(stub_x32_rt_sigreturn)
23747+ENDPROC(stub_x32_rt_sigreturn)
23748
23749 ENTRY(stub_x32_execve)
23750 CFI_STARTPROC
23751@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
23752 RESTORE_REST
23753 jmp int_ret_from_sys_call
23754 CFI_ENDPROC
23755-END(stub_x32_execve)
23756+ENDPROC(stub_x32_execve)
23757
23758 ENTRY(stub_x32_execveat)
23759 CFI_STARTPROC
23760@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
23761 RESTORE_REST
23762 jmp int_ret_from_sys_call
23763 CFI_ENDPROC
23764-END(stub_x32_execveat)
23765+ENDPROC(stub_x32_execveat)
23766
23767 #endif
23768
23769@@ -653,7 +1140,7 @@ vector=vector+1
23770 2: jmp common_interrupt
23771 .endr
23772 CFI_ENDPROC
23773-END(irq_entries_start)
23774+ENDPROC(irq_entries_start)
23775
23776 .previous
23777 END(interrupt)
23778@@ -670,28 +1157,29 @@ END(interrupt)
23779 /* 0(%rsp): ~(interrupt number) */
23780 .macro interrupt func
23781 /* reserve pt_regs for scratch regs and rbp */
23782- subq $ORIG_RAX-RBP, %rsp
23783- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23784+ subq $ORIG_RAX, %rsp
23785+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23786 cld
23787- /* start from rbp in pt_regs and jump over */
23788- movq_cfi rdi, (RDI-RBP)
23789- movq_cfi rsi, (RSI-RBP)
23790- movq_cfi rdx, (RDX-RBP)
23791- movq_cfi rcx, (RCX-RBP)
23792- movq_cfi rax, (RAX-RBP)
23793- movq_cfi r8, (R8-RBP)
23794- movq_cfi r9, (R9-RBP)
23795- movq_cfi r10, (R10-RBP)
23796- movq_cfi r11, (R11-RBP)
23797+ /* start from r15 in pt_regs and jump over */
23798+ movq_cfi rdi, RDI
23799+ movq_cfi rsi, RSI
23800+ movq_cfi rdx, RDX
23801+ movq_cfi rcx, RCX
23802+ movq_cfi rax, RAX
23803+ movq_cfi r8, R8
23804+ movq_cfi r9, R9
23805+ movq_cfi r10, R10
23806+ movq_cfi r11, R11
23807+ movq_cfi r12, R12
23808
23809 /* Save rbp so that we can unwind from get_irq_regs() */
23810- movq_cfi rbp, 0
23811+ movq_cfi rbp, RBP
23812
23813 /* Save previous stack value */
23814 movq %rsp, %rsi
23815
23816- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23817- testl $3, CS-RBP(%rsi)
23818+ movq %rsp,%rdi /* arg1 for handler */
23819+ testb $3, CS(%rsi)
23820 je 1f
23821 SWAPGS
23822 /*
23823@@ -711,6 +1199,18 @@ END(interrupt)
23824 0x06 /* DW_OP_deref */, \
23825 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23826 0x22 /* DW_OP_plus */
23827+
23828+#ifdef CONFIG_PAX_MEMORY_UDEREF
23829+ testb $3, CS(%rdi)
23830+ jnz 1f
23831+ pax_enter_kernel
23832+ jmp 2f
23833+1: pax_enter_kernel_user
23834+2:
23835+#else
23836+ pax_enter_kernel
23837+#endif
23838+
23839 /* We entered an interrupt context - irqs are off: */
23840 TRACE_IRQS_OFF
23841
23842@@ -735,14 +1235,14 @@ ret_from_intr:
23843
23844 /* Restore saved previous stack */
23845 popq %rsi
23846- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23847- leaq ARGOFFSET-RBP(%rsi), %rsp
23848+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23849+ movq %rsi, %rsp
23850 CFI_DEF_CFA_REGISTER rsp
23851- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23852+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23853
23854 exit_intr:
23855 GET_THREAD_INFO(%rcx)
23856- testl $3,CS-ARGOFFSET(%rsp)
23857+ testb $3,CS-ARGOFFSET(%rsp)
23858 je retint_kernel
23859
23860 /* Interrupt came from user space */
23861@@ -764,14 +1264,16 @@ retint_swapgs: /* return to user-space */
23862 * The iretq could re-enable interrupts:
23863 */
23864 DISABLE_INTERRUPTS(CLBR_ANY)
23865+ pax_exit_kernel_user
23866+retint_swapgs_pax:
23867 TRACE_IRQS_IRETQ
23868
23869 /*
23870 * Try to use SYSRET instead of IRET if we're returning to
23871 * a completely clean 64-bit userspace context.
23872 */
23873- movq (RCX-R11)(%rsp), %rcx
23874- cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */
23875+ movq (RCX-ARGOFFSET)(%rsp), %rcx
23876+ cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */
23877 jne opportunistic_sysret_failed
23878
23879 /*
23880@@ -792,7 +1294,7 @@ retint_swapgs: /* return to user-space */
23881 shr $__VIRTUAL_MASK_SHIFT, %rcx
23882 jnz opportunistic_sysret_failed
23883
23884- cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */
23885+ cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */
23886 jne opportunistic_sysret_failed
23887
23888 movq (R11-ARGOFFSET)(%rsp), %r11
23889@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
23890
23891 retint_restore_args: /* return to kernel space */
23892 DISABLE_INTERRUPTS(CLBR_ANY)
23893+ pax_exit_kernel
23894+
23895+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23896+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23897+ * namely calling EFI runtime services with a phys mapping. We're
23898+ * starting off with NOPs and patch in the real instrumentation
23899+ * (BTS/OR) before starting any userland process; even before starting
23900+ * up the APs.
23901+ */
23902+ .pushsection .altinstr_replacement, "a"
23903+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23904+ 602:
23905+ .popsection
23906+ 603: .fill 602b-601b, 1, 0x90
23907+ .pushsection .altinstructions, "a"
23908+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23909+ .popsection
23910+#else
23911+ pax_force_retaddr (RIP-ARGOFFSET)
23912+#endif
23913+
23914 /*
23915 * The iretq could re-enable interrupts:
23916 */
23917@@ -875,15 +1398,15 @@ native_irq_return_ldt:
23918 SWAPGS
23919 movq PER_CPU_VAR(espfix_waddr),%rdi
23920 movq %rax,(0*8)(%rdi) /* RAX */
23921- movq (2*8)(%rsp),%rax /* RIP */
23922+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23923 movq %rax,(1*8)(%rdi)
23924- movq (3*8)(%rsp),%rax /* CS */
23925+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23926 movq %rax,(2*8)(%rdi)
23927- movq (4*8)(%rsp),%rax /* RFLAGS */
23928+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23929 movq %rax,(3*8)(%rdi)
23930- movq (6*8)(%rsp),%rax /* SS */
23931+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23932 movq %rax,(5*8)(%rdi)
23933- movq (5*8)(%rsp),%rax /* RSP */
23934+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23935 movq %rax,(4*8)(%rdi)
23936 andl $0xffff0000,%eax
23937 popq_cfi %rdi
23938@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
23939 jmp exit_intr
23940 #endif
23941 CFI_ENDPROC
23942-END(common_interrupt)
23943+ENDPROC(common_interrupt)
23944
23945 /*
23946 * APIC interrupts.
23947@@ -951,7 +1474,7 @@ ENTRY(\sym)
23948 interrupt \do_sym
23949 jmp ret_from_intr
23950 CFI_ENDPROC
23951-END(\sym)
23952+ENDPROC(\sym)
23953 .endm
23954
23955 #ifdef CONFIG_TRACING
23956@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23957 /*
23958 * Exception entry points.
23959 */
23960-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23961+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23962
23963 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23964 ENTRY(\sym)
23965@@ -1080,6 +1603,12 @@ ENTRY(\sym)
23966 .endif
23967
23968 .if \shift_ist != -1
23969+#ifdef CONFIG_SMP
23970+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23971+ lea init_tss(%r13), %r13
23972+#else
23973+ lea init_tss(%rip), %r13
23974+#endif
23975 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23976 .endif
23977
23978@@ -1126,7 +1655,7 @@ ENTRY(\sym)
23979 .endif
23980
23981 CFI_ENDPROC
23982-END(\sym)
23983+ENDPROC(\sym)
23984 .endm
23985
23986 #ifdef CONFIG_TRACING
23987@@ -1167,9 +1696,10 @@ gs_change:
23988 2: mfence /* workaround */
23989 SWAPGS
23990 popfq_cfi
23991+ pax_force_retaddr
23992 ret
23993 CFI_ENDPROC
23994-END(native_load_gs_index)
23995+ENDPROC(native_load_gs_index)
23996
23997 _ASM_EXTABLE(gs_change,bad_gs)
23998 .section .fixup,"ax"
23999@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
24000 CFI_DEF_CFA_REGISTER rsp
24001 CFI_ADJUST_CFA_OFFSET -8
24002 decl PER_CPU_VAR(irq_count)
24003+ pax_force_retaddr
24004 ret
24005 CFI_ENDPROC
24006-END(do_softirq_own_stack)
24007+ENDPROC(do_softirq_own_stack)
24008
24009 #ifdef CONFIG_XEN
24010 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24011@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24012 #endif
24013 jmp error_exit
24014 CFI_ENDPROC
24015-END(xen_do_hypervisor_callback)
24016+ENDPROC(xen_do_hypervisor_callback)
24017
24018 /*
24019 * Hypervisor uses this for application faults while it executes.
24020@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
24021 SAVE_ALL
24022 jmp error_exit
24023 CFI_ENDPROC
24024-END(xen_failsafe_callback)
24025+ENDPROC(xen_failsafe_callback)
24026
24027 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24028 xen_hvm_callback_vector xen_evtchn_do_upcall
24029@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
24030 DEFAULT_FRAME
24031 DISABLE_INTERRUPTS(CLBR_NONE)
24032 TRACE_IRQS_OFF_DEBUG
24033- testl %ebx,%ebx /* swapgs needed? */
24034+ testl $1,%ebx /* swapgs needed? */
24035 jnz paranoid_restore
24036+#ifdef CONFIG_PAX_MEMORY_UDEREF
24037+ pax_exit_kernel_user
24038+#else
24039+ pax_exit_kernel
24040+#endif
24041 TRACE_IRQS_IRETQ 0
24042 SWAPGS_UNSAFE_STACK
24043 RESTORE_ALL 8
24044 INTERRUPT_RETURN
24045 paranoid_restore:
24046+ pax_exit_kernel
24047 TRACE_IRQS_IRETQ_DEBUG 0
24048 RESTORE_ALL 8
24049+ pax_force_retaddr_bts
24050 INTERRUPT_RETURN
24051 CFI_ENDPROC
24052-END(paranoid_exit)
24053+ENDPROC(paranoid_exit)
24054
24055 /*
24056 * Exception entry point. This expects an error code/orig_rax on the stack.
24057@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
24058 movq %r14, R14+8(%rsp)
24059 movq %r15, R15+8(%rsp)
24060 xorl %ebx,%ebx
24061- testl $3,CS+8(%rsp)
24062+ testb $3,CS+8(%rsp)
24063 je error_kernelspace
24064 error_swapgs:
24065 SWAPGS
24066 error_sti:
24067+#ifdef CONFIG_PAX_MEMORY_UDEREF
24068+ testb $3, CS+8(%rsp)
24069+ jnz 1f
24070+ pax_enter_kernel
24071+ jmp 2f
24072+1: pax_enter_kernel_user
24073+2:
24074+#else
24075+ pax_enter_kernel
24076+#endif
24077 TRACE_IRQS_OFF
24078+ pax_force_retaddr
24079 ret
24080
24081 /*
24082@@ -1422,7 +1971,7 @@ error_bad_iret:
24083 decl %ebx /* Return to usergs */
24084 jmp error_sti
24085 CFI_ENDPROC
24086-END(error_entry)
24087+ENDPROC(error_entry)
24088
24089
24090 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24091@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
24092 DISABLE_INTERRUPTS(CLBR_NONE)
24093 TRACE_IRQS_OFF
24094 GET_THREAD_INFO(%rcx)
24095- testl %eax,%eax
24096+ testl $1,%eax
24097 jne retint_kernel
24098 LOCKDEP_SYS_EXIT_IRQ
24099 movl TI_flags(%rcx),%edx
24100@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
24101 jnz retint_careful
24102 jmp retint_swapgs
24103 CFI_ENDPROC
24104-END(error_exit)
24105+ENDPROC(error_exit)
24106
24107 /*
24108 * Test if a given stack is an NMI stack or not.
24109@@ -1500,9 +2049,11 @@ ENTRY(nmi)
24110 * If %cs was not the kernel segment, then the NMI triggered in user
24111 * space, which means it is definitely not nested.
24112 */
24113+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24114+ je 1f
24115 cmpl $__KERNEL_CS, 16(%rsp)
24116 jne first_nmi
24117-
24118+1:
24119 /*
24120 * Check the special variable on the stack to see if NMIs are
24121 * executing.
24122@@ -1536,8 +2087,7 @@ nested_nmi:
24123
24124 1:
24125 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24126- leaq -1*8(%rsp), %rdx
24127- movq %rdx, %rsp
24128+ subq $8, %rsp
24129 CFI_ADJUST_CFA_OFFSET 1*8
24130 leaq -10*8(%rsp), %rdx
24131 pushq_cfi $__KERNEL_DS
24132@@ -1555,6 +2105,7 @@ nested_nmi_out:
24133 CFI_RESTORE rdx
24134
24135 /* No need to check faults here */
24136+# pax_force_retaddr_bts
24137 INTERRUPT_RETURN
24138
24139 CFI_RESTORE_STATE
24140@@ -1651,13 +2202,13 @@ end_repeat_nmi:
24141 subq $ORIG_RAX-R15, %rsp
24142 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24143 /*
24144- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24145+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24146 * as we should not be calling schedule in NMI context.
24147 * Even with normal interrupts enabled. An NMI should not be
24148 * setting NEED_RESCHED or anything that normal interrupts and
24149 * exceptions might do.
24150 */
24151- call save_paranoid
24152+ call save_paranoid_nmi
24153 DEFAULT_FRAME 0
24154
24155 /*
24156@@ -1667,9 +2218,9 @@ end_repeat_nmi:
24157 * NMI itself takes a page fault, the page fault that was preempted
24158 * will read the information from the NMI page fault and not the
24159 * origin fault. Save it off and restore it if it changes.
24160- * Use the r12 callee-saved register.
24161+ * Use the r13 callee-saved register.
24162 */
24163- movq %cr2, %r12
24164+ movq %cr2, %r13
24165
24166 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24167 movq %rsp,%rdi
24168@@ -1678,29 +2229,34 @@ end_repeat_nmi:
24169
24170 /* Did the NMI take a page fault? Restore cr2 if it did */
24171 movq %cr2, %rcx
24172- cmpq %rcx, %r12
24173+ cmpq %rcx, %r13
24174 je 1f
24175- movq %r12, %cr2
24176+ movq %r13, %cr2
24177 1:
24178
24179- testl %ebx,%ebx /* swapgs needed? */
24180+ testl $1,%ebx /* swapgs needed? */
24181 jnz nmi_restore
24182 nmi_swapgs:
24183 SWAPGS_UNSAFE_STACK
24184 nmi_restore:
24185+ pax_exit_kernel_nmi
24186 /* Pop the extra iret frame at once */
24187 RESTORE_ALL 6*8
24188+ testb $3, 8(%rsp)
24189+ jnz 1f
24190+ pax_force_retaddr_bts
24191+1:
24192
24193 /* Clear the NMI executing stack variable */
24194 movq $0, 5*8(%rsp)
24195 jmp irq_return
24196 CFI_ENDPROC
24197-END(nmi)
24198+ENDPROC(nmi)
24199
24200 ENTRY(ignore_sysret)
24201 CFI_STARTPROC
24202 mov $-ENOSYS,%eax
24203 sysret
24204 CFI_ENDPROC
24205-END(ignore_sysret)
24206+ENDPROC(ignore_sysret)
24207
24208diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24209index f5d0730..5bce89c 100644
24210--- a/arch/x86/kernel/espfix_64.c
24211+++ b/arch/x86/kernel/espfix_64.c
24212@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24213 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24214 static void *espfix_pages[ESPFIX_MAX_PAGES];
24215
24216-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24217- __aligned(PAGE_SIZE);
24218+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24219
24220 static unsigned int page_random, slot_random;
24221
24222@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24223 void __init init_espfix_bsp(void)
24224 {
24225 pgd_t *pgd_p;
24226+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24227
24228 /* Install the espfix pud into the kernel page directory */
24229- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24230+ pgd_p = &init_level4_pgt[index];
24231 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24232
24233+#ifdef CONFIG_PAX_PER_CPU_PGD
24234+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24235+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24236+#endif
24237+
24238 /* Randomize the locations */
24239 init_espfix_random();
24240
24241@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24242 set_pte(&pte_p[n*PTE_STRIDE], pte);
24243
24244 /* Job is done for this CPU and any CPU which shares this page */
24245- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24246+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24247
24248 unlock_done:
24249 mutex_unlock(&espfix_init_mutex);
24250diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24251index 8b7b0a5..2395f29 100644
24252--- a/arch/x86/kernel/ftrace.c
24253+++ b/arch/x86/kernel/ftrace.c
24254@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24255 * kernel identity mapping to modify code.
24256 */
24257 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24258- ip = (unsigned long)__va(__pa_symbol(ip));
24259+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24260
24261 return ip;
24262 }
24263@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24264 {
24265 unsigned char replaced[MCOUNT_INSN_SIZE];
24266
24267+ ip = ktla_ktva(ip);
24268+
24269 /*
24270 * Note: Due to modules and __init, code can
24271 * disappear and change, we need to protect against faulting
24272@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24273 unsigned char old[MCOUNT_INSN_SIZE];
24274 int ret;
24275
24276- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24277+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24278
24279 ftrace_update_func = ip;
24280 /* Make sure the breakpoints see the ftrace_update_func update */
24281@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24282 unsigned char replaced[MCOUNT_INSN_SIZE];
24283 unsigned char brk = BREAKPOINT_INSTRUCTION;
24284
24285- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24286+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24287 return -EFAULT;
24288
24289 /* Make sure it is what we expect it to be */
24290diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24291index c4f8d46..2d63ae2 100644
24292--- a/arch/x86/kernel/head64.c
24293+++ b/arch/x86/kernel/head64.c
24294@@ -68,12 +68,12 @@ again:
24295 pgd = *pgd_p;
24296
24297 /*
24298- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24299- * critical -- __PAGE_OFFSET would point us back into the dynamic
24300+ * The use of __early_va rather than __va here is critical:
24301+ * __va would point us back into the dynamic
24302 * range and we might end up looping forever...
24303 */
24304 if (pgd)
24305- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24306+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24307 else {
24308 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24309 reset_early_page_tables();
24310@@ -83,13 +83,13 @@ again:
24311 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24312 for (i = 0; i < PTRS_PER_PUD; i++)
24313 pud_p[i] = 0;
24314- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24315+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24316 }
24317 pud_p += pud_index(address);
24318 pud = *pud_p;
24319
24320 if (pud)
24321- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24322+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24323 else {
24324 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24325 reset_early_page_tables();
24326@@ -99,7 +99,7 @@ again:
24327 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24328 for (i = 0; i < PTRS_PER_PMD; i++)
24329 pmd_p[i] = 0;
24330- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24331+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24332 }
24333 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24334 pmd_p[pmd_index(address)] = pmd;
24335@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24336 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24337 early_printk("Kernel alive\n");
24338
24339- clear_page(init_level4_pgt);
24340 /* set init_level4_pgt kernel high mapping*/
24341 init_level4_pgt[511] = early_level4_pgt[511];
24342
24343diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24344index f36bd42..0ab4474 100644
24345--- a/arch/x86/kernel/head_32.S
24346+++ b/arch/x86/kernel/head_32.S
24347@@ -26,6 +26,12 @@
24348 /* Physical address */
24349 #define pa(X) ((X) - __PAGE_OFFSET)
24350
24351+#ifdef CONFIG_PAX_KERNEXEC
24352+#define ta(X) (X)
24353+#else
24354+#define ta(X) ((X) - __PAGE_OFFSET)
24355+#endif
24356+
24357 /*
24358 * References to members of the new_cpu_data structure.
24359 */
24360@@ -55,11 +61,7 @@
24361 * and small than max_low_pfn, otherwise will waste some page table entries
24362 */
24363
24364-#if PTRS_PER_PMD > 1
24365-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24366-#else
24367-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24368-#endif
24369+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24370
24371 /* Number of possible pages in the lowmem region */
24372 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24373@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24374 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24375
24376 /*
24377+ * Real beginning of normal "text" segment
24378+ */
24379+ENTRY(stext)
24380+ENTRY(_stext)
24381+
24382+/*
24383 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24384 * %esi points to the real-mode code as a 32-bit pointer.
24385 * CS and DS must be 4 GB flat segments, but we don't depend on
24386@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24387 * can.
24388 */
24389 __HEAD
24390+
24391+#ifdef CONFIG_PAX_KERNEXEC
24392+ jmp startup_32
24393+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24394+.fill PAGE_SIZE-5,1,0xcc
24395+#endif
24396+
24397 ENTRY(startup_32)
24398 movl pa(stack_start),%ecx
24399
24400@@ -106,6 +121,59 @@ ENTRY(startup_32)
24401 2:
24402 leal -__PAGE_OFFSET(%ecx),%esp
24403
24404+#ifdef CONFIG_SMP
24405+ movl $pa(cpu_gdt_table),%edi
24406+ movl $__per_cpu_load,%eax
24407+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24408+ rorl $16,%eax
24409+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24410+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24411+ movl $__per_cpu_end - 1,%eax
24412+ subl $__per_cpu_start,%eax
24413+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24414+#endif
24415+
24416+#ifdef CONFIG_PAX_MEMORY_UDEREF
24417+ movl $NR_CPUS,%ecx
24418+ movl $pa(cpu_gdt_table),%edi
24419+1:
24420+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24421+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24422+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24423+ addl $PAGE_SIZE_asm,%edi
24424+ loop 1b
24425+#endif
24426+
24427+#ifdef CONFIG_PAX_KERNEXEC
24428+ movl $pa(boot_gdt),%edi
24429+ movl $__LOAD_PHYSICAL_ADDR,%eax
24430+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24431+ rorl $16,%eax
24432+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24433+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24434+ rorl $16,%eax
24435+
24436+ ljmp $(__BOOT_CS),$1f
24437+1:
24438+
24439+ movl $NR_CPUS,%ecx
24440+ movl $pa(cpu_gdt_table),%edi
24441+ addl $__PAGE_OFFSET,%eax
24442+1:
24443+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24444+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24445+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24446+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24447+ rorl $16,%eax
24448+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24449+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24450+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24451+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24452+ rorl $16,%eax
24453+ addl $PAGE_SIZE_asm,%edi
24454+ loop 1b
24455+#endif
24456+
24457 /*
24458 * Clear BSS first so that there are no surprises...
24459 */
24460@@ -201,8 +269,11 @@ ENTRY(startup_32)
24461 movl %eax, pa(max_pfn_mapped)
24462
24463 /* Do early initialization of the fixmap area */
24464- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24465- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24466+#ifdef CONFIG_COMPAT_VDSO
24467+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24468+#else
24469+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24470+#endif
24471 #else /* Not PAE */
24472
24473 page_pde_offset = (__PAGE_OFFSET >> 20);
24474@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24475 movl %eax, pa(max_pfn_mapped)
24476
24477 /* Do early initialization of the fixmap area */
24478- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24479- movl %eax,pa(initial_page_table+0xffc)
24480+#ifdef CONFIG_COMPAT_VDSO
24481+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24482+#else
24483+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24484+#endif
24485 #endif
24486
24487 #ifdef CONFIG_PARAVIRT
24488@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24489 cmpl $num_subarch_entries, %eax
24490 jae bad_subarch
24491
24492- movl pa(subarch_entries)(,%eax,4), %eax
24493- subl $__PAGE_OFFSET, %eax
24494- jmp *%eax
24495+ jmp *pa(subarch_entries)(,%eax,4)
24496
24497 bad_subarch:
24498 WEAK(lguest_entry)
24499@@ -261,10 +333,10 @@ WEAK(xen_entry)
24500 __INITDATA
24501
24502 subarch_entries:
24503- .long default_entry /* normal x86/PC */
24504- .long lguest_entry /* lguest hypervisor */
24505- .long xen_entry /* Xen hypervisor */
24506- .long default_entry /* Moorestown MID */
24507+ .long ta(default_entry) /* normal x86/PC */
24508+ .long ta(lguest_entry) /* lguest hypervisor */
24509+ .long ta(xen_entry) /* Xen hypervisor */
24510+ .long ta(default_entry) /* Moorestown MID */
24511 num_subarch_entries = (. - subarch_entries) / 4
24512 .previous
24513 #else
24514@@ -354,6 +426,7 @@ default_entry:
24515 movl pa(mmu_cr4_features),%eax
24516 movl %eax,%cr4
24517
24518+#ifdef CONFIG_X86_PAE
24519 testb $X86_CR4_PAE, %al # check if PAE is enabled
24520 jz enable_paging
24521
24522@@ -382,6 +455,9 @@ default_entry:
24523 /* Make changes effective */
24524 wrmsr
24525
24526+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24527+#endif
24528+
24529 enable_paging:
24530
24531 /*
24532@@ -449,14 +525,20 @@ is486:
24533 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24534 movl %eax,%ss # after changing gdt.
24535
24536- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24537+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24538 movl %eax,%ds
24539 movl %eax,%es
24540
24541 movl $(__KERNEL_PERCPU), %eax
24542 movl %eax,%fs # set this cpu's percpu
24543
24544+#ifdef CONFIG_CC_STACKPROTECTOR
24545 movl $(__KERNEL_STACK_CANARY),%eax
24546+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24547+ movl $(__USER_DS),%eax
24548+#else
24549+ xorl %eax,%eax
24550+#endif
24551 movl %eax,%gs
24552
24553 xorl %eax,%eax # Clear LDT
24554@@ -512,8 +594,11 @@ setup_once:
24555 * relocation. Manually set base address in stack canary
24556 * segment descriptor.
24557 */
24558- movl $gdt_page,%eax
24559+ movl $cpu_gdt_table,%eax
24560 movl $stack_canary,%ecx
24561+#ifdef CONFIG_SMP
24562+ addl $__per_cpu_load,%ecx
24563+#endif
24564 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24565 shrl $16, %ecx
24566 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24567@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24568 cmpl $2,(%esp) # X86_TRAP_NMI
24569 je is_nmi # Ignore NMI
24570
24571- cmpl $2,%ss:early_recursion_flag
24572+ cmpl $1,%ss:early_recursion_flag
24573 je hlt_loop
24574 incl %ss:early_recursion_flag
24575
24576@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24577 pushl (20+6*4)(%esp) /* trapno */
24578 pushl $fault_msg
24579 call printk
24580-#endif
24581 call dump_stack
24582+#endif
24583 hlt_loop:
24584 hlt
24585 jmp hlt_loop
24586@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24587 /* This is the default interrupt "handler" :-) */
24588 ALIGN
24589 ignore_int:
24590- cld
24591 #ifdef CONFIG_PRINTK
24592+ cmpl $2,%ss:early_recursion_flag
24593+ je hlt_loop
24594+ incl %ss:early_recursion_flag
24595+ cld
24596 pushl %eax
24597 pushl %ecx
24598 pushl %edx
24599@@ -617,9 +705,6 @@ ignore_int:
24600 movl $(__KERNEL_DS),%eax
24601 movl %eax,%ds
24602 movl %eax,%es
24603- cmpl $2,early_recursion_flag
24604- je hlt_loop
24605- incl early_recursion_flag
24606 pushl 16(%esp)
24607 pushl 24(%esp)
24608 pushl 32(%esp)
24609@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24610 /*
24611 * BSS section
24612 */
24613-__PAGE_ALIGNED_BSS
24614- .align PAGE_SIZE
24615 #ifdef CONFIG_X86_PAE
24616+.section .initial_pg_pmd,"a",@progbits
24617 initial_pg_pmd:
24618 .fill 1024*KPMDS,4,0
24619 #else
24620+.section .initial_page_table,"a",@progbits
24621 ENTRY(initial_page_table)
24622 .fill 1024,4,0
24623 #endif
24624+.section .initial_pg_fixmap,"a",@progbits
24625 initial_pg_fixmap:
24626 .fill 1024,4,0
24627+.section .empty_zero_page,"a",@progbits
24628 ENTRY(empty_zero_page)
24629 .fill 4096,1,0
24630+.section .swapper_pg_dir,"a",@progbits
24631 ENTRY(swapper_pg_dir)
24632+#ifdef CONFIG_X86_PAE
24633+ .fill 4,8,0
24634+#else
24635 .fill 1024,4,0
24636+#endif
24637
24638 /*
24639 * This starts the data section.
24640 */
24641 #ifdef CONFIG_X86_PAE
24642-__PAGE_ALIGNED_DATA
24643- /* Page-aligned for the benefit of paravirt? */
24644- .align PAGE_SIZE
24645+.section .initial_page_table,"a",@progbits
24646 ENTRY(initial_page_table)
24647 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24648 # if KPMDS == 3
24649@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24650 # error "Kernel PMDs should be 1, 2 or 3"
24651 # endif
24652 .align PAGE_SIZE /* needs to be page-sized too */
24653+
24654+#ifdef CONFIG_PAX_PER_CPU_PGD
24655+ENTRY(cpu_pgd)
24656+ .rept 2*NR_CPUS
24657+ .fill 4,8,0
24658+ .endr
24659+#endif
24660+
24661 #endif
24662
24663 .data
24664 .balign 4
24665 ENTRY(stack_start)
24666- .long init_thread_union+THREAD_SIZE
24667+ .long init_thread_union+THREAD_SIZE-8
24668
24669 __INITRODATA
24670 int_msg:
24671@@ -727,7 +825,7 @@ fault_msg:
24672 * segment size, and 32-bit linear address value:
24673 */
24674
24675- .data
24676+.section .rodata,"a",@progbits
24677 .globl boot_gdt_descr
24678 .globl idt_descr
24679
24680@@ -736,7 +834,7 @@ fault_msg:
24681 .word 0 # 32 bit align gdt_desc.address
24682 boot_gdt_descr:
24683 .word __BOOT_DS+7
24684- .long boot_gdt - __PAGE_OFFSET
24685+ .long pa(boot_gdt)
24686
24687 .word 0 # 32-bit align idt_desc.address
24688 idt_descr:
24689@@ -747,7 +845,7 @@ idt_descr:
24690 .word 0 # 32 bit align gdt_desc.address
24691 ENTRY(early_gdt_descr)
24692 .word GDT_ENTRIES*8-1
24693- .long gdt_page /* Overwritten for secondary CPUs */
24694+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24695
24696 /*
24697 * The boot_gdt must mirror the equivalent in setup.S and is
24698@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24699 .align L1_CACHE_BYTES
24700 ENTRY(boot_gdt)
24701 .fill GDT_ENTRY_BOOT_CS,8,0
24702- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24703- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24704+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24705+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24706+
24707+ .align PAGE_SIZE_asm
24708+ENTRY(cpu_gdt_table)
24709+ .rept NR_CPUS
24710+ .quad 0x0000000000000000 /* NULL descriptor */
24711+ .quad 0x0000000000000000 /* 0x0b reserved */
24712+ .quad 0x0000000000000000 /* 0x13 reserved */
24713+ .quad 0x0000000000000000 /* 0x1b reserved */
24714+
24715+#ifdef CONFIG_PAX_KERNEXEC
24716+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24717+#else
24718+ .quad 0x0000000000000000 /* 0x20 unused */
24719+#endif
24720+
24721+ .quad 0x0000000000000000 /* 0x28 unused */
24722+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24723+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24724+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24725+ .quad 0x0000000000000000 /* 0x4b reserved */
24726+ .quad 0x0000000000000000 /* 0x53 reserved */
24727+ .quad 0x0000000000000000 /* 0x5b reserved */
24728+
24729+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24730+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24731+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24732+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24733+
24734+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24735+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24736+
24737+ /*
24738+ * Segments used for calling PnP BIOS have byte granularity.
24739+ * The code segments and data segments have fixed 64k limits,
24740+ * the transfer segment sizes are set at run time.
24741+ */
24742+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24743+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24744+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24745+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24746+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24747+
24748+ /*
24749+ * The APM segments have byte granularity and their bases
24750+ * are set at run time. All have 64k limits.
24751+ */
24752+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24753+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24754+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24755+
24756+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24757+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24758+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24759+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24760+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24761+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24762+
24763+ /* Be sure this is zeroed to avoid false validations in Xen */
24764+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24765+ .endr
24766diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24767index 6fd514d9..320367e 100644
24768--- a/arch/x86/kernel/head_64.S
24769+++ b/arch/x86/kernel/head_64.S
24770@@ -20,6 +20,8 @@
24771 #include <asm/processor-flags.h>
24772 #include <asm/percpu.h>
24773 #include <asm/nops.h>
24774+#include <asm/cpufeature.h>
24775+#include <asm/alternative-asm.h>
24776
24777 #ifdef CONFIG_PARAVIRT
24778 #include <asm/asm-offsets.h>
24779@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24780 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24781 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24782 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24783+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24784+L3_VMALLOC_START = pud_index(VMALLOC_START)
24785+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24786+L3_VMALLOC_END = pud_index(VMALLOC_END)
24787+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24788+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24789
24790 .text
24791 __HEAD
24792@@ -89,11 +97,26 @@ startup_64:
24793 * Fixup the physical addresses in the page table
24794 */
24795 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24796+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24797+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24798+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24799+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24800+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24801
24802- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24803- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24804+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24805+#ifndef CONFIG_XEN
24806+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24807+#endif
24808
24809+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24810+
24811+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24812+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24813+
24814+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24815+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24816 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24817+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24818
24819 /*
24820 * Set up the identity mapping for the switchover. These
24821@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24822 * after the boot processor executes this code.
24823 */
24824
24825+ orq $-1, %rbp
24826 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24827 1:
24828
24829- /* Enable PAE mode and PGE */
24830- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24831+ /* Enable PAE mode and PSE/PGE */
24832+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24833 movq %rcx, %cr4
24834
24835 /* Setup early boot stage 4 level pagetables. */
24836@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24837 movl $MSR_EFER, %ecx
24838 rdmsr
24839 btsl $_EFER_SCE, %eax /* Enable System Call */
24840- btl $20,%edi /* No Execute supported? */
24841+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24842 jnc 1f
24843 btsl $_EFER_NX, %eax
24844+ cmpq $-1, %rbp
24845+ je 1f
24846 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24847+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24848+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24849+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24850+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24851+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24852+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24853+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24854+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24855+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24856 1: wrmsr /* Make changes effective */
24857
24858 /* Setup cr0 */
24859@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24860 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24861 * address given in m16:64.
24862 */
24863+ pax_set_fptr_mask
24864 movq initial_code(%rip),%rax
24865 pushq $0 # fake return address to stop unwinder
24866 pushq $__KERNEL_CS # set correct cs
24867@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24868 .quad INIT_PER_CPU_VAR(irq_stack_union)
24869
24870 GLOBAL(stack_start)
24871- .quad init_thread_union+THREAD_SIZE-8
24872+ .quad init_thread_union+THREAD_SIZE-16
24873 .word 0
24874 __FINITDATA
24875
24876@@ -391,7 +427,7 @@ ENTRY(early_idt_handler)
24877 call dump_stack
24878 #ifdef CONFIG_KALLSYMS
24879 leaq early_idt_ripmsg(%rip),%rdi
24880- movq 40(%rsp),%rsi # %rip again
24881+ movq 88(%rsp),%rsi # %rip again
24882 call __print_symbol
24883 #endif
24884 #endif /* EARLY_PRINTK */
24885@@ -420,6 +456,7 @@ ENDPROC(early_idt_handler)
24886 early_recursion_flag:
24887 .long 0
24888
24889+ .section .rodata,"a",@progbits
24890 #ifdef CONFIG_EARLY_PRINTK
24891 early_idt_msg:
24892 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24893@@ -447,29 +484,52 @@ NEXT_PAGE(early_level4_pgt)
24894 NEXT_PAGE(early_dynamic_pgts)
24895 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24896
24897- .data
24898+ .section .rodata,"a",@progbits
24899
24900-#ifndef CONFIG_XEN
24901 NEXT_PAGE(init_level4_pgt)
24902- .fill 512,8,0
24903-#else
24904-NEXT_PAGE(init_level4_pgt)
24905- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24906 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24907 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24908+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24909+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24910+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24911+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24912+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24913+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24914 .org init_level4_pgt + L4_START_KERNEL*8, 0
24915 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24916 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24917
24918+#ifdef CONFIG_PAX_PER_CPU_PGD
24919+NEXT_PAGE(cpu_pgd)
24920+ .rept 2*NR_CPUS
24921+ .fill 512,8,0
24922+ .endr
24923+#endif
24924+
24925 NEXT_PAGE(level3_ident_pgt)
24926 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24927+#ifdef CONFIG_XEN
24928 .fill 511, 8, 0
24929+#else
24930+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24931+ .fill 510,8,0
24932+#endif
24933+
24934+NEXT_PAGE(level3_vmalloc_start_pgt)
24935+ .fill 512,8,0
24936+
24937+NEXT_PAGE(level3_vmalloc_end_pgt)
24938+ .fill 512,8,0
24939+
24940+NEXT_PAGE(level3_vmemmap_pgt)
24941+ .fill L3_VMEMMAP_START,8,0
24942+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24943+
24944 NEXT_PAGE(level2_ident_pgt)
24945- /* Since I easily can, map the first 1G.
24946+ /* Since I easily can, map the first 2G.
24947 * Don't set NX because code runs from these pages.
24948 */
24949- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24950-#endif
24951+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24952
24953 NEXT_PAGE(level3_kernel_pgt)
24954 .fill L3_START_KERNEL,8,0
24955@@ -477,6 +537,9 @@ NEXT_PAGE(level3_kernel_pgt)
24956 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24957 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24958
24959+NEXT_PAGE(level2_vmemmap_pgt)
24960+ .fill 512,8,0
24961+
24962 NEXT_PAGE(level2_kernel_pgt)
24963 /*
24964 * 512 MB kernel mapping. We spend a full page on this pagetable
24965@@ -492,23 +555,61 @@ NEXT_PAGE(level2_kernel_pgt)
24966 KERNEL_IMAGE_SIZE/PMD_SIZE)
24967
24968 NEXT_PAGE(level2_fixmap_pgt)
24969- .fill 506,8,0
24970- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24971- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24972- .fill 5,8,0
24973+ .fill 504,8,0
24974+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
24975+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
24976+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
24977+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24978+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24979+ .fill 4,8,0
24980
24981 NEXT_PAGE(level1_fixmap_pgt)
24982+ .fill 3*512,8,0
24983+
24984+NEXT_PAGE(level1_vsyscall_pgt)
24985 .fill 512,8,0
24986
24987 #undef PMDS
24988
24989- .data
24990+ .align PAGE_SIZE
24991+ENTRY(cpu_gdt_table)
24992+ .rept NR_CPUS
24993+ .quad 0x0000000000000000 /* NULL descriptor */
24994+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24995+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
24996+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
24997+ .quad 0x00cffb000000ffff /* __USER32_CS */
24998+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24999+ .quad 0x00affb000000ffff /* __USER_CS */
25000+
25001+#ifdef CONFIG_PAX_KERNEXEC
25002+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25003+#else
25004+ .quad 0x0 /* unused */
25005+#endif
25006+
25007+ .quad 0,0 /* TSS */
25008+ .quad 0,0 /* LDT */
25009+ .quad 0,0,0 /* three TLS descriptors */
25010+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25011+ /* asm/segment.h:GDT_ENTRIES must match this */
25012+
25013+#ifdef CONFIG_PAX_MEMORY_UDEREF
25014+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25015+#else
25016+ .quad 0x0 /* unused */
25017+#endif
25018+
25019+ /* zero the remaining page */
25020+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25021+ .endr
25022+
25023 .align 16
25024 .globl early_gdt_descr
25025 early_gdt_descr:
25026 .word GDT_ENTRIES*8-1
25027 early_gdt_descr_base:
25028- .quad INIT_PER_CPU_VAR(gdt_page)
25029+ .quad cpu_gdt_table
25030
25031 ENTRY(phys_base)
25032 /* This must match the first entry in level2_kernel_pgt */
25033@@ -532,8 +633,8 @@ NEXT_PAGE(kasan_zero_pud)
25034
25035
25036 #include "../../x86/xen/xen-head.S"
25037-
25038- __PAGE_ALIGNED_BSS
25039+
25040+ .section .rodata,"a",@progbits
25041 NEXT_PAGE(empty_zero_page)
25042 .skip PAGE_SIZE
25043
25044diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25045index 05fd74f..c3548b1 100644
25046--- a/arch/x86/kernel/i386_ksyms_32.c
25047+++ b/arch/x86/kernel/i386_ksyms_32.c
25048@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25049 EXPORT_SYMBOL(cmpxchg8b_emu);
25050 #endif
25051
25052+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25053+
25054 /* Networking helper routines. */
25055 EXPORT_SYMBOL(csum_partial_copy_generic);
25056+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25057+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25058
25059 EXPORT_SYMBOL(__get_user_1);
25060 EXPORT_SYMBOL(__get_user_2);
25061@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25062 EXPORT_SYMBOL(___preempt_schedule_context);
25063 #endif
25064 #endif
25065+
25066+#ifdef CONFIG_PAX_KERNEXEC
25067+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25068+#endif
25069+
25070+#ifdef CONFIG_PAX_PER_CPU_PGD
25071+EXPORT_SYMBOL(cpu_pgd);
25072+#endif
25073diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25074index f341d56..d9b527b 100644
25075--- a/arch/x86/kernel/i387.c
25076+++ b/arch/x86/kernel/i387.c
25077@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25078 static inline bool interrupted_user_mode(void)
25079 {
25080 struct pt_regs *regs = get_irq_regs();
25081- return regs && user_mode_vm(regs);
25082+ return regs && user_mode(regs);
25083 }
25084
25085 /*
25086diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25087index e7cc537..67d7372 100644
25088--- a/arch/x86/kernel/i8259.c
25089+++ b/arch/x86/kernel/i8259.c
25090@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25091 static void make_8259A_irq(unsigned int irq)
25092 {
25093 disable_irq_nosync(irq);
25094- io_apic_irqs &= ~(1<<irq);
25095+ io_apic_irqs &= ~(1UL<<irq);
25096 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25097 enable_irq(irq);
25098 }
25099@@ -208,7 +208,7 @@ spurious_8259A_irq:
25100 "spurious 8259A interrupt: IRQ%d.\n", irq);
25101 spurious_irq_mask |= irqmask;
25102 }
25103- atomic_inc(&irq_err_count);
25104+ atomic_inc_unchecked(&irq_err_count);
25105 /*
25106 * Theoretically we do not have to handle this IRQ,
25107 * but in Linux this does not cause problems and is
25108@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25109 /* (slave's support for AEOI in flat mode is to be investigated) */
25110 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25111
25112+ pax_open_kernel();
25113 if (auto_eoi)
25114 /*
25115 * In AEOI mode we just have to mask the interrupt
25116 * when acking.
25117 */
25118- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25119+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25120 else
25121- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25122+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25123+ pax_close_kernel();
25124
25125 udelay(100); /* wait for 8259A to initialize */
25126
25127diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25128index a979b5b..1d6db75 100644
25129--- a/arch/x86/kernel/io_delay.c
25130+++ b/arch/x86/kernel/io_delay.c
25131@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25132 * Quirk table for systems that misbehave (lock up, etc.) if port
25133 * 0x80 is used:
25134 */
25135-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25136+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25137 {
25138 .callback = dmi_io_delay_0xed_port,
25139 .ident = "Compaq Presario V6000",
25140diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25141index 4ddaf66..49d5c18 100644
25142--- a/arch/x86/kernel/ioport.c
25143+++ b/arch/x86/kernel/ioport.c
25144@@ -6,6 +6,7 @@
25145 #include <linux/sched.h>
25146 #include <linux/kernel.h>
25147 #include <linux/capability.h>
25148+#include <linux/security.h>
25149 #include <linux/errno.h>
25150 #include <linux/types.h>
25151 #include <linux/ioport.h>
25152@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25153 return -EINVAL;
25154 if (turn_on && !capable(CAP_SYS_RAWIO))
25155 return -EPERM;
25156+#ifdef CONFIG_GRKERNSEC_IO
25157+ if (turn_on && grsec_disable_privio) {
25158+ gr_handle_ioperm();
25159+ return -ENODEV;
25160+ }
25161+#endif
25162
25163 /*
25164 * If it's the first ioperm() call in this thread's lifetime, set the
25165@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25166 * because the ->io_bitmap_max value must match the bitmap
25167 * contents:
25168 */
25169- tss = &per_cpu(init_tss, get_cpu());
25170+ tss = init_tss + get_cpu();
25171
25172 if (turn_on)
25173 bitmap_clear(t->io_bitmap_ptr, from, num);
25174@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25175 if (level > old) {
25176 if (!capable(CAP_SYS_RAWIO))
25177 return -EPERM;
25178+#ifdef CONFIG_GRKERNSEC_IO
25179+ if (grsec_disable_privio) {
25180+ gr_handle_iopl();
25181+ return -ENODEV;
25182+ }
25183+#endif
25184 }
25185 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25186 t->iopl = level << 12;
25187diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25188index 67b1cbe..6ad4cbc 100644
25189--- a/arch/x86/kernel/irq.c
25190+++ b/arch/x86/kernel/irq.c
25191@@ -22,7 +22,7 @@
25192 #define CREATE_TRACE_POINTS
25193 #include <asm/trace/irq_vectors.h>
25194
25195-atomic_t irq_err_count;
25196+atomic_unchecked_t irq_err_count;
25197
25198 /* Function pointer for generic interrupt vector handling */
25199 void (*x86_platform_ipi_callback)(void) = NULL;
25200@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25201 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25202 seq_puts(p, " Hypervisor callback interrupts\n");
25203 #endif
25204- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25205+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25206 #if defined(CONFIG_X86_IO_APIC)
25207- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25208+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25209 #endif
25210 return 0;
25211 }
25212@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25213
25214 u64 arch_irq_stat(void)
25215 {
25216- u64 sum = atomic_read(&irq_err_count);
25217+ u64 sum = atomic_read_unchecked(&irq_err_count);
25218 return sum;
25219 }
25220
25221diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25222index 28d28f5..e6cc9ae 100644
25223--- a/arch/x86/kernel/irq_32.c
25224+++ b/arch/x86/kernel/irq_32.c
25225@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25226
25227 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25228
25229+extern void gr_handle_kernel_exploit(void);
25230+
25231 int sysctl_panic_on_stackoverflow __read_mostly;
25232
25233 /* Debugging check for stack overflow: is there less than 1KB free? */
25234@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25235 __asm__ __volatile__("andl %%esp,%0" :
25236 "=r" (sp) : "0" (THREAD_SIZE - 1));
25237
25238- return sp < (sizeof(struct thread_info) + STACK_WARN);
25239+ return sp < STACK_WARN;
25240 }
25241
25242 static void print_stack_overflow(void)
25243 {
25244 printk(KERN_WARNING "low stack detected by irq handler\n");
25245 dump_stack();
25246+ gr_handle_kernel_exploit();
25247 if (sysctl_panic_on_stackoverflow)
25248 panic("low stack detected by irq handler - check messages\n");
25249 }
25250@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25251 static inline int
25252 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25253 {
25254- struct irq_stack *curstk, *irqstk;
25255+ struct irq_stack *irqstk;
25256 u32 *isp, *prev_esp, arg1, arg2;
25257
25258- curstk = (struct irq_stack *) current_stack();
25259 irqstk = __this_cpu_read(hardirq_stack);
25260
25261 /*
25262@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25263 * handler) we can't do that and just have to keep using the
25264 * current stack (which is the irq stack already after all)
25265 */
25266- if (unlikely(curstk == irqstk))
25267+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25268 return 0;
25269
25270- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25271+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25272
25273 /* Save the next esp at the bottom of the stack */
25274 prev_esp = (u32 *)irqstk;
25275 *prev_esp = current_stack_pointer();
25276
25277+#ifdef CONFIG_PAX_MEMORY_UDEREF
25278+ __set_fs(MAKE_MM_SEG(0));
25279+#endif
25280+
25281 if (unlikely(overflow))
25282 call_on_stack(print_stack_overflow, isp);
25283
25284@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25285 : "0" (irq), "1" (desc), "2" (isp),
25286 "D" (desc->handle_irq)
25287 : "memory", "cc", "ecx");
25288+
25289+#ifdef CONFIG_PAX_MEMORY_UDEREF
25290+ __set_fs(current_thread_info()->addr_limit);
25291+#endif
25292+
25293 return 1;
25294 }
25295
25296@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25297 */
25298 void irq_ctx_init(int cpu)
25299 {
25300- struct irq_stack *irqstk;
25301-
25302 if (per_cpu(hardirq_stack, cpu))
25303 return;
25304
25305- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25306- THREADINFO_GFP,
25307- THREAD_SIZE_ORDER));
25308- per_cpu(hardirq_stack, cpu) = irqstk;
25309-
25310- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25311- THREADINFO_GFP,
25312- THREAD_SIZE_ORDER));
25313- per_cpu(softirq_stack, cpu) = irqstk;
25314-
25315- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25316- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25317+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25318+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25319 }
25320
25321 void do_softirq_own_stack(void)
25322 {
25323- struct thread_info *curstk;
25324 struct irq_stack *irqstk;
25325 u32 *isp, *prev_esp;
25326
25327- curstk = current_stack();
25328 irqstk = __this_cpu_read(softirq_stack);
25329
25330 /* build the stack frame on the softirq stack */
25331@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25332 prev_esp = (u32 *)irqstk;
25333 *prev_esp = current_stack_pointer();
25334
25335+#ifdef CONFIG_PAX_MEMORY_UDEREF
25336+ __set_fs(MAKE_MM_SEG(0));
25337+#endif
25338+
25339 call_on_stack(__do_softirq, isp);
25340+
25341+#ifdef CONFIG_PAX_MEMORY_UDEREF
25342+ __set_fs(current_thread_info()->addr_limit);
25343+#endif
25344+
25345 }
25346
25347 bool handle_irq(unsigned irq, struct pt_regs *regs)
25348@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25349 if (unlikely(!desc))
25350 return false;
25351
25352- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25353+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25354 if (unlikely(overflow))
25355 print_stack_overflow();
25356 desc->handle_irq(irq, desc);
25357diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25358index e4b503d..824fce8 100644
25359--- a/arch/x86/kernel/irq_64.c
25360+++ b/arch/x86/kernel/irq_64.c
25361@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25362 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25363 EXPORT_PER_CPU_SYMBOL(irq_regs);
25364
25365+extern void gr_handle_kernel_exploit(void);
25366+
25367 int sysctl_panic_on_stackoverflow;
25368
25369 /*
25370@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25371 u64 estack_top, estack_bottom;
25372 u64 curbase = (u64)task_stack_page(current);
25373
25374- if (user_mode_vm(regs))
25375+ if (user_mode(regs))
25376 return;
25377
25378 if (regs->sp >= curbase + sizeof(struct thread_info) +
25379@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25380 irq_stack_top, irq_stack_bottom,
25381 estack_top, estack_bottom);
25382
25383+ gr_handle_kernel_exploit();
25384+
25385 if (sysctl_panic_on_stackoverflow)
25386 panic("low stack detected by irq handler - check messages\n");
25387 #endif
25388diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25389index 26d5a55..a01160a 100644
25390--- a/arch/x86/kernel/jump_label.c
25391+++ b/arch/x86/kernel/jump_label.c
25392@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25393 * Jump label is enabled for the first time.
25394 * So we expect a default_nop...
25395 */
25396- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25397+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25398 != 0))
25399 bug_at((void *)entry->code, __LINE__);
25400 } else {
25401@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25402 * ...otherwise expect an ideal_nop. Otherwise
25403 * something went horribly wrong.
25404 */
25405- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25406+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25407 != 0))
25408 bug_at((void *)entry->code, __LINE__);
25409 }
25410@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25411 * are converting the default nop to the ideal nop.
25412 */
25413 if (init) {
25414- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25415+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25416 bug_at((void *)entry->code, __LINE__);
25417 } else {
25418 code.jump = 0xe9;
25419 code.offset = entry->target -
25420 (entry->code + JUMP_LABEL_NOP_SIZE);
25421- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25422+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25423 bug_at((void *)entry->code, __LINE__);
25424 }
25425 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25426diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25427index 25ecd56..e12482f 100644
25428--- a/arch/x86/kernel/kgdb.c
25429+++ b/arch/x86/kernel/kgdb.c
25430@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25431 #ifdef CONFIG_X86_32
25432 switch (regno) {
25433 case GDB_SS:
25434- if (!user_mode_vm(regs))
25435+ if (!user_mode(regs))
25436 *(unsigned long *)mem = __KERNEL_DS;
25437 break;
25438 case GDB_SP:
25439- if (!user_mode_vm(regs))
25440+ if (!user_mode(regs))
25441 *(unsigned long *)mem = kernel_stack_pointer(regs);
25442 break;
25443 case GDB_GS:
25444@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25445 bp->attr.bp_addr = breakinfo[breakno].addr;
25446 bp->attr.bp_len = breakinfo[breakno].len;
25447 bp->attr.bp_type = breakinfo[breakno].type;
25448- info->address = breakinfo[breakno].addr;
25449+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25450+ info->address = ktla_ktva(breakinfo[breakno].addr);
25451+ else
25452+ info->address = breakinfo[breakno].addr;
25453 info->len = breakinfo[breakno].len;
25454 info->type = breakinfo[breakno].type;
25455 val = arch_install_hw_breakpoint(bp);
25456@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25457 case 'k':
25458 /* clear the trace bit */
25459 linux_regs->flags &= ~X86_EFLAGS_TF;
25460- atomic_set(&kgdb_cpu_doing_single_step, -1);
25461+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25462
25463 /* set the trace bit if we're stepping */
25464 if (remcomInBuffer[0] == 's') {
25465 linux_regs->flags |= X86_EFLAGS_TF;
25466- atomic_set(&kgdb_cpu_doing_single_step,
25467+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25468 raw_smp_processor_id());
25469 }
25470
25471@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25472
25473 switch (cmd) {
25474 case DIE_DEBUG:
25475- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25476+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25477 if (user_mode(regs))
25478 return single_step_cont(regs, args);
25479 break;
25480@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25481 #endif /* CONFIG_DEBUG_RODATA */
25482
25483 bpt->type = BP_BREAKPOINT;
25484- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25485+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25486 BREAK_INSTR_SIZE);
25487 if (err)
25488 return err;
25489- err = probe_kernel_write((char *)bpt->bpt_addr,
25490+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25491 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25492 #ifdef CONFIG_DEBUG_RODATA
25493 if (!err)
25494@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25495 return -EBUSY;
25496 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25497 BREAK_INSTR_SIZE);
25498- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25499+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25500 if (err)
25501 return err;
25502 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25503@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25504 if (mutex_is_locked(&text_mutex))
25505 goto knl_write;
25506 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25507- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25508+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25509 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25510 goto knl_write;
25511 return err;
25512 knl_write:
25513 #endif /* CONFIG_DEBUG_RODATA */
25514- return probe_kernel_write((char *)bpt->bpt_addr,
25515+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25516 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25517 }
25518
25519diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25520index 4e3d5a9..03fffd8 100644
25521--- a/arch/x86/kernel/kprobes/core.c
25522+++ b/arch/x86/kernel/kprobes/core.c
25523@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25524 s32 raddr;
25525 } __packed *insn;
25526
25527- insn = (struct __arch_relative_insn *)from;
25528+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25529+
25530+ pax_open_kernel();
25531 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25532 insn->op = op;
25533+ pax_close_kernel();
25534 }
25535
25536 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25537@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25538 kprobe_opcode_t opcode;
25539 kprobe_opcode_t *orig_opcodes = opcodes;
25540
25541- if (search_exception_tables((unsigned long)opcodes))
25542+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25543 return 0; /* Page fault may occur on this address. */
25544
25545 retry:
25546@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25547 * Fortunately, we know that the original code is the ideal 5-byte
25548 * long NOP.
25549 */
25550- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25551+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25552 if (faddr)
25553 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25554 else
25555 buf[0] = kp->opcode;
25556- return (unsigned long)buf;
25557+ return ktva_ktla((unsigned long)buf);
25558 }
25559
25560 /*
25561@@ -364,7 +367,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25562 /* Another subsystem puts a breakpoint, failed to recover */
25563 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25564 return 0;
25565+ pax_open_kernel();
25566 memcpy(dest, insn.kaddr, insn.length);
25567+ pax_close_kernel();
25568
25569 #ifdef CONFIG_X86_64
25570 if (insn_rip_relative(&insn)) {
25571@@ -391,7 +396,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25572 return 0;
25573 }
25574 disp = (u8 *) dest + insn_offset_displacement(&insn);
25575+ pax_open_kernel();
25576 *(s32 *) disp = (s32) newdisp;
25577+ pax_close_kernel();
25578 }
25579 #endif
25580 return insn.length;
25581@@ -533,7 +540,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25582 * nor set current_kprobe, because it doesn't use single
25583 * stepping.
25584 */
25585- regs->ip = (unsigned long)p->ainsn.insn;
25586+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25587 preempt_enable_no_resched();
25588 return;
25589 }
25590@@ -550,9 +557,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25591 regs->flags &= ~X86_EFLAGS_IF;
25592 /* single step inline if the instruction is an int3 */
25593 if (p->opcode == BREAKPOINT_INSTRUCTION)
25594- regs->ip = (unsigned long)p->addr;
25595+ regs->ip = ktla_ktva((unsigned long)p->addr);
25596 else
25597- regs->ip = (unsigned long)p->ainsn.insn;
25598+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25599 }
25600 NOKPROBE_SYMBOL(setup_singlestep);
25601
25602@@ -602,7 +609,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25603 struct kprobe *p;
25604 struct kprobe_ctlblk *kcb;
25605
25606- if (user_mode_vm(regs))
25607+ if (user_mode(regs))
25608 return 0;
25609
25610 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25611@@ -637,7 +644,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25612 setup_singlestep(p, regs, kcb, 0);
25613 return 1;
25614 }
25615- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25616+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25617 /*
25618 * The breakpoint instruction was removed right
25619 * after we hit it. Another cpu has removed
25620@@ -684,6 +691,9 @@ static void __used kretprobe_trampoline_holder(void)
25621 " movq %rax, 152(%rsp)\n"
25622 RESTORE_REGS_STRING
25623 " popfq\n"
25624+#ifdef KERNEXEC_PLUGIN
25625+ " btsq $63,(%rsp)\n"
25626+#endif
25627 #else
25628 " pushf\n"
25629 SAVE_REGS_STRING
25630@@ -824,7 +834,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25631 struct kprobe_ctlblk *kcb)
25632 {
25633 unsigned long *tos = stack_addr(regs);
25634- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25635+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25636 unsigned long orig_ip = (unsigned long)p->addr;
25637 kprobe_opcode_t *insn = p->ainsn.insn;
25638
25639@@ -1007,7 +1017,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25640 struct die_args *args = data;
25641 int ret = NOTIFY_DONE;
25642
25643- if (args->regs && user_mode_vm(args->regs))
25644+ if (args->regs && user_mode(args->regs))
25645 return ret;
25646
25647 if (val == DIE_GPF) {
25648diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25649index 7b3b9d1..e2478b91 100644
25650--- a/arch/x86/kernel/kprobes/opt.c
25651+++ b/arch/x86/kernel/kprobes/opt.c
25652@@ -79,6 +79,7 @@ found:
25653 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25654 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25655 {
25656+ pax_open_kernel();
25657 #ifdef CONFIG_X86_64
25658 *addr++ = 0x48;
25659 *addr++ = 0xbf;
25660@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25661 *addr++ = 0xb8;
25662 #endif
25663 *(unsigned long *)addr = val;
25664+ pax_close_kernel();
25665 }
25666
25667 asm (
25668@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25669 * Verify if the address gap is in 2GB range, because this uses
25670 * a relative jump.
25671 */
25672- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25673+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25674 if (abs(rel) > 0x7fffffff) {
25675 __arch_remove_optimized_kprobe(op, 0);
25676 return -ERANGE;
25677@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25678 op->optinsn.size = ret;
25679
25680 /* Copy arch-dep-instance from template */
25681- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25682+ pax_open_kernel();
25683+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25684+ pax_close_kernel();
25685
25686 /* Set probe information */
25687 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25688
25689 /* Set probe function call */
25690- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25691+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25692
25693 /* Set returning jmp instruction at the tail of out-of-line buffer */
25694- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25695+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25696 (u8 *)op->kp.addr + op->optinsn.size);
25697
25698 flush_icache_range((unsigned long) buf,
25699@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25700 WARN_ON(kprobe_disabled(&op->kp));
25701
25702 /* Backup instructions which will be replaced by jump address */
25703- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25704+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25705 RELATIVE_ADDR_SIZE);
25706
25707 insn_buf[0] = RELATIVEJUMP_OPCODE;
25708@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25709 /* This kprobe is really able to run optimized path. */
25710 op = container_of(p, struct optimized_kprobe, kp);
25711 /* Detour through copied instructions */
25712- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25713+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25714 if (!reenter)
25715 reset_current_kprobe();
25716 preempt_enable_no_resched();
25717diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25718index c2bedae..25e7ab60 100644
25719--- a/arch/x86/kernel/ksysfs.c
25720+++ b/arch/x86/kernel/ksysfs.c
25721@@ -184,7 +184,7 @@ out:
25722
25723 static struct kobj_attribute type_attr = __ATTR_RO(type);
25724
25725-static struct bin_attribute data_attr = {
25726+static bin_attribute_no_const data_attr __read_only = {
25727 .attr = {
25728 .name = "data",
25729 .mode = S_IRUGO,
25730diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25731index c37886d..d851d32 100644
25732--- a/arch/x86/kernel/ldt.c
25733+++ b/arch/x86/kernel/ldt.c
25734@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25735 if (reload) {
25736 #ifdef CONFIG_SMP
25737 preempt_disable();
25738- load_LDT(pc);
25739+ load_LDT_nolock(pc);
25740 if (!cpumask_equal(mm_cpumask(current->mm),
25741 cpumask_of(smp_processor_id())))
25742 smp_call_function(flush_ldt, current->mm, 1);
25743 preempt_enable();
25744 #else
25745- load_LDT(pc);
25746+ load_LDT_nolock(pc);
25747 #endif
25748 }
25749 if (oldsize) {
25750@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25751 return err;
25752
25753 for (i = 0; i < old->size; i++)
25754- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25755+ write_ldt_entry(new->ldt, i, old->ldt + i);
25756 return 0;
25757 }
25758
25759@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25760 retval = copy_ldt(&mm->context, &old_mm->context);
25761 mutex_unlock(&old_mm->context.lock);
25762 }
25763+
25764+ if (tsk == current) {
25765+ mm->context.vdso = 0;
25766+
25767+#ifdef CONFIG_X86_32
25768+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25769+ mm->context.user_cs_base = 0UL;
25770+ mm->context.user_cs_limit = ~0UL;
25771+
25772+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25773+ cpus_clear(mm->context.cpu_user_cs_mask);
25774+#endif
25775+
25776+#endif
25777+#endif
25778+
25779+ }
25780+
25781 return retval;
25782 }
25783
25784@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25785 }
25786 }
25787
25788+#ifdef CONFIG_PAX_SEGMEXEC
25789+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25790+ error = -EINVAL;
25791+ goto out_unlock;
25792+ }
25793+#endif
25794+
25795 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25796 error = -EINVAL;
25797 goto out_unlock;
25798diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25799index ff3c3101d..d7c0cd8 100644
25800--- a/arch/x86/kernel/livepatch.c
25801+++ b/arch/x86/kernel/livepatch.c
25802@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25803 int ret, numpages, size = 4;
25804 bool readonly;
25805 unsigned long val;
25806- unsigned long core = (unsigned long)mod->module_core;
25807- unsigned long core_ro_size = mod->core_ro_size;
25808- unsigned long core_size = mod->core_size;
25809+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25810+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25811+ unsigned long core_size_rx = mod->core_size_rx;
25812+ unsigned long core_size_rw = mod->core_size_rw;
25813
25814 switch (type) {
25815 case R_X86_64_NONE:
25816@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25817 return -EINVAL;
25818 }
25819
25820- if (loc < core || loc >= core + core_size)
25821+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25822+ (loc < core_rw || loc >= core_rw + core_size_rw))
25823 /* loc does not point to any symbol inside the module */
25824 return -EINVAL;
25825
25826- if (loc < core + core_ro_size)
25827+ if (loc < core_rx + core_size_rx)
25828 readonly = true;
25829 else
25830 readonly = false;
25831diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25832index 469b23d..5449cfe 100644
25833--- a/arch/x86/kernel/machine_kexec_32.c
25834+++ b/arch/x86/kernel/machine_kexec_32.c
25835@@ -26,7 +26,7 @@
25836 #include <asm/cacheflush.h>
25837 #include <asm/debugreg.h>
25838
25839-static void set_idt(void *newidt, __u16 limit)
25840+static void set_idt(struct desc_struct *newidt, __u16 limit)
25841 {
25842 struct desc_ptr curidt;
25843
25844@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25845 }
25846
25847
25848-static void set_gdt(void *newgdt, __u16 limit)
25849+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25850 {
25851 struct desc_ptr curgdt;
25852
25853@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25854 }
25855
25856 control_page = page_address(image->control_code_page);
25857- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25858+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25859
25860 relocate_kernel_ptr = control_page;
25861 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25862diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25863index 94ea120..4154cea 100644
25864--- a/arch/x86/kernel/mcount_64.S
25865+++ b/arch/x86/kernel/mcount_64.S
25866@@ -7,7 +7,7 @@
25867 #include <linux/linkage.h>
25868 #include <asm/ptrace.h>
25869 #include <asm/ftrace.h>
25870-
25871+#include <asm/alternative-asm.h>
25872
25873 .code64
25874 .section .entry.text, "ax"
25875@@ -148,8 +148,9 @@
25876 #ifdef CONFIG_DYNAMIC_FTRACE
25877
25878 ENTRY(function_hook)
25879+ pax_force_retaddr
25880 retq
25881-END(function_hook)
25882+ENDPROC(function_hook)
25883
25884 ENTRY(ftrace_caller)
25885 /* save_mcount_regs fills in first two parameters */
25886@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25887 #endif
25888
25889 GLOBAL(ftrace_stub)
25890+ pax_force_retaddr
25891 retq
25892-END(ftrace_caller)
25893+ENDPROC(ftrace_caller)
25894
25895 ENTRY(ftrace_regs_caller)
25896 /* Save the current flags before any operations that can change them */
25897@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25898
25899 jmp ftrace_return
25900
25901-END(ftrace_regs_caller)
25902+ENDPROC(ftrace_regs_caller)
25903
25904
25905 #else /* ! CONFIG_DYNAMIC_FTRACE */
25906@@ -272,18 +274,20 @@ fgraph_trace:
25907 #endif
25908
25909 GLOBAL(ftrace_stub)
25910+ pax_force_retaddr
25911 retq
25912
25913 trace:
25914 /* save_mcount_regs fills in first two parameters */
25915 save_mcount_regs
25916
25917+ pax_force_fptr ftrace_trace_function
25918 call *ftrace_trace_function
25919
25920 restore_mcount_regs
25921
25922 jmp fgraph_trace
25923-END(function_hook)
25924+ENDPROC(function_hook)
25925 #endif /* CONFIG_DYNAMIC_FTRACE */
25926 #endif /* CONFIG_FUNCTION_TRACER */
25927
25928@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25929
25930 restore_mcount_regs
25931
25932+ pax_force_retaddr
25933 retq
25934-END(ftrace_graph_caller)
25935+ENDPROC(ftrace_graph_caller)
25936
25937 GLOBAL(return_to_handler)
25938 subq $24, %rsp
25939@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
25940 movq 8(%rsp), %rdx
25941 movq (%rsp), %rax
25942 addq $24, %rsp
25943+ pax_force_fptr %rdi
25944 jmp *%rdi
25945+ENDPROC(return_to_handler)
25946 #endif
25947diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25948index d1ac80b..f593701 100644
25949--- a/arch/x86/kernel/module.c
25950+++ b/arch/x86/kernel/module.c
25951@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
25952 }
25953 #endif
25954
25955-void *module_alloc(unsigned long size)
25956+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25957 {
25958 void *p;
25959
25960- if (PAGE_ALIGN(size) > MODULES_LEN)
25961+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25962 return NULL;
25963
25964 p = __vmalloc_node_range(size, MODULE_ALIGN,
25965 MODULES_VADDR + get_module_load_offset(),
25966- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25967- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
25968+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25969+ prot, 0, NUMA_NO_NODE,
25970 __builtin_return_address(0));
25971 if (p && (kasan_module_alloc(p, size) < 0)) {
25972 vfree(p);
25973@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
25974 return p;
25975 }
25976
25977+void *module_alloc(unsigned long size)
25978+{
25979+
25980+#ifdef CONFIG_PAX_KERNEXEC
25981+ return __module_alloc(size, PAGE_KERNEL);
25982+#else
25983+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25984+#endif
25985+
25986+}
25987+
25988+#ifdef CONFIG_PAX_KERNEXEC
25989+#ifdef CONFIG_X86_32
25990+void *module_alloc_exec(unsigned long size)
25991+{
25992+ struct vm_struct *area;
25993+
25994+ if (size == 0)
25995+ return NULL;
25996+
25997+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25998+return area ? area->addr : NULL;
25999+}
26000+EXPORT_SYMBOL(module_alloc_exec);
26001+
26002+void module_memfree_exec(void *module_region)
26003+{
26004+ vunmap(module_region);
26005+}
26006+EXPORT_SYMBOL(module_memfree_exec);
26007+#else
26008+void module_memfree_exec(void *module_region)
26009+{
26010+ module_memfree(module_region);
26011+}
26012+EXPORT_SYMBOL(module_memfree_exec);
26013+
26014+void *module_alloc_exec(unsigned long size)
26015+{
26016+ return __module_alloc(size, PAGE_KERNEL_RX);
26017+}
26018+EXPORT_SYMBOL(module_alloc_exec);
26019+#endif
26020+#endif
26021+
26022 #ifdef CONFIG_X86_32
26023 int apply_relocate(Elf32_Shdr *sechdrs,
26024 const char *strtab,
26025@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26026 unsigned int i;
26027 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26028 Elf32_Sym *sym;
26029- uint32_t *location;
26030+ uint32_t *plocation, location;
26031
26032 DEBUGP("Applying relocate section %u to %u\n",
26033 relsec, sechdrs[relsec].sh_info);
26034 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26035 /* This is where to make the change */
26036- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26037- + rel[i].r_offset;
26038+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26039+ location = (uint32_t)plocation;
26040+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26041+ plocation = ktla_ktva((void *)plocation);
26042 /* This is the symbol it is referring to. Note that all
26043 undefined symbols have been resolved. */
26044 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26045@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26046 switch (ELF32_R_TYPE(rel[i].r_info)) {
26047 case R_386_32:
26048 /* We add the value into the location given */
26049- *location += sym->st_value;
26050+ pax_open_kernel();
26051+ *plocation += sym->st_value;
26052+ pax_close_kernel();
26053 break;
26054 case R_386_PC32:
26055 /* Add the value, subtract its position */
26056- *location += sym->st_value - (uint32_t)location;
26057+ pax_open_kernel();
26058+ *plocation += sym->st_value - location;
26059+ pax_close_kernel();
26060 break;
26061 default:
26062 pr_err("%s: Unknown relocation: %u\n",
26063@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26064 case R_X86_64_NONE:
26065 break;
26066 case R_X86_64_64:
26067+ pax_open_kernel();
26068 *(u64 *)loc = val;
26069+ pax_close_kernel();
26070 break;
26071 case R_X86_64_32:
26072+ pax_open_kernel();
26073 *(u32 *)loc = val;
26074+ pax_close_kernel();
26075 if (val != *(u32 *)loc)
26076 goto overflow;
26077 break;
26078 case R_X86_64_32S:
26079+ pax_open_kernel();
26080 *(s32 *)loc = val;
26081+ pax_close_kernel();
26082 if ((s64)val != *(s32 *)loc)
26083 goto overflow;
26084 break;
26085 case R_X86_64_PC32:
26086 val -= (u64)loc;
26087+ pax_open_kernel();
26088 *(u32 *)loc = val;
26089+ pax_close_kernel();
26090+
26091 #if 0
26092 if ((s64)val != *(s32 *)loc)
26093 goto overflow;
26094diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26095index 113e707..0a690e1 100644
26096--- a/arch/x86/kernel/msr.c
26097+++ b/arch/x86/kernel/msr.c
26098@@ -39,6 +39,7 @@
26099 #include <linux/notifier.h>
26100 #include <linux/uaccess.h>
26101 #include <linux/gfp.h>
26102+#include <linux/grsecurity.h>
26103
26104 #include <asm/processor.h>
26105 #include <asm/msr.h>
26106@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26107 int err = 0;
26108 ssize_t bytes = 0;
26109
26110+#ifdef CONFIG_GRKERNSEC_KMEM
26111+ gr_handle_msr_write();
26112+ return -EPERM;
26113+#endif
26114+
26115 if (count % 8)
26116 return -EINVAL; /* Invalid chunk size */
26117
26118@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26119 err = -EBADF;
26120 break;
26121 }
26122+#ifdef CONFIG_GRKERNSEC_KMEM
26123+ gr_handle_msr_write();
26124+ return -EPERM;
26125+#endif
26126 if (copy_from_user(&regs, uregs, sizeof regs)) {
26127 err = -EFAULT;
26128 break;
26129@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26130 return notifier_from_errno(err);
26131 }
26132
26133-static struct notifier_block __refdata msr_class_cpu_notifier = {
26134+static struct notifier_block msr_class_cpu_notifier = {
26135 .notifier_call = msr_class_cpu_callback,
26136 };
26137
26138diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26139index c3e985d..110a36a 100644
26140--- a/arch/x86/kernel/nmi.c
26141+++ b/arch/x86/kernel/nmi.c
26142@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26143
26144 static void nmi_max_handler(struct irq_work *w)
26145 {
26146- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26147+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26148 int remainder_ns, decimal_msecs;
26149- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26150+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26151
26152 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26153 decimal_msecs = remainder_ns / 1000;
26154
26155 printk_ratelimited(KERN_INFO
26156 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26157- a->handler, whole_msecs, decimal_msecs);
26158+ n->action->handler, whole_msecs, decimal_msecs);
26159 }
26160
26161 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26162@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26163 delta = sched_clock() - delta;
26164 trace_nmi_handler(a->handler, (int)delta, thishandled);
26165
26166- if (delta < nmi_longest_ns || delta < a->max_duration)
26167+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26168 continue;
26169
26170- a->max_duration = delta;
26171- irq_work_queue(&a->irq_work);
26172+ a->work->max_duration = delta;
26173+ irq_work_queue(&a->work->irq_work);
26174 }
26175
26176 rcu_read_unlock();
26177@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26178 }
26179 NOKPROBE_SYMBOL(nmi_handle);
26180
26181-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26182+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26183 {
26184 struct nmi_desc *desc = nmi_to_desc(type);
26185 unsigned long flags;
26186@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26187 if (!action->handler)
26188 return -EINVAL;
26189
26190- init_irq_work(&action->irq_work, nmi_max_handler);
26191+ action->work->action = action;
26192+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26193
26194 spin_lock_irqsave(&desc->lock, flags);
26195
26196@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26197 * event confuses some handlers (kdump uses this flag)
26198 */
26199 if (action->flags & NMI_FLAG_FIRST)
26200- list_add_rcu(&action->list, &desc->head);
26201+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26202 else
26203- list_add_tail_rcu(&action->list, &desc->head);
26204+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26205
26206 spin_unlock_irqrestore(&desc->lock, flags);
26207 return 0;
26208@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26209 if (!strcmp(n->name, name)) {
26210 WARN(in_nmi(),
26211 "Trying to free NMI (%s) from NMI context!\n", n->name);
26212- list_del_rcu(&n->list);
26213+ pax_list_del_rcu((struct list_head *)&n->list);
26214 break;
26215 }
26216 }
26217@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26218 dotraplinkage notrace void
26219 do_nmi(struct pt_regs *regs, long error_code)
26220 {
26221+
26222+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26223+ if (!user_mode(regs)) {
26224+ unsigned long cs = regs->cs & 0xFFFF;
26225+ unsigned long ip = ktva_ktla(regs->ip);
26226+
26227+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26228+ regs->ip = ip;
26229+ }
26230+#endif
26231+
26232 nmi_nesting_preprocess(regs);
26233
26234 nmi_enter();
26235diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26236index 6d9582e..f746287 100644
26237--- a/arch/x86/kernel/nmi_selftest.c
26238+++ b/arch/x86/kernel/nmi_selftest.c
26239@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26240 {
26241 /* trap all the unknown NMIs we may generate */
26242 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26243- __initdata);
26244+ __initconst);
26245 }
26246
26247 static void __init cleanup_nmi_testsuite(void)
26248@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26249 unsigned long timeout;
26250
26251 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26252- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26253+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26254 nmi_fail = FAILURE;
26255 return;
26256 }
26257diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26258index bbb6c73..24a58ef 100644
26259--- a/arch/x86/kernel/paravirt-spinlocks.c
26260+++ b/arch/x86/kernel/paravirt-spinlocks.c
26261@@ -8,7 +8,7 @@
26262
26263 #include <asm/paravirt.h>
26264
26265-struct pv_lock_ops pv_lock_ops = {
26266+struct pv_lock_ops pv_lock_ops __read_only = {
26267 #ifdef CONFIG_SMP
26268 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26269 .unlock_kick = paravirt_nop,
26270diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26271index 548d25f..f8fb99c 100644
26272--- a/arch/x86/kernel/paravirt.c
26273+++ b/arch/x86/kernel/paravirt.c
26274@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26275 {
26276 return x;
26277 }
26278+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26279+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26280+#endif
26281
26282 void __init default_banner(void)
26283 {
26284@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26285
26286 if (opfunc == NULL)
26287 /* If there's no function, patch it with a ud2a (BUG) */
26288- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26289- else if (opfunc == _paravirt_nop)
26290+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26291+ else if (opfunc == (void *)_paravirt_nop)
26292 /* If the operation is a nop, then nop the callsite */
26293 ret = paravirt_patch_nop();
26294
26295 /* identity functions just return their single argument */
26296- else if (opfunc == _paravirt_ident_32)
26297+ else if (opfunc == (void *)_paravirt_ident_32)
26298 ret = paravirt_patch_ident_32(insnbuf, len);
26299- else if (opfunc == _paravirt_ident_64)
26300+ else if (opfunc == (void *)_paravirt_ident_64)
26301 ret = paravirt_patch_ident_64(insnbuf, len);
26302+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26303+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26304+ ret = paravirt_patch_ident_64(insnbuf, len);
26305+#endif
26306
26307 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26308 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26309@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26310 if (insn_len > len || start == NULL)
26311 insn_len = len;
26312 else
26313- memcpy(insnbuf, start, insn_len);
26314+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26315
26316 return insn_len;
26317 }
26318@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26319 return this_cpu_read(paravirt_lazy_mode);
26320 }
26321
26322-struct pv_info pv_info = {
26323+struct pv_info pv_info __read_only = {
26324 .name = "bare hardware",
26325 .paravirt_enabled = 0,
26326 .kernel_rpl = 0,
26327@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26328 #endif
26329 };
26330
26331-struct pv_init_ops pv_init_ops = {
26332+struct pv_init_ops pv_init_ops __read_only = {
26333 .patch = native_patch,
26334 };
26335
26336-struct pv_time_ops pv_time_ops = {
26337+struct pv_time_ops pv_time_ops __read_only = {
26338 .sched_clock = native_sched_clock,
26339 .steal_clock = native_steal_clock,
26340 };
26341
26342-__visible struct pv_irq_ops pv_irq_ops = {
26343+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26344 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26345 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26346 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26347@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26348 #endif
26349 };
26350
26351-__visible struct pv_cpu_ops pv_cpu_ops = {
26352+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26353 .cpuid = native_cpuid,
26354 .get_debugreg = native_get_debugreg,
26355 .set_debugreg = native_set_debugreg,
26356@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26357 NOKPROBE_SYMBOL(native_set_debugreg);
26358 NOKPROBE_SYMBOL(native_load_idt);
26359
26360-struct pv_apic_ops pv_apic_ops = {
26361+struct pv_apic_ops pv_apic_ops __read_only= {
26362 #ifdef CONFIG_X86_LOCAL_APIC
26363 .startup_ipi_hook = paravirt_nop,
26364 #endif
26365 };
26366
26367-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26368+#ifdef CONFIG_X86_32
26369+#ifdef CONFIG_X86_PAE
26370+/* 64-bit pagetable entries */
26371+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26372+#else
26373 /* 32-bit pagetable entries */
26374 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26375+#endif
26376 #else
26377 /* 64-bit pagetable entries */
26378 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26379 #endif
26380
26381-struct pv_mmu_ops pv_mmu_ops = {
26382+struct pv_mmu_ops pv_mmu_ops __read_only = {
26383
26384 .read_cr2 = native_read_cr2,
26385 .write_cr2 = native_write_cr2,
26386@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26387 .make_pud = PTE_IDENT,
26388
26389 .set_pgd = native_set_pgd,
26390+ .set_pgd_batched = native_set_pgd_batched,
26391 #endif
26392 #endif /* PAGETABLE_LEVELS >= 3 */
26393
26394@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26395 },
26396
26397 .set_fixmap = native_set_fixmap,
26398+
26399+#ifdef CONFIG_PAX_KERNEXEC
26400+ .pax_open_kernel = native_pax_open_kernel,
26401+ .pax_close_kernel = native_pax_close_kernel,
26402+#endif
26403+
26404 };
26405
26406 EXPORT_SYMBOL_GPL(pv_time_ops);
26407diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26408index a1da673..b6f5831 100644
26409--- a/arch/x86/kernel/paravirt_patch_64.c
26410+++ b/arch/x86/kernel/paravirt_patch_64.c
26411@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26412 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26413 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26414 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26415+
26416+#ifndef CONFIG_PAX_MEMORY_UDEREF
26417 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26418+#endif
26419+
26420 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26421 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26422
26423@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26424 PATCH_SITE(pv_mmu_ops, read_cr3);
26425 PATCH_SITE(pv_mmu_ops, write_cr3);
26426 PATCH_SITE(pv_cpu_ops, clts);
26427+
26428+#ifndef CONFIG_PAX_MEMORY_UDEREF
26429 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26430+#endif
26431+
26432 PATCH_SITE(pv_cpu_ops, wbinvd);
26433
26434 patch_site:
26435diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26436index 0497f71..7186c0d 100644
26437--- a/arch/x86/kernel/pci-calgary_64.c
26438+++ b/arch/x86/kernel/pci-calgary_64.c
26439@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26440 tce_space = be64_to_cpu(readq(target));
26441 tce_space = tce_space & TAR_SW_BITS;
26442
26443- tce_space = tce_space & (~specified_table_size);
26444+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26445 info->tce_space = (u64 *)__va(tce_space);
26446 }
26447 }
26448diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26449index 35ccf75..7a15747 100644
26450--- a/arch/x86/kernel/pci-iommu_table.c
26451+++ b/arch/x86/kernel/pci-iommu_table.c
26452@@ -2,7 +2,7 @@
26453 #include <asm/iommu_table.h>
26454 #include <linux/string.h>
26455 #include <linux/kallsyms.h>
26456-
26457+#include <linux/sched.h>
26458
26459 #define DEBUG 1
26460
26461diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26462index 77dd0ad..9ec4723 100644
26463--- a/arch/x86/kernel/pci-swiotlb.c
26464+++ b/arch/x86/kernel/pci-swiotlb.c
26465@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26466 struct dma_attrs *attrs)
26467 {
26468 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26469- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26470+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26471 else
26472 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26473 }
26474diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26475index a388bb8..97064ad 100644
26476--- a/arch/x86/kernel/process.c
26477+++ b/arch/x86/kernel/process.c
26478@@ -38,7 +38,8 @@
26479 * section. Since TSS's are completely CPU-local, we want them
26480 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26481 */
26482-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26483+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26484+EXPORT_SYMBOL(init_tss);
26485
26486 #ifdef CONFIG_X86_64
26487 static DEFINE_PER_CPU(unsigned char, is_idle);
26488@@ -96,7 +97,7 @@ void arch_task_cache_init(void)
26489 task_xstate_cachep =
26490 kmem_cache_create("task_xstate", xstate_size,
26491 __alignof__(union thread_xstate),
26492- SLAB_PANIC | SLAB_NOTRACK, NULL);
26493+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26494 setup_xstate_comp();
26495 }
26496
26497@@ -110,7 +111,7 @@ void exit_thread(void)
26498 unsigned long *bp = t->io_bitmap_ptr;
26499
26500 if (bp) {
26501- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26502+ struct tss_struct *tss = init_tss + get_cpu();
26503
26504 t->io_bitmap_ptr = NULL;
26505 clear_thread_flag(TIF_IO_BITMAP);
26506@@ -130,6 +131,9 @@ void flush_thread(void)
26507 {
26508 struct task_struct *tsk = current;
26509
26510+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26511+ loadsegment(gs, 0);
26512+#endif
26513 flush_ptrace_hw_breakpoint(tsk);
26514 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26515 drop_init_fpu(tsk);
26516@@ -276,7 +280,7 @@ static void __exit_idle(void)
26517 void exit_idle(void)
26518 {
26519 /* idle loop has pid 0 */
26520- if (current->pid)
26521+ if (task_pid_nr(current))
26522 return;
26523 __exit_idle();
26524 }
26525@@ -329,7 +333,7 @@ bool xen_set_default_idle(void)
26526 return ret;
26527 }
26528 #endif
26529-void stop_this_cpu(void *dummy)
26530+__noreturn void stop_this_cpu(void *dummy)
26531 {
26532 local_irq_disable();
26533 /*
26534@@ -508,16 +512,37 @@ static int __init idle_setup(char *str)
26535 }
26536 early_param("idle", idle_setup);
26537
26538-unsigned long arch_align_stack(unsigned long sp)
26539+#ifdef CONFIG_PAX_RANDKSTACK
26540+void pax_randomize_kstack(struct pt_regs *regs)
26541 {
26542- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26543- sp -= get_random_int() % 8192;
26544- return sp & ~0xf;
26545-}
26546+ struct thread_struct *thread = &current->thread;
26547+ unsigned long time;
26548
26549-unsigned long arch_randomize_brk(struct mm_struct *mm)
26550-{
26551- unsigned long range_end = mm->brk + 0x02000000;
26552- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26553-}
26554+ if (!randomize_va_space)
26555+ return;
26556+
26557+ if (v8086_mode(regs))
26558+ return;
26559
26560+ rdtscl(time);
26561+
26562+ /* P4 seems to return a 0 LSB, ignore it */
26563+#ifdef CONFIG_MPENTIUM4
26564+ time &= 0x3EUL;
26565+ time <<= 2;
26566+#elif defined(CONFIG_X86_64)
26567+ time &= 0xFUL;
26568+ time <<= 4;
26569+#else
26570+ time &= 0x1FUL;
26571+ time <<= 3;
26572+#endif
26573+
26574+ thread->sp0 ^= time;
26575+ load_sp0(init_tss + smp_processor_id(), thread);
26576+
26577+#ifdef CONFIG_X86_64
26578+ this_cpu_write(kernel_stack, thread->sp0);
26579+#endif
26580+}
26581+#endif
26582diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26583index 603c4f9..3a105d7 100644
26584--- a/arch/x86/kernel/process_32.c
26585+++ b/arch/x86/kernel/process_32.c
26586@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26587 unsigned long thread_saved_pc(struct task_struct *tsk)
26588 {
26589 return ((unsigned long *)tsk->thread.sp)[3];
26590+//XXX return tsk->thread.eip;
26591 }
26592
26593 void __show_regs(struct pt_regs *regs, int all)
26594@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26595 unsigned long sp;
26596 unsigned short ss, gs;
26597
26598- if (user_mode_vm(regs)) {
26599+ if (user_mode(regs)) {
26600 sp = regs->sp;
26601 ss = regs->ss & 0xffff;
26602- gs = get_user_gs(regs);
26603 } else {
26604 sp = kernel_stack_pointer(regs);
26605 savesegment(ss, ss);
26606- savesegment(gs, gs);
26607 }
26608+ gs = get_user_gs(regs);
26609
26610 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26611 (u16)regs->cs, regs->ip, regs->flags,
26612- smp_processor_id());
26613+ raw_smp_processor_id());
26614 print_symbol("EIP is at %s\n", regs->ip);
26615
26616 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26617@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26618 int copy_thread(unsigned long clone_flags, unsigned long sp,
26619 unsigned long arg, struct task_struct *p)
26620 {
26621- struct pt_regs *childregs = task_pt_regs(p);
26622+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26623 struct task_struct *tsk;
26624 int err;
26625
26626 p->thread.sp = (unsigned long) childregs;
26627 p->thread.sp0 = (unsigned long) (childregs+1);
26628+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26629 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26630
26631 if (unlikely(p->flags & PF_KTHREAD)) {
26632 /* kernel thread */
26633 memset(childregs, 0, sizeof(struct pt_regs));
26634 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26635- task_user_gs(p) = __KERNEL_STACK_CANARY;
26636- childregs->ds = __USER_DS;
26637- childregs->es = __USER_DS;
26638+ savesegment(gs, childregs->gs);
26639+ childregs->ds = __KERNEL_DS;
26640+ childregs->es = __KERNEL_DS;
26641 childregs->fs = __KERNEL_PERCPU;
26642 childregs->bx = sp; /* function */
26643 childregs->bp = arg;
26644@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26645 struct thread_struct *prev = &prev_p->thread,
26646 *next = &next_p->thread;
26647 int cpu = smp_processor_id();
26648- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26649+ struct tss_struct *tss = init_tss + cpu;
26650 fpu_switch_t fpu;
26651
26652 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26653@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26654 */
26655 lazy_save_gs(prev->gs);
26656
26657+#ifdef CONFIG_PAX_MEMORY_UDEREF
26658+ __set_fs(task_thread_info(next_p)->addr_limit);
26659+#endif
26660+
26661 /*
26662 * Load the per-thread Thread-Local Storage descriptor.
26663 */
26664@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26665 */
26666 arch_end_context_switch(next_p);
26667
26668- this_cpu_write(kernel_stack,
26669- (unsigned long)task_stack_page(next_p) +
26670- THREAD_SIZE - KERNEL_STACK_OFFSET);
26671+ this_cpu_write(current_task, next_p);
26672+ this_cpu_write(current_tinfo, &next_p->tinfo);
26673+ this_cpu_write(kernel_stack, next->sp0);
26674
26675 /*
26676 * Restore %gs if needed (which is common)
26677@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26678
26679 switch_fpu_finish(next_p, fpu);
26680
26681- this_cpu_write(current_task, next_p);
26682-
26683 return prev_p;
26684 }
26685
26686@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26687 } while (count++ < 16);
26688 return 0;
26689 }
26690-
26691diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26692index 67fcc43..0d2c630 100644
26693--- a/arch/x86/kernel/process_64.c
26694+++ b/arch/x86/kernel/process_64.c
26695@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26696 struct pt_regs *childregs;
26697 struct task_struct *me = current;
26698
26699- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26700+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26701 childregs = task_pt_regs(p);
26702 p->thread.sp = (unsigned long) childregs;
26703 p->thread.usersp = me->thread.usersp;
26704+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26705 set_tsk_thread_flag(p, TIF_FORK);
26706 p->thread.io_bitmap_ptr = NULL;
26707
26708@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26709 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26710 savesegment(es, p->thread.es);
26711 savesegment(ds, p->thread.ds);
26712+ savesegment(ss, p->thread.ss);
26713+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26714 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26715
26716 if (unlikely(p->flags & PF_KTHREAD)) {
26717@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26718 struct thread_struct *prev = &prev_p->thread;
26719 struct thread_struct *next = &next_p->thread;
26720 int cpu = smp_processor_id();
26721- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26722+ struct tss_struct *tss = init_tss + cpu;
26723 unsigned fsindex, gsindex;
26724 fpu_switch_t fpu;
26725
26726@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26727 if (unlikely(next->ds | prev->ds))
26728 loadsegment(ds, next->ds);
26729
26730+ savesegment(ss, prev->ss);
26731+ if (unlikely(next->ss != prev->ss))
26732+ loadsegment(ss, next->ss);
26733+
26734 /*
26735 * Switch FS and GS.
26736 *
26737@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26738 prev->usersp = this_cpu_read(old_rsp);
26739 this_cpu_write(old_rsp, next->usersp);
26740 this_cpu_write(current_task, next_p);
26741+ this_cpu_write(current_tinfo, &next_p->tinfo);
26742
26743 /*
26744 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26745@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26746 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26747 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26748
26749- this_cpu_write(kernel_stack,
26750- (unsigned long)task_stack_page(next_p) +
26751- THREAD_SIZE - KERNEL_STACK_OFFSET);
26752+ this_cpu_write(kernel_stack, next->sp0);
26753
26754 /*
26755 * Now maybe reload the debug registers and handle I/O bitmaps
26756@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26757 if (!p || p == current || p->state == TASK_RUNNING)
26758 return 0;
26759 stack = (unsigned long)task_stack_page(p);
26760- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26761+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26762 return 0;
26763 fp = *(u64 *)(p->thread.sp);
26764 do {
26765- if (fp < (unsigned long)stack ||
26766- fp >= (unsigned long)stack+THREAD_SIZE)
26767+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26768 return 0;
26769 ip = *(u64 *)(fp+8);
26770 if (!in_sched_functions(ip))
26771diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26772index e510618..5165ac0 100644
26773--- a/arch/x86/kernel/ptrace.c
26774+++ b/arch/x86/kernel/ptrace.c
26775@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26776 unsigned long sp = (unsigned long)&regs->sp;
26777 u32 *prev_esp;
26778
26779- if (context == (sp & ~(THREAD_SIZE - 1)))
26780+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26781 return sp;
26782
26783- prev_esp = (u32 *)(context);
26784+ prev_esp = *(u32 **)(context);
26785 if (prev_esp)
26786 return (unsigned long)prev_esp;
26787
26788@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26789 if (child->thread.gs != value)
26790 return do_arch_prctl(child, ARCH_SET_GS, value);
26791 return 0;
26792+
26793+ case offsetof(struct user_regs_struct,ip):
26794+ /*
26795+ * Protect against any attempt to set ip to an
26796+ * impossible address. There are dragons lurking if the
26797+ * address is noncanonical. (This explicitly allows
26798+ * setting ip to TASK_SIZE_MAX, because user code can do
26799+ * that all by itself by running off the end of its
26800+ * address space.
26801+ */
26802+ if (value > TASK_SIZE_MAX)
26803+ return -EIO;
26804+ break;
26805+
26806 #endif
26807 }
26808
26809@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26810 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26811 {
26812 int i;
26813- int dr7 = 0;
26814+ unsigned long dr7 = 0;
26815 struct arch_hw_breakpoint *info;
26816
26817 for (i = 0; i < HBP_NUM; i++) {
26818@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26819 unsigned long addr, unsigned long data)
26820 {
26821 int ret;
26822- unsigned long __user *datap = (unsigned long __user *)data;
26823+ unsigned long __user *datap = (__force unsigned long __user *)data;
26824
26825 switch (request) {
26826 /* read the word at location addr in the USER area. */
26827@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26828 if ((int) addr < 0)
26829 return -EIO;
26830 ret = do_get_thread_area(child, addr,
26831- (struct user_desc __user *)data);
26832+ (__force struct user_desc __user *) data);
26833 break;
26834
26835 case PTRACE_SET_THREAD_AREA:
26836 if ((int) addr < 0)
26837 return -EIO;
26838 ret = do_set_thread_area(child, addr,
26839- (struct user_desc __user *)data, 0);
26840+ (__force struct user_desc __user *) data, 0);
26841 break;
26842 #endif
26843
26844@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26845
26846 #ifdef CONFIG_X86_64
26847
26848-static struct user_regset x86_64_regsets[] __read_mostly = {
26849+static user_regset_no_const x86_64_regsets[] __read_only = {
26850 [REGSET_GENERAL] = {
26851 .core_note_type = NT_PRSTATUS,
26852 .n = sizeof(struct user_regs_struct) / sizeof(long),
26853@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26854 #endif /* CONFIG_X86_64 */
26855
26856 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26857-static struct user_regset x86_32_regsets[] __read_mostly = {
26858+static user_regset_no_const x86_32_regsets[] __read_only = {
26859 [REGSET_GENERAL] = {
26860 .core_note_type = NT_PRSTATUS,
26861 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26862@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26863 */
26864 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26865
26866-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26867+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26868 {
26869 #ifdef CONFIG_X86_64
26870 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26871@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26872 memset(info, 0, sizeof(*info));
26873 info->si_signo = SIGTRAP;
26874 info->si_code = si_code;
26875- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26876+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26877 }
26878
26879 void user_single_step_siginfo(struct task_struct *tsk,
26880@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26881 }
26882 }
26883
26884+#ifdef CONFIG_GRKERNSEC_SETXID
26885+extern void gr_delayed_cred_worker(void);
26886+#endif
26887+
26888 /*
26889 * We can return 0 to resume the syscall or anything else to go to phase
26890 * 2. If we resume the syscall, we need to put something appropriate in
26891@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26892
26893 BUG_ON(regs != task_pt_regs(current));
26894
26895+#ifdef CONFIG_GRKERNSEC_SETXID
26896+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26897+ gr_delayed_cred_worker();
26898+#endif
26899+
26900 /*
26901 * If we stepped into a sysenter/syscall insn, it trapped in
26902 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26903@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26904 */
26905 user_exit();
26906
26907+#ifdef CONFIG_GRKERNSEC_SETXID
26908+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26909+ gr_delayed_cred_worker();
26910+#endif
26911+
26912 audit_syscall_exit(regs);
26913
26914 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26915diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26916index e5ecd20..60f7eef 100644
26917--- a/arch/x86/kernel/pvclock.c
26918+++ b/arch/x86/kernel/pvclock.c
26919@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26920 reset_hung_task_detector();
26921 }
26922
26923-static atomic64_t last_value = ATOMIC64_INIT(0);
26924+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26925
26926 void pvclock_resume(void)
26927 {
26928- atomic64_set(&last_value, 0);
26929+ atomic64_set_unchecked(&last_value, 0);
26930 }
26931
26932 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26933@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26934 * updating at the same time, and one of them could be slightly behind,
26935 * making the assumption that last_value always go forward fail to hold.
26936 */
26937- last = atomic64_read(&last_value);
26938+ last = atomic64_read_unchecked(&last_value);
26939 do {
26940 if (ret < last)
26941 return last;
26942- last = atomic64_cmpxchg(&last_value, last, ret);
26943+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26944 } while (unlikely(last != ret));
26945
26946 return ret;
26947diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26948index 86db4bc..a50a54a 100644
26949--- a/arch/x86/kernel/reboot.c
26950+++ b/arch/x86/kernel/reboot.c
26951@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26952
26953 void __noreturn machine_real_restart(unsigned int type)
26954 {
26955+
26956+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26957+ struct desc_struct *gdt;
26958+#endif
26959+
26960 local_irq_disable();
26961
26962 /*
26963@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
26964
26965 /* Jump to the identity-mapped low memory code */
26966 #ifdef CONFIG_X86_32
26967- asm volatile("jmpl *%0" : :
26968+
26969+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26970+ gdt = get_cpu_gdt_table(smp_processor_id());
26971+ pax_open_kernel();
26972+#ifdef CONFIG_PAX_MEMORY_UDEREF
26973+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26974+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26975+ loadsegment(ds, __KERNEL_DS);
26976+ loadsegment(es, __KERNEL_DS);
26977+ loadsegment(ss, __KERNEL_DS);
26978+#endif
26979+#ifdef CONFIG_PAX_KERNEXEC
26980+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26981+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26982+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26983+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26984+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26985+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26986+#endif
26987+ pax_close_kernel();
26988+#endif
26989+
26990+ asm volatile("ljmpl *%0" : :
26991 "rm" (real_mode_header->machine_real_restart_asm),
26992 "a" (type));
26993 #else
26994@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
26995 /*
26996 * This is a single dmi_table handling all reboot quirks.
26997 */
26998-static struct dmi_system_id __initdata reboot_dmi_table[] = {
26999+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27000
27001 /* Acer */
27002 { /* Handle reboot issue on Acer Aspire one */
27003@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27004 * This means that this function can never return, it can misbehave
27005 * by not rebooting properly and hanging.
27006 */
27007-static void native_machine_emergency_restart(void)
27008+static void __noreturn native_machine_emergency_restart(void)
27009 {
27010 int i;
27011 int attempt = 0;
27012@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27013 #endif
27014 }
27015
27016-static void __machine_emergency_restart(int emergency)
27017+static void __noreturn __machine_emergency_restart(int emergency)
27018 {
27019 reboot_emergency = emergency;
27020 machine_ops.emergency_restart();
27021 }
27022
27023-static void native_machine_restart(char *__unused)
27024+static void __noreturn native_machine_restart(char *__unused)
27025 {
27026 pr_notice("machine restart\n");
27027
27028@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27029 __machine_emergency_restart(0);
27030 }
27031
27032-static void native_machine_halt(void)
27033+static void __noreturn native_machine_halt(void)
27034 {
27035 /* Stop other cpus and apics */
27036 machine_shutdown();
27037@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27038 stop_this_cpu(NULL);
27039 }
27040
27041-static void native_machine_power_off(void)
27042+static void __noreturn native_machine_power_off(void)
27043 {
27044 if (pm_power_off) {
27045 if (!reboot_force)
27046@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27047 }
27048 /* A fallback in case there is no PM info available */
27049 tboot_shutdown(TB_SHUTDOWN_HALT);
27050+ unreachable();
27051 }
27052
27053-struct machine_ops machine_ops = {
27054+struct machine_ops machine_ops __read_only = {
27055 .power_off = native_machine_power_off,
27056 .shutdown = native_machine_shutdown,
27057 .emergency_restart = native_machine_emergency_restart,
27058diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27059index c8e41e9..64049ef 100644
27060--- a/arch/x86/kernel/reboot_fixups_32.c
27061+++ b/arch/x86/kernel/reboot_fixups_32.c
27062@@ -57,7 +57,7 @@ struct device_fixup {
27063 unsigned int vendor;
27064 unsigned int device;
27065 void (*reboot_fixup)(struct pci_dev *);
27066-};
27067+} __do_const;
27068
27069 /*
27070 * PCI ids solely used for fixups_table go here
27071diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27072index 3fd2c69..a444264 100644
27073--- a/arch/x86/kernel/relocate_kernel_64.S
27074+++ b/arch/x86/kernel/relocate_kernel_64.S
27075@@ -96,8 +96,7 @@ relocate_kernel:
27076
27077 /* jump to identity mapped page */
27078 addq $(identity_mapped - relocate_kernel), %r8
27079- pushq %r8
27080- ret
27081+ jmp *%r8
27082
27083 identity_mapped:
27084 /* set return address to 0 if not preserving context */
27085diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27086index 0a2421c..11f3f36 100644
27087--- a/arch/x86/kernel/setup.c
27088+++ b/arch/x86/kernel/setup.c
27089@@ -111,6 +111,7 @@
27090 #include <asm/mce.h>
27091 #include <asm/alternative.h>
27092 #include <asm/prom.h>
27093+#include <asm/boot.h>
27094
27095 /*
27096 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27097@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27098 #endif
27099
27100
27101-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27102-__visible unsigned long mmu_cr4_features;
27103+#ifdef CONFIG_X86_64
27104+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27105+#elif defined(CONFIG_X86_PAE)
27106+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27107 #else
27108-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27109+__visible unsigned long mmu_cr4_features __read_only;
27110 #endif
27111
27112 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27113@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27114 * area (640->1Mb) as ram even though it is not.
27115 * take them out.
27116 */
27117- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27118+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27119
27120 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27121 }
27122@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27123 /* called before trim_bios_range() to spare extra sanitize */
27124 static void __init e820_add_kernel_range(void)
27125 {
27126- u64 start = __pa_symbol(_text);
27127+ u64 start = __pa_symbol(ktla_ktva(_text));
27128 u64 size = __pa_symbol(_end) - start;
27129
27130 /*
27131@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27132
27133 void __init setup_arch(char **cmdline_p)
27134 {
27135+#ifdef CONFIG_X86_32
27136+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27137+#else
27138 memblock_reserve(__pa_symbol(_text),
27139 (unsigned long)__bss_stop - (unsigned long)_text);
27140+#endif
27141
27142 early_reserve_initrd();
27143
27144@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
27145
27146 if (!boot_params.hdr.root_flags)
27147 root_mountflags &= ~MS_RDONLY;
27148- init_mm.start_code = (unsigned long) _text;
27149- init_mm.end_code = (unsigned long) _etext;
27150+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27151+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27152 init_mm.end_data = (unsigned long) _edata;
27153 init_mm.brk = _brk_end;
27154
27155 mpx_mm_init(&init_mm);
27156
27157- code_resource.start = __pa_symbol(_text);
27158- code_resource.end = __pa_symbol(_etext)-1;
27159- data_resource.start = __pa_symbol(_etext);
27160+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27161+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27162+ data_resource.start = __pa_symbol(_sdata);
27163 data_resource.end = __pa_symbol(_edata)-1;
27164 bss_resource.start = __pa_symbol(__bss_start);
27165 bss_resource.end = __pa_symbol(__bss_stop)-1;
27166diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27167index e4fcb87..9c06c55 100644
27168--- a/arch/x86/kernel/setup_percpu.c
27169+++ b/arch/x86/kernel/setup_percpu.c
27170@@ -21,19 +21,17 @@
27171 #include <asm/cpu.h>
27172 #include <asm/stackprotector.h>
27173
27174-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27175+#ifdef CONFIG_SMP
27176+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27177 EXPORT_PER_CPU_SYMBOL(cpu_number);
27178+#endif
27179
27180-#ifdef CONFIG_X86_64
27181 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27182-#else
27183-#define BOOT_PERCPU_OFFSET 0
27184-#endif
27185
27186 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27187 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27188
27189-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27190+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27191 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27192 };
27193 EXPORT_SYMBOL(__per_cpu_offset);
27194@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27195 {
27196 #ifdef CONFIG_NEED_MULTIPLE_NODES
27197 pg_data_t *last = NULL;
27198- unsigned int cpu;
27199+ int cpu;
27200
27201 for_each_possible_cpu(cpu) {
27202 int node = early_cpu_to_node(cpu);
27203@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27204 {
27205 #ifdef CONFIG_X86_32
27206 struct desc_struct gdt;
27207+ unsigned long base = per_cpu_offset(cpu);
27208
27209- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27210- 0x2 | DESCTYPE_S, 0x8);
27211- gdt.s = 1;
27212+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27213+ 0x83 | DESCTYPE_S, 0xC);
27214 write_gdt_entry(get_cpu_gdt_table(cpu),
27215 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27216 #endif
27217@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27218 /* alrighty, percpu areas up and running */
27219 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27220 for_each_possible_cpu(cpu) {
27221+#ifdef CONFIG_CC_STACKPROTECTOR
27222+#ifdef CONFIG_X86_32
27223+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27224+#endif
27225+#endif
27226 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27227 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27228 per_cpu(cpu_number, cpu) = cpu;
27229@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27230 */
27231 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27232 #endif
27233+#ifdef CONFIG_CC_STACKPROTECTOR
27234+#ifdef CONFIG_X86_32
27235+ if (!cpu)
27236+ per_cpu(stack_canary.canary, cpu) = canary;
27237+#endif
27238+#endif
27239 /*
27240 * Up to this point, the boot CPU has been using .init.data
27241 * area. Reload any changed state for the boot CPU.
27242diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27243index e504246..ba10432 100644
27244--- a/arch/x86/kernel/signal.c
27245+++ b/arch/x86/kernel/signal.c
27246@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27247 * Align the stack pointer according to the i386 ABI,
27248 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27249 */
27250- sp = ((sp + 4) & -16ul) - 4;
27251+ sp = ((sp - 12) & -16ul) - 4;
27252 #else /* !CONFIG_X86_32 */
27253 sp = round_down(sp, 16) - 8;
27254 #endif
27255@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27256 }
27257
27258 if (current->mm->context.vdso)
27259- restorer = current->mm->context.vdso +
27260- selected_vdso32->sym___kernel_sigreturn;
27261+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27262 else
27263- restorer = &frame->retcode;
27264+ restorer = (void __user *)&frame->retcode;
27265 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27266 restorer = ksig->ka.sa.sa_restorer;
27267
27268@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27269 * reasons and because gdb uses it as a signature to notice
27270 * signal handler stack frames.
27271 */
27272- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27273+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27274
27275 if (err)
27276 return -EFAULT;
27277@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27278 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27279
27280 /* Set up to return from userspace. */
27281- restorer = current->mm->context.vdso +
27282- selected_vdso32->sym___kernel_rt_sigreturn;
27283+ if (current->mm->context.vdso)
27284+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27285+ else
27286+ restorer = (void __user *)&frame->retcode;
27287 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27288 restorer = ksig->ka.sa.sa_restorer;
27289 put_user_ex(restorer, &frame->pretcode);
27290@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27291 * reasons and because gdb uses it as a signature to notice
27292 * signal handler stack frames.
27293 */
27294- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27295+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27296 } put_user_catch(err);
27297
27298 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27299@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27300 {
27301 int usig = signr_convert(ksig->sig);
27302 sigset_t *set = sigmask_to_save();
27303- compat_sigset_t *cset = (compat_sigset_t *) set;
27304+ sigset_t sigcopy;
27305+ compat_sigset_t *cset;
27306+
27307+ sigcopy = *set;
27308+
27309+ cset = (compat_sigset_t *) &sigcopy;
27310
27311 /* Set up the stack frame */
27312 if (is_ia32_frame()) {
27313@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27314 } else if (is_x32_frame()) {
27315 return x32_setup_rt_frame(ksig, cset, regs);
27316 } else {
27317- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27318+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27319 }
27320 }
27321
27322diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27323index be8e1bd..a3d93fa 100644
27324--- a/arch/x86/kernel/smp.c
27325+++ b/arch/x86/kernel/smp.c
27326@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27327
27328 __setup("nonmi_ipi", nonmi_ipi_setup);
27329
27330-struct smp_ops smp_ops = {
27331+struct smp_ops smp_ops __read_only = {
27332 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27333 .smp_prepare_cpus = native_smp_prepare_cpus,
27334 .smp_cpus_done = native_smp_cpus_done,
27335diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27336index febc6aa..37d8edf 100644
27337--- a/arch/x86/kernel/smpboot.c
27338+++ b/arch/x86/kernel/smpboot.c
27339@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
27340
27341 enable_start_cpu0 = 0;
27342
27343-#ifdef CONFIG_X86_32
27344+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27345+ barrier();
27346+
27347 /* switch away from the initial page table */
27348+#ifdef CONFIG_PAX_PER_CPU_PGD
27349+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27350+#else
27351 load_cr3(swapper_pg_dir);
27352+#endif
27353 __flush_tlb_all();
27354-#endif
27355
27356- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27357- barrier();
27358 /*
27359 * Check TSC synchronization with the BP:
27360 */
27361@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27362 alternatives_enable_smp();
27363
27364 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27365- (THREAD_SIZE + task_stack_page(idle))) - 1);
27366+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27367 per_cpu(current_task, cpu) = idle;
27368+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27369
27370 #ifdef CONFIG_X86_32
27371 /* Stack for startup_32 can be just as for start_secondary onwards */
27372@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27373 clear_tsk_thread_flag(idle, TIF_FORK);
27374 initial_gs = per_cpu_offset(cpu);
27375 #endif
27376- per_cpu(kernel_stack, cpu) =
27377- (unsigned long)task_stack_page(idle) -
27378- KERNEL_STACK_OFFSET + THREAD_SIZE;
27379+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27380+ pax_open_kernel();
27381 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27382+ pax_close_kernel();
27383 initial_code = (unsigned long)start_secondary;
27384 stack_start = idle->thread.sp;
27385
27386@@ -953,6 +957,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27387 /* the FPU context is blank, nobody can own it */
27388 __cpu_disable_lazy_restore(cpu);
27389
27390+#ifdef CONFIG_PAX_PER_CPU_PGD
27391+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27392+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27393+ KERNEL_PGD_PTRS);
27394+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27395+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27396+ KERNEL_PGD_PTRS);
27397+#endif
27398+
27399 err = do_boot_cpu(apicid, cpu, tidle);
27400 if (err) {
27401 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27402diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27403index 9b4d51d..5d28b58 100644
27404--- a/arch/x86/kernel/step.c
27405+++ b/arch/x86/kernel/step.c
27406@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27407 struct desc_struct *desc;
27408 unsigned long base;
27409
27410- seg &= ~7UL;
27411+ seg >>= 3;
27412
27413 mutex_lock(&child->mm->context.lock);
27414- if (unlikely((seg >> 3) >= child->mm->context.size))
27415+ if (unlikely(seg >= child->mm->context.size))
27416 addr = -1L; /* bogus selector, access would fault */
27417 else {
27418 desc = child->mm->context.ldt + seg;
27419@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27420 addr += base;
27421 }
27422 mutex_unlock(&child->mm->context.lock);
27423- }
27424+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27425+ addr = ktla_ktva(addr);
27426
27427 return addr;
27428 }
27429@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27430 unsigned char opcode[15];
27431 unsigned long addr = convert_ip_to_linear(child, regs);
27432
27433+ if (addr == -EINVAL)
27434+ return 0;
27435+
27436 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27437 for (i = 0; i < copied; i++) {
27438 switch (opcode[i]) {
27439diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27440new file mode 100644
27441index 0000000..5877189
27442--- /dev/null
27443+++ b/arch/x86/kernel/sys_i386_32.c
27444@@ -0,0 +1,189 @@
27445+/*
27446+ * This file contains various random system calls that
27447+ * have a non-standard calling sequence on the Linux/i386
27448+ * platform.
27449+ */
27450+
27451+#include <linux/errno.h>
27452+#include <linux/sched.h>
27453+#include <linux/mm.h>
27454+#include <linux/fs.h>
27455+#include <linux/smp.h>
27456+#include <linux/sem.h>
27457+#include <linux/msg.h>
27458+#include <linux/shm.h>
27459+#include <linux/stat.h>
27460+#include <linux/syscalls.h>
27461+#include <linux/mman.h>
27462+#include <linux/file.h>
27463+#include <linux/utsname.h>
27464+#include <linux/ipc.h>
27465+#include <linux/elf.h>
27466+
27467+#include <linux/uaccess.h>
27468+#include <linux/unistd.h>
27469+
27470+#include <asm/syscalls.h>
27471+
27472+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27473+{
27474+ unsigned long pax_task_size = TASK_SIZE;
27475+
27476+#ifdef CONFIG_PAX_SEGMEXEC
27477+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27478+ pax_task_size = SEGMEXEC_TASK_SIZE;
27479+#endif
27480+
27481+ if (flags & MAP_FIXED)
27482+ if (len > pax_task_size || addr > pax_task_size - len)
27483+ return -EINVAL;
27484+
27485+ return 0;
27486+}
27487+
27488+/*
27489+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27490+ */
27491+static unsigned long get_align_mask(void)
27492+{
27493+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27494+ return 0;
27495+
27496+ if (!(current->flags & PF_RANDOMIZE))
27497+ return 0;
27498+
27499+ return va_align.mask;
27500+}
27501+
27502+unsigned long
27503+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27504+ unsigned long len, unsigned long pgoff, unsigned long flags)
27505+{
27506+ struct mm_struct *mm = current->mm;
27507+ struct vm_area_struct *vma;
27508+ unsigned long pax_task_size = TASK_SIZE;
27509+ struct vm_unmapped_area_info info;
27510+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27511+
27512+#ifdef CONFIG_PAX_SEGMEXEC
27513+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27514+ pax_task_size = SEGMEXEC_TASK_SIZE;
27515+#endif
27516+
27517+ pax_task_size -= PAGE_SIZE;
27518+
27519+ if (len > pax_task_size)
27520+ return -ENOMEM;
27521+
27522+ if (flags & MAP_FIXED)
27523+ return addr;
27524+
27525+#ifdef CONFIG_PAX_RANDMMAP
27526+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27527+#endif
27528+
27529+ if (addr) {
27530+ addr = PAGE_ALIGN(addr);
27531+ if (pax_task_size - len >= addr) {
27532+ vma = find_vma(mm, addr);
27533+ if (check_heap_stack_gap(vma, addr, len, offset))
27534+ return addr;
27535+ }
27536+ }
27537+
27538+ info.flags = 0;
27539+ info.length = len;
27540+ info.align_mask = filp ? get_align_mask() : 0;
27541+ info.align_offset = pgoff << PAGE_SHIFT;
27542+ info.threadstack_offset = offset;
27543+
27544+#ifdef CONFIG_PAX_PAGEEXEC
27545+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27546+ info.low_limit = 0x00110000UL;
27547+ info.high_limit = mm->start_code;
27548+
27549+#ifdef CONFIG_PAX_RANDMMAP
27550+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27551+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27552+#endif
27553+
27554+ if (info.low_limit < info.high_limit) {
27555+ addr = vm_unmapped_area(&info);
27556+ if (!IS_ERR_VALUE(addr))
27557+ return addr;
27558+ }
27559+ } else
27560+#endif
27561+
27562+ info.low_limit = mm->mmap_base;
27563+ info.high_limit = pax_task_size;
27564+
27565+ return vm_unmapped_area(&info);
27566+}
27567+
27568+unsigned long
27569+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27570+ const unsigned long len, const unsigned long pgoff,
27571+ const unsigned long flags)
27572+{
27573+ struct vm_area_struct *vma;
27574+ struct mm_struct *mm = current->mm;
27575+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27576+ struct vm_unmapped_area_info info;
27577+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27578+
27579+#ifdef CONFIG_PAX_SEGMEXEC
27580+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27581+ pax_task_size = SEGMEXEC_TASK_SIZE;
27582+#endif
27583+
27584+ pax_task_size -= PAGE_SIZE;
27585+
27586+ /* requested length too big for entire address space */
27587+ if (len > pax_task_size)
27588+ return -ENOMEM;
27589+
27590+ if (flags & MAP_FIXED)
27591+ return addr;
27592+
27593+#ifdef CONFIG_PAX_PAGEEXEC
27594+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27595+ goto bottomup;
27596+#endif
27597+
27598+#ifdef CONFIG_PAX_RANDMMAP
27599+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27600+#endif
27601+
27602+ /* requesting a specific address */
27603+ if (addr) {
27604+ addr = PAGE_ALIGN(addr);
27605+ if (pax_task_size - len >= addr) {
27606+ vma = find_vma(mm, addr);
27607+ if (check_heap_stack_gap(vma, addr, len, offset))
27608+ return addr;
27609+ }
27610+ }
27611+
27612+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27613+ info.length = len;
27614+ info.low_limit = PAGE_SIZE;
27615+ info.high_limit = mm->mmap_base;
27616+ info.align_mask = filp ? get_align_mask() : 0;
27617+ info.align_offset = pgoff << PAGE_SHIFT;
27618+ info.threadstack_offset = offset;
27619+
27620+ addr = vm_unmapped_area(&info);
27621+ if (!(addr & ~PAGE_MASK))
27622+ return addr;
27623+ VM_BUG_ON(addr != -ENOMEM);
27624+
27625+bottomup:
27626+ /*
27627+ * A failed mmap() very likely causes application failure,
27628+ * so fall back to the bottom-up function here. This scenario
27629+ * can happen with large stack limits and large mmap()
27630+ * allocations.
27631+ */
27632+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27633+}
27634diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27635index 30277e2..5664a29 100644
27636--- a/arch/x86/kernel/sys_x86_64.c
27637+++ b/arch/x86/kernel/sys_x86_64.c
27638@@ -81,8 +81,8 @@ out:
27639 return error;
27640 }
27641
27642-static void find_start_end(unsigned long flags, unsigned long *begin,
27643- unsigned long *end)
27644+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27645+ unsigned long *begin, unsigned long *end)
27646 {
27647 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27648 unsigned long new_begin;
27649@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27650 *begin = new_begin;
27651 }
27652 } else {
27653- *begin = current->mm->mmap_legacy_base;
27654+ *begin = mm->mmap_legacy_base;
27655 *end = TASK_SIZE;
27656 }
27657 }
27658@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27659 struct vm_area_struct *vma;
27660 struct vm_unmapped_area_info info;
27661 unsigned long begin, end;
27662+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27663
27664 if (flags & MAP_FIXED)
27665 return addr;
27666
27667- find_start_end(flags, &begin, &end);
27668+ find_start_end(mm, flags, &begin, &end);
27669
27670 if (len > end)
27671 return -ENOMEM;
27672
27673+#ifdef CONFIG_PAX_RANDMMAP
27674+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27675+#endif
27676+
27677 if (addr) {
27678 addr = PAGE_ALIGN(addr);
27679 vma = find_vma(mm, addr);
27680- if (end - len >= addr &&
27681- (!vma || addr + len <= vma->vm_start))
27682+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27683 return addr;
27684 }
27685
27686@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27687 info.high_limit = end;
27688 info.align_mask = filp ? get_align_mask() : 0;
27689 info.align_offset = pgoff << PAGE_SHIFT;
27690+ info.threadstack_offset = offset;
27691 return vm_unmapped_area(&info);
27692 }
27693
27694@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27695 struct mm_struct *mm = current->mm;
27696 unsigned long addr = addr0;
27697 struct vm_unmapped_area_info info;
27698+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27699
27700 /* requested length too big for entire address space */
27701 if (len > TASK_SIZE)
27702@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27703 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27704 goto bottomup;
27705
27706+#ifdef CONFIG_PAX_RANDMMAP
27707+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27708+#endif
27709+
27710 /* requesting a specific address */
27711 if (addr) {
27712 addr = PAGE_ALIGN(addr);
27713 vma = find_vma(mm, addr);
27714- if (TASK_SIZE - len >= addr &&
27715- (!vma || addr + len <= vma->vm_start))
27716+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27717 return addr;
27718 }
27719
27720@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27721 info.high_limit = mm->mmap_base;
27722 info.align_mask = filp ? get_align_mask() : 0;
27723 info.align_offset = pgoff << PAGE_SHIFT;
27724+ info.threadstack_offset = offset;
27725 addr = vm_unmapped_area(&info);
27726 if (!(addr & ~PAGE_MASK))
27727 return addr;
27728diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27729index 91a4496..42fc304 100644
27730--- a/arch/x86/kernel/tboot.c
27731+++ b/arch/x86/kernel/tboot.c
27732@@ -44,6 +44,7 @@
27733 #include <asm/setup.h>
27734 #include <asm/e820.h>
27735 #include <asm/io.h>
27736+#include <asm/tlbflush.h>
27737
27738 #include "../realmode/rm/wakeup.h"
27739
27740@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27741
27742 void tboot_shutdown(u32 shutdown_type)
27743 {
27744- void (*shutdown)(void);
27745+ void (* __noreturn shutdown)(void);
27746
27747 if (!tboot_enabled())
27748 return;
27749@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27750 tboot->shutdown_type = shutdown_type;
27751
27752 switch_to_tboot_pt();
27753+ cr4_clear_bits(X86_CR4_PCIDE);
27754
27755- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27756+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27757 shutdown();
27758
27759 /* should not reach here */
27760@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27761 return -ENODEV;
27762 }
27763
27764-static atomic_t ap_wfs_count;
27765+static atomic_unchecked_t ap_wfs_count;
27766
27767 static int tboot_wait_for_aps(int num_aps)
27768 {
27769@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27770 {
27771 switch (action) {
27772 case CPU_DYING:
27773- atomic_inc(&ap_wfs_count);
27774+ atomic_inc_unchecked(&ap_wfs_count);
27775 if (num_online_cpus() == 1)
27776- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27777+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27778 return NOTIFY_BAD;
27779 break;
27780 }
27781@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27782
27783 tboot_create_trampoline();
27784
27785- atomic_set(&ap_wfs_count, 0);
27786+ atomic_set_unchecked(&ap_wfs_count, 0);
27787 register_hotcpu_notifier(&tboot_cpu_notifier);
27788
27789 #ifdef CONFIG_DEBUG_FS
27790diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27791index 25adc0e..1df4349 100644
27792--- a/arch/x86/kernel/time.c
27793+++ b/arch/x86/kernel/time.c
27794@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27795 {
27796 unsigned long pc = instruction_pointer(regs);
27797
27798- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27799+ if (!user_mode(regs) && in_lock_functions(pc)) {
27800 #ifdef CONFIG_FRAME_POINTER
27801- return *(unsigned long *)(regs->bp + sizeof(long));
27802+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27803 #else
27804 unsigned long *sp =
27805 (unsigned long *)kernel_stack_pointer(regs);
27806@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27807 * or above a saved flags. Eflags has bits 22-31 zero,
27808 * kernel addresses don't.
27809 */
27810+
27811+#ifdef CONFIG_PAX_KERNEXEC
27812+ return ktla_ktva(sp[0]);
27813+#else
27814 if (sp[0] >> 22)
27815 return sp[0];
27816 if (sp[1] >> 22)
27817 return sp[1];
27818 #endif
27819+
27820+#endif
27821 }
27822 return pc;
27823 }
27824diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27825index 7fc5e84..c6e445a 100644
27826--- a/arch/x86/kernel/tls.c
27827+++ b/arch/x86/kernel/tls.c
27828@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27829 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27830 return -EINVAL;
27831
27832+#ifdef CONFIG_PAX_SEGMEXEC
27833+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27834+ return -EINVAL;
27835+#endif
27836+
27837 set_tls_desc(p, idx, &info, 1);
27838
27839 return 0;
27840@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27841
27842 if (kbuf)
27843 info = kbuf;
27844- else if (__copy_from_user(infobuf, ubuf, count))
27845+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27846 return -EFAULT;
27847 else
27848 info = infobuf;
27849diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27850index 1c113db..287b42e 100644
27851--- a/arch/x86/kernel/tracepoint.c
27852+++ b/arch/x86/kernel/tracepoint.c
27853@@ -9,11 +9,11 @@
27854 #include <linux/atomic.h>
27855
27856 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27857-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27858+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27859 (unsigned long) trace_idt_table };
27860
27861 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27862-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27863+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27864
27865 static int trace_irq_vector_refcount;
27866 static DEFINE_MUTEX(irq_vector_mutex);
27867diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27868index 4ff5d16..736e3e1 100644
27869--- a/arch/x86/kernel/traps.c
27870+++ b/arch/x86/kernel/traps.c
27871@@ -68,7 +68,7 @@
27872 #include <asm/proto.h>
27873
27874 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27875-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27876+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27877 #else
27878 #include <asm/processor-flags.h>
27879 #include <asm/setup.h>
27880@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27881 #endif
27882
27883 /* Must be page-aligned because the real IDT is used in a fixmap. */
27884-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27885+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27886
27887 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27888 EXPORT_SYMBOL_GPL(used_vectors);
27889@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
27890 {
27891 enum ctx_state prev_state;
27892
27893- if (user_mode_vm(regs)) {
27894+ if (user_mode(regs)) {
27895 /* Other than that, we're just an exception. */
27896 prev_state = exception_enter();
27897 } else {
27898@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27899 /* Must be before exception_exit. */
27900 preempt_count_sub(HARDIRQ_OFFSET);
27901
27902- if (user_mode_vm(regs))
27903+ if (user_mode(regs))
27904 return exception_exit(prev_state);
27905 else
27906 rcu_nmi_exit();
27907@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27908 *
27909 * IST exception handlers normally cannot schedule. As a special
27910 * exception, if the exception interrupted userspace code (i.e.
27911- * user_mode_vm(regs) would return true) and the exception was not
27912+ * user_mode(regs) would return true) and the exception was not
27913 * a double fault, it can be safe to schedule. ist_begin_non_atomic()
27914 * begins a non-atomic section within an ist_enter()/ist_exit() region.
27915 * Callers are responsible for enabling interrupts themselves inside
27916@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27917 */
27918 void ist_begin_non_atomic(struct pt_regs *regs)
27919 {
27920- BUG_ON(!user_mode_vm(regs));
27921+ BUG_ON(!user_mode(regs));
27922
27923 /*
27924 * Sanity check: we need to be on the normal thread stack. This
27925@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
27926 }
27927
27928 static nokprobe_inline int
27929-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27930+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27931 struct pt_regs *regs, long error_code)
27932 {
27933 #ifdef CONFIG_X86_32
27934- if (regs->flags & X86_VM_MASK) {
27935+ if (v8086_mode(regs)) {
27936 /*
27937 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27938 * On nmi (interrupt 2), do_trap should not be called.
27939@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27940 return -1;
27941 }
27942 #endif
27943- if (!user_mode(regs)) {
27944+ if (!user_mode_novm(regs)) {
27945 if (!fixup_exception(regs)) {
27946 tsk->thread.error_code = error_code;
27947 tsk->thread.trap_nr = trapnr;
27948+
27949+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27950+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27951+ str = "PAX: suspicious stack segment fault";
27952+#endif
27953+
27954 die(str, regs, error_code);
27955 }
27956+
27957+#ifdef CONFIG_PAX_REFCOUNT
27958+ if (trapnr == X86_TRAP_OF)
27959+ pax_report_refcount_overflow(regs);
27960+#endif
27961+
27962 return 0;
27963 }
27964
27965@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27966 }
27967
27968 static void
27969-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27970+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27971 long error_code, siginfo_t *info)
27972 {
27973 struct task_struct *tsk = current;
27974@@ -276,7 +288,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27975 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27976 printk_ratelimit()) {
27977 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27978- tsk->comm, tsk->pid, str,
27979+ tsk->comm, task_pid_nr(tsk), str,
27980 regs->ip, regs->sp, error_code);
27981 print_vma_addr(" in ", regs->ip);
27982 pr_cont("\n");
27983@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27984 tsk->thread.error_code = error_code;
27985 tsk->thread.trap_nr = X86_TRAP_DF;
27986
27987+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27988+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27989+ die("grsec: kernel stack overflow detected", regs, error_code);
27990+#endif
27991+
27992 #ifdef CONFIG_DOUBLEFAULT
27993 df_debug(regs, error_code);
27994 #endif
27995@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
27996 goto exit;
27997 conditional_sti(regs);
27998
27999- if (!user_mode_vm(regs))
28000+ if (!user_mode(regs))
28001 die("bounds", regs, error_code);
28002
28003 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
28004@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28005 conditional_sti(regs);
28006
28007 #ifdef CONFIG_X86_32
28008- if (regs->flags & X86_VM_MASK) {
28009+ if (v8086_mode(regs)) {
28010 local_irq_enable();
28011 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28012 goto exit;
28013@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28014 #endif
28015
28016 tsk = current;
28017- if (!user_mode(regs)) {
28018+ if (!user_mode_novm(regs)) {
28019 if (fixup_exception(regs))
28020 goto exit;
28021
28022 tsk->thread.error_code = error_code;
28023 tsk->thread.trap_nr = X86_TRAP_GP;
28024 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28025- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28026+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28027+
28028+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28029+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28030+ die("PAX: suspicious general protection fault", regs, error_code);
28031+ else
28032+#endif
28033+
28034 die("general protection fault", regs, error_code);
28035+ }
28036 goto exit;
28037 }
28038
28039+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28040+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28041+ struct mm_struct *mm = tsk->mm;
28042+ unsigned long limit;
28043+
28044+ down_write(&mm->mmap_sem);
28045+ limit = mm->context.user_cs_limit;
28046+ if (limit < TASK_SIZE) {
28047+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28048+ up_write(&mm->mmap_sem);
28049+ return;
28050+ }
28051+ up_write(&mm->mmap_sem);
28052+ }
28053+#endif
28054+
28055 tsk->thread.error_code = error_code;
28056 tsk->thread.trap_nr = X86_TRAP_GP;
28057
28058@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28059 container_of(task_pt_regs(current),
28060 struct bad_iret_stack, regs);
28061
28062+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28063+ new_stack = s;
28064+
28065 /* Copy the IRET target to the new stack. */
28066 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28067
28068 /* Copy the remainder of the stack from the current stack. */
28069 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28070
28071- BUG_ON(!user_mode_vm(&new_stack->regs));
28072+ BUG_ON(!user_mode(&new_stack->regs));
28073 return new_stack;
28074 }
28075 NOKPROBE_SYMBOL(fixup_bad_iret);
28076@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28077 * then it's very likely the result of an icebp/int01 trap.
28078 * User wants a sigtrap for that.
28079 */
28080- if (!dr6 && user_mode_vm(regs))
28081+ if (!dr6 && user_mode(regs))
28082 user_icebp = 1;
28083
28084 /* Catch kmemcheck conditions first of all! */
28085@@ -673,7 +717,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28086 /* It's safe to allow irq's after DR6 has been saved */
28087 preempt_conditional_sti(regs);
28088
28089- if (regs->flags & X86_VM_MASK) {
28090+ if (v8086_mode(regs)) {
28091 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28092 X86_TRAP_DB);
28093 preempt_conditional_cli(regs);
28094@@ -688,7 +732,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28095 * We already checked v86 mode above, so we can check for kernel mode
28096 * by just checking the CPL of CS.
28097 */
28098- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28099+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28100 tsk->thread.debugreg6 &= ~DR_STEP;
28101 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28102 regs->flags &= ~X86_EFLAGS_TF;
28103@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28104 return;
28105 conditional_sti(regs);
28106
28107- if (!user_mode_vm(regs))
28108+ if (!user_mode(regs))
28109 {
28110 if (!fixup_exception(regs)) {
28111 task->thread.error_code = error_code;
28112diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28113index 5054497..139f8f8 100644
28114--- a/arch/x86/kernel/tsc.c
28115+++ b/arch/x86/kernel/tsc.c
28116@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28117 */
28118 smp_wmb();
28119
28120- ACCESS_ONCE(c2n->head) = data;
28121+ ACCESS_ONCE_RW(c2n->head) = data;
28122 }
28123
28124 /*
28125diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28126index 81f8adb0..fff670e 100644
28127--- a/arch/x86/kernel/uprobes.c
28128+++ b/arch/x86/kernel/uprobes.c
28129@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28130 int ret = NOTIFY_DONE;
28131
28132 /* We are only interested in userspace traps */
28133- if (regs && !user_mode_vm(regs))
28134+ if (regs && !user_mode(regs))
28135 return NOTIFY_DONE;
28136
28137 switch (val) {
28138@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28139
28140 if (nleft != rasize) {
28141 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28142- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28143+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28144
28145 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28146 }
28147diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28148index b9242ba..50c5edd 100644
28149--- a/arch/x86/kernel/verify_cpu.S
28150+++ b/arch/x86/kernel/verify_cpu.S
28151@@ -20,6 +20,7 @@
28152 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28153 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28154 * arch/x86/kernel/head_32.S: processor startup
28155+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28156 *
28157 * verify_cpu, returns the status of longmode and SSE in register %eax.
28158 * 0: Success 1: Failure
28159diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28160index e8edcf5..27f9344 100644
28161--- a/arch/x86/kernel/vm86_32.c
28162+++ b/arch/x86/kernel/vm86_32.c
28163@@ -44,6 +44,7 @@
28164 #include <linux/ptrace.h>
28165 #include <linux/audit.h>
28166 #include <linux/stddef.h>
28167+#include <linux/grsecurity.h>
28168
28169 #include <asm/uaccess.h>
28170 #include <asm/io.h>
28171@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28172 do_exit(SIGSEGV);
28173 }
28174
28175- tss = &per_cpu(init_tss, get_cpu());
28176+ tss = init_tss + get_cpu();
28177 current->thread.sp0 = current->thread.saved_sp0;
28178 current->thread.sysenter_cs = __KERNEL_CS;
28179 load_sp0(tss, &current->thread);
28180@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28181
28182 if (tsk->thread.saved_sp0)
28183 return -EPERM;
28184+
28185+#ifdef CONFIG_GRKERNSEC_VM86
28186+ if (!capable(CAP_SYS_RAWIO)) {
28187+ gr_handle_vm86();
28188+ return -EPERM;
28189+ }
28190+#endif
28191+
28192 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28193 offsetof(struct kernel_vm86_struct, vm86plus) -
28194 sizeof(info.regs));
28195@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28196 int tmp;
28197 struct vm86plus_struct __user *v86;
28198
28199+#ifdef CONFIG_GRKERNSEC_VM86
28200+ if (!capable(CAP_SYS_RAWIO)) {
28201+ gr_handle_vm86();
28202+ return -EPERM;
28203+ }
28204+#endif
28205+
28206 tsk = current;
28207 switch (cmd) {
28208 case VM86_REQUEST_IRQ:
28209@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28210 tsk->thread.saved_fs = info->regs32->fs;
28211 tsk->thread.saved_gs = get_user_gs(info->regs32);
28212
28213- tss = &per_cpu(init_tss, get_cpu());
28214+ tss = init_tss + get_cpu();
28215 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28216 if (cpu_has_sep)
28217 tsk->thread.sysenter_cs = 0;
28218@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28219 goto cannot_handle;
28220 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28221 goto cannot_handle;
28222- intr_ptr = (unsigned long __user *) (i << 2);
28223+ intr_ptr = (__force unsigned long __user *) (i << 2);
28224 if (get_user(segoffs, intr_ptr))
28225 goto cannot_handle;
28226 if ((segoffs >> 16) == BIOSSEG)
28227diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28228index 00bf300..129df8e 100644
28229--- a/arch/x86/kernel/vmlinux.lds.S
28230+++ b/arch/x86/kernel/vmlinux.lds.S
28231@@ -26,6 +26,13 @@
28232 #include <asm/page_types.h>
28233 #include <asm/cache.h>
28234 #include <asm/boot.h>
28235+#include <asm/segment.h>
28236+
28237+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28238+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28239+#else
28240+#define __KERNEL_TEXT_OFFSET 0
28241+#endif
28242
28243 #undef i386 /* in case the preprocessor is a 32bit one */
28244
28245@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28246
28247 PHDRS {
28248 text PT_LOAD FLAGS(5); /* R_E */
28249+#ifdef CONFIG_X86_32
28250+ module PT_LOAD FLAGS(5); /* R_E */
28251+#endif
28252+#ifdef CONFIG_XEN
28253+ rodata PT_LOAD FLAGS(5); /* R_E */
28254+#else
28255+ rodata PT_LOAD FLAGS(4); /* R__ */
28256+#endif
28257 data PT_LOAD FLAGS(6); /* RW_ */
28258-#ifdef CONFIG_X86_64
28259+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28260 #ifdef CONFIG_SMP
28261 percpu PT_LOAD FLAGS(6); /* RW_ */
28262 #endif
28263+ text.init PT_LOAD FLAGS(5); /* R_E */
28264+ text.exit PT_LOAD FLAGS(5); /* R_E */
28265 init PT_LOAD FLAGS(7); /* RWE */
28266-#endif
28267 note PT_NOTE FLAGS(0); /* ___ */
28268 }
28269
28270 SECTIONS
28271 {
28272 #ifdef CONFIG_X86_32
28273- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28274- phys_startup_32 = startup_32 - LOAD_OFFSET;
28275+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28276 #else
28277- . = __START_KERNEL;
28278- phys_startup_64 = startup_64 - LOAD_OFFSET;
28279+ . = __START_KERNEL;
28280 #endif
28281
28282 /* Text and read-only data */
28283- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28284- _text = .;
28285+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28286 /* bootstrapping code */
28287+#ifdef CONFIG_X86_32
28288+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28289+#else
28290+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28291+#endif
28292+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28293+ _text = .;
28294 HEAD_TEXT
28295 . = ALIGN(8);
28296 _stext = .;
28297@@ -104,13 +124,47 @@ SECTIONS
28298 IRQENTRY_TEXT
28299 *(.fixup)
28300 *(.gnu.warning)
28301- /* End of text section */
28302- _etext = .;
28303 } :text = 0x9090
28304
28305- NOTES :text :note
28306+ . += __KERNEL_TEXT_OFFSET;
28307
28308- EXCEPTION_TABLE(16) :text = 0x9090
28309+#ifdef CONFIG_X86_32
28310+ . = ALIGN(PAGE_SIZE);
28311+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28312+
28313+#ifdef CONFIG_PAX_KERNEXEC
28314+ MODULES_EXEC_VADDR = .;
28315+ BYTE(0)
28316+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28317+ . = ALIGN(HPAGE_SIZE) - 1;
28318+ MODULES_EXEC_END = .;
28319+#endif
28320+
28321+ } :module
28322+#endif
28323+
28324+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28325+ /* End of text section */
28326+ BYTE(0)
28327+ _etext = . - __KERNEL_TEXT_OFFSET;
28328+ }
28329+
28330+#ifdef CONFIG_X86_32
28331+ . = ALIGN(PAGE_SIZE);
28332+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28333+ . = ALIGN(PAGE_SIZE);
28334+ *(.empty_zero_page)
28335+ *(.initial_pg_fixmap)
28336+ *(.initial_pg_pmd)
28337+ *(.initial_page_table)
28338+ *(.swapper_pg_dir)
28339+ } :rodata
28340+#endif
28341+
28342+ . = ALIGN(PAGE_SIZE);
28343+ NOTES :rodata :note
28344+
28345+ EXCEPTION_TABLE(16) :rodata
28346
28347 #if defined(CONFIG_DEBUG_RODATA)
28348 /* .text should occupy whole number of pages */
28349@@ -122,16 +176,20 @@ SECTIONS
28350
28351 /* Data */
28352 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28353+
28354+#ifdef CONFIG_PAX_KERNEXEC
28355+ . = ALIGN(HPAGE_SIZE);
28356+#else
28357+ . = ALIGN(PAGE_SIZE);
28358+#endif
28359+
28360 /* Start of data section */
28361 _sdata = .;
28362
28363 /* init_task */
28364 INIT_TASK_DATA(THREAD_SIZE)
28365
28366-#ifdef CONFIG_X86_32
28367- /* 32 bit has nosave before _edata */
28368 NOSAVE_DATA
28369-#endif
28370
28371 PAGE_ALIGNED_DATA(PAGE_SIZE)
28372
28373@@ -174,12 +232,19 @@ SECTIONS
28374 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28375
28376 /* Init code and data - will be freed after init */
28377- . = ALIGN(PAGE_SIZE);
28378 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28379+ BYTE(0)
28380+
28381+#ifdef CONFIG_PAX_KERNEXEC
28382+ . = ALIGN(HPAGE_SIZE);
28383+#else
28384+ . = ALIGN(PAGE_SIZE);
28385+#endif
28386+
28387 __init_begin = .; /* paired with __init_end */
28388- }
28389+ } :init.begin
28390
28391-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28392+#ifdef CONFIG_SMP
28393 /*
28394 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28395 * output PHDR, so the next output section - .init.text - should
28396@@ -190,12 +255,27 @@ SECTIONS
28397 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28398 #endif
28399
28400- INIT_TEXT_SECTION(PAGE_SIZE)
28401-#ifdef CONFIG_X86_64
28402- :init
28403-#endif
28404+ . = ALIGN(PAGE_SIZE);
28405+ init_begin = .;
28406+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28407+ VMLINUX_SYMBOL(_sinittext) = .;
28408+ INIT_TEXT
28409+ . = ALIGN(PAGE_SIZE);
28410+ } :text.init
28411
28412- INIT_DATA_SECTION(16)
28413+ /*
28414+ * .exit.text is discard at runtime, not link time, to deal with
28415+ * references from .altinstructions and .eh_frame
28416+ */
28417+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28418+ EXIT_TEXT
28419+ VMLINUX_SYMBOL(_einittext) = .;
28420+ . = ALIGN(16);
28421+ } :text.exit
28422+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28423+
28424+ . = ALIGN(PAGE_SIZE);
28425+ INIT_DATA_SECTION(16) :init
28426
28427 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28428 __x86_cpu_dev_start = .;
28429@@ -266,19 +346,12 @@ SECTIONS
28430 }
28431
28432 . = ALIGN(8);
28433- /*
28434- * .exit.text is discard at runtime, not link time, to deal with
28435- * references from .altinstructions and .eh_frame
28436- */
28437- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28438- EXIT_TEXT
28439- }
28440
28441 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28442 EXIT_DATA
28443 }
28444
28445-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28446+#ifndef CONFIG_SMP
28447 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28448 #endif
28449
28450@@ -297,16 +370,10 @@ SECTIONS
28451 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28452 __smp_locks = .;
28453 *(.smp_locks)
28454- . = ALIGN(PAGE_SIZE);
28455 __smp_locks_end = .;
28456+ . = ALIGN(PAGE_SIZE);
28457 }
28458
28459-#ifdef CONFIG_X86_64
28460- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28461- NOSAVE_DATA
28462- }
28463-#endif
28464-
28465 /* BSS */
28466 . = ALIGN(PAGE_SIZE);
28467 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28468@@ -322,6 +389,7 @@ SECTIONS
28469 __brk_base = .;
28470 . += 64 * 1024; /* 64k alignment slop space */
28471 *(.brk_reservation) /* areas brk users have reserved */
28472+ . = ALIGN(HPAGE_SIZE);
28473 __brk_limit = .;
28474 }
28475
28476@@ -348,13 +416,12 @@ SECTIONS
28477 * for the boot processor.
28478 */
28479 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28480-INIT_PER_CPU(gdt_page);
28481 INIT_PER_CPU(irq_stack_union);
28482
28483 /*
28484 * Build-time check on the image size:
28485 */
28486-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28487+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28488 "kernel image bigger than KERNEL_IMAGE_SIZE");
28489
28490 #ifdef CONFIG_SMP
28491diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28492index 2dcc6ff..082dc7a 100644
28493--- a/arch/x86/kernel/vsyscall_64.c
28494+++ b/arch/x86/kernel/vsyscall_64.c
28495@@ -38,15 +38,13 @@
28496 #define CREATE_TRACE_POINTS
28497 #include "vsyscall_trace.h"
28498
28499-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28500+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28501
28502 static int __init vsyscall_setup(char *str)
28503 {
28504 if (str) {
28505 if (!strcmp("emulate", str))
28506 vsyscall_mode = EMULATE;
28507- else if (!strcmp("native", str))
28508- vsyscall_mode = NATIVE;
28509 else if (!strcmp("none", str))
28510 vsyscall_mode = NONE;
28511 else
28512@@ -264,8 +262,7 @@ do_ret:
28513 return true;
28514
28515 sigsegv:
28516- force_sig(SIGSEGV, current);
28517- return true;
28518+ do_group_exit(SIGKILL);
28519 }
28520
28521 /*
28522@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28523 static struct vm_area_struct gate_vma = {
28524 .vm_start = VSYSCALL_ADDR,
28525 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28526- .vm_page_prot = PAGE_READONLY_EXEC,
28527- .vm_flags = VM_READ | VM_EXEC,
28528+ .vm_page_prot = PAGE_READONLY,
28529+ .vm_flags = VM_READ,
28530 .vm_ops = &gate_vma_ops,
28531 };
28532
28533@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28534 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28535
28536 if (vsyscall_mode != NONE)
28537- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28538- vsyscall_mode == NATIVE
28539- ? PAGE_KERNEL_VSYSCALL
28540- : PAGE_KERNEL_VVAR);
28541+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28542
28543 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28544 (unsigned long)VSYSCALL_ADDR);
28545diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28546index 37d8fa4..66e319a 100644
28547--- a/arch/x86/kernel/x8664_ksyms_64.c
28548+++ b/arch/x86/kernel/x8664_ksyms_64.c
28549@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28550 EXPORT_SYMBOL(copy_user_generic_unrolled);
28551 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28552 EXPORT_SYMBOL(__copy_user_nocache);
28553-EXPORT_SYMBOL(_copy_from_user);
28554-EXPORT_SYMBOL(_copy_to_user);
28555
28556 EXPORT_SYMBOL(copy_page);
28557 EXPORT_SYMBOL(clear_page);
28558@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28559 EXPORT_SYMBOL(___preempt_schedule_context);
28560 #endif
28561 #endif
28562+
28563+#ifdef CONFIG_PAX_PER_CPU_PGD
28564+EXPORT_SYMBOL(cpu_pgd);
28565+#endif
28566diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28567index 234b072..b7ab191 100644
28568--- a/arch/x86/kernel/x86_init.c
28569+++ b/arch/x86/kernel/x86_init.c
28570@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28571 static void default_nmi_init(void) { };
28572 static int default_i8042_detect(void) { return 1; };
28573
28574-struct x86_platform_ops x86_platform = {
28575+struct x86_platform_ops x86_platform __read_only = {
28576 .calibrate_tsc = native_calibrate_tsc,
28577 .get_wallclock = mach_get_cmos_time,
28578 .set_wallclock = mach_set_rtc_mmss,
28579@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28580 EXPORT_SYMBOL_GPL(x86_platform);
28581
28582 #if defined(CONFIG_PCI_MSI)
28583-struct x86_msi_ops x86_msi = {
28584+struct x86_msi_ops x86_msi __read_only = {
28585 .setup_msi_irqs = native_setup_msi_irqs,
28586 .compose_msi_msg = native_compose_msi_msg,
28587 .teardown_msi_irq = native_teardown_msi_irq,
28588@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28589 }
28590 #endif
28591
28592-struct x86_io_apic_ops x86_io_apic_ops = {
28593+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28594 .init = native_io_apic_init_mappings,
28595 .read = native_io_apic_read,
28596 .write = native_io_apic_write,
28597diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28598index cdc6cf9..e04f495 100644
28599--- a/arch/x86/kernel/xsave.c
28600+++ b/arch/x86/kernel/xsave.c
28601@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28602
28603 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28604 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28605- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28606+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28607
28608 if (!use_xsave())
28609 return err;
28610
28611- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28612+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28613
28614 /*
28615 * Read the xstate_bv which we copied (directly from the cpu or
28616 * from the state in task struct) to the user buffers.
28617 */
28618- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28619+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28620
28621 /*
28622 * For legacy compatible, we always set FP/SSE bits in the bit
28623@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28624 */
28625 xstate_bv |= XSTATE_FPSSE;
28626
28627- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28628+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28629
28630 return err;
28631 }
28632@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28633 {
28634 int err;
28635
28636+ buf = (struct xsave_struct __user *)____m(buf);
28637 if (use_xsave())
28638 err = xsave_user(buf);
28639 else if (use_fxsr())
28640@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28641 */
28642 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28643 {
28644+ buf = (void __user *)____m(buf);
28645 if (use_xsave()) {
28646 if ((unsigned long)buf % 64 || fx_only) {
28647 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28648diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28649index 307f9ec..0d8aa91 100644
28650--- a/arch/x86/kvm/cpuid.c
28651+++ b/arch/x86/kvm/cpuid.c
28652@@ -186,15 +186,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28653 struct kvm_cpuid2 *cpuid,
28654 struct kvm_cpuid_entry2 __user *entries)
28655 {
28656- int r;
28657+ int r, i;
28658
28659 r = -E2BIG;
28660 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28661 goto out;
28662 r = -EFAULT;
28663- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28664- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28665+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28666 goto out;
28667+ for (i = 0; i < cpuid->nent; ++i) {
28668+ struct kvm_cpuid_entry2 cpuid_entry;
28669+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28670+ goto out;
28671+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28672+ }
28673 vcpu->arch.cpuid_nent = cpuid->nent;
28674 kvm_apic_set_version(vcpu);
28675 kvm_x86_ops->cpuid_update(vcpu);
28676@@ -207,15 +212,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28677 struct kvm_cpuid2 *cpuid,
28678 struct kvm_cpuid_entry2 __user *entries)
28679 {
28680- int r;
28681+ int r, i;
28682
28683 r = -E2BIG;
28684 if (cpuid->nent < vcpu->arch.cpuid_nent)
28685 goto out;
28686 r = -EFAULT;
28687- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28688- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28689+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28690 goto out;
28691+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28692+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28693+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28694+ goto out;
28695+ }
28696 return 0;
28697
28698 out:
28699diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28700index 106c015..2db7161 100644
28701--- a/arch/x86/kvm/emulate.c
28702+++ b/arch/x86/kvm/emulate.c
28703@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28704 int cr = ctxt->modrm_reg;
28705 u64 efer = 0;
28706
28707- static u64 cr_reserved_bits[] = {
28708+ static const u64 cr_reserved_bits[] = {
28709 0xffffffff00000000ULL,
28710 0, 0, 0, /* CR3 checked later */
28711 CR4_RESERVED_BITS,
28712diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28713index 4ee827d..a14eff9 100644
28714--- a/arch/x86/kvm/lapic.c
28715+++ b/arch/x86/kvm/lapic.c
28716@@ -56,7 +56,7 @@
28717 #define APIC_BUS_CYCLE_NS 1
28718
28719 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28720-#define apic_debug(fmt, arg...)
28721+#define apic_debug(fmt, arg...) do {} while (0)
28722
28723 #define APIC_LVT_NUM 6
28724 /* 14 is the version for Xeon and Pentium 8.4.8*/
28725diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28726index 6e6d115..43fecbf 100644
28727--- a/arch/x86/kvm/paging_tmpl.h
28728+++ b/arch/x86/kvm/paging_tmpl.h
28729@@ -343,7 +343,7 @@ retry_walk:
28730 if (unlikely(kvm_is_error_hva(host_addr)))
28731 goto error;
28732
28733- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28734+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28735 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28736 goto error;
28737 walker->ptep_user[walker->level - 1] = ptep_user;
28738diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28739index a4e62fc..fbbad55 100644
28740--- a/arch/x86/kvm/svm.c
28741+++ b/arch/x86/kvm/svm.c
28742@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28743 int cpu = raw_smp_processor_id();
28744
28745 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28746+
28747+ pax_open_kernel();
28748 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28749+ pax_close_kernel();
28750+
28751 load_TR_desc();
28752 }
28753
28754@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28755 #endif
28756 #endif
28757
28758+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28759+ __set_fs(current_thread_info()->addr_limit);
28760+#endif
28761+
28762 reload_tss(vcpu);
28763
28764 local_irq_disable();
28765diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28766index 5318d64..ff5f7aa 100644
28767--- a/arch/x86/kvm/vmx.c
28768+++ b/arch/x86/kvm/vmx.c
28769@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28770 #endif
28771 }
28772
28773-static void vmcs_clear_bits(unsigned long field, u32 mask)
28774+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28775 {
28776 vmcs_writel(field, vmcs_readl(field) & ~mask);
28777 }
28778
28779-static void vmcs_set_bits(unsigned long field, u32 mask)
28780+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28781 {
28782 vmcs_writel(field, vmcs_readl(field) | mask);
28783 }
28784@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28785 struct desc_struct *descs;
28786
28787 descs = (void *)gdt->address;
28788+
28789+ pax_open_kernel();
28790 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28791+ pax_close_kernel();
28792+
28793 load_TR_desc();
28794 }
28795
28796@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28797 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28798 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28799
28800+#ifdef CONFIG_PAX_PER_CPU_PGD
28801+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28802+#endif
28803+
28804 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28805 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28806 vmx->loaded_vmcs->cpu = cpu;
28807@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28808 * reads and returns guest's timestamp counter "register"
28809 * guest_tsc = host_tsc + tsc_offset -- 21.3
28810 */
28811-static u64 guest_read_tsc(void)
28812+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28813 {
28814 u64 host_tsc, tsc_offset;
28815
28816@@ -4466,7 +4474,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28817 unsigned long cr4;
28818
28819 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28820+
28821+#ifndef CONFIG_PAX_PER_CPU_PGD
28822 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28823+#endif
28824
28825 /* Save the most likely value for this task's CR4 in the VMCS. */
28826 cr4 = cr4_read_shadow();
28827@@ -4493,7 +4504,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28828 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28829 vmx->host_idt_base = dt.address;
28830
28831- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28832+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28833
28834 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28835 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28836@@ -6104,11 +6115,17 @@ static __init int hardware_setup(void)
28837 * page upon invalidation. No need to do anything if not
28838 * using the APIC_ACCESS_ADDR VMCS field.
28839 */
28840- if (!flexpriority_enabled)
28841- kvm_x86_ops->set_apic_access_page_addr = NULL;
28842+ if (!flexpriority_enabled) {
28843+ pax_open_kernel();
28844+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28845+ pax_close_kernel();
28846+ }
28847
28848- if (!cpu_has_vmx_tpr_shadow())
28849- kvm_x86_ops->update_cr8_intercept = NULL;
28850+ if (!cpu_has_vmx_tpr_shadow()) {
28851+ pax_open_kernel();
28852+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28853+ pax_close_kernel();
28854+ }
28855
28856 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28857 kvm_disable_largepages();
28858@@ -6119,14 +6136,16 @@ static __init int hardware_setup(void)
28859 if (!cpu_has_vmx_apicv())
28860 enable_apicv = 0;
28861
28862+ pax_open_kernel();
28863 if (enable_apicv)
28864- kvm_x86_ops->update_cr8_intercept = NULL;
28865+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28866 else {
28867- kvm_x86_ops->hwapic_irr_update = NULL;
28868- kvm_x86_ops->hwapic_isr_update = NULL;
28869- kvm_x86_ops->deliver_posted_interrupt = NULL;
28870- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28871+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28872+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28873+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28874+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28875 }
28876+ pax_close_kernel();
28877
28878 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28879 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28880@@ -6179,10 +6198,12 @@ static __init int hardware_setup(void)
28881 enable_pml = 0;
28882
28883 if (!enable_pml) {
28884- kvm_x86_ops->slot_enable_log_dirty = NULL;
28885- kvm_x86_ops->slot_disable_log_dirty = NULL;
28886- kvm_x86_ops->flush_log_dirty = NULL;
28887- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28888+ pax_open_kernel();
28889+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28890+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28891+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28892+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28893+ pax_close_kernel();
28894 }
28895
28896 return alloc_kvm_area();
28897@@ -8227,6 +8248,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28898 "jmp 2f \n\t"
28899 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28900 "2: "
28901+
28902+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28903+ "ljmp %[cs],$3f\n\t"
28904+ "3: "
28905+#endif
28906+
28907 /* Save guest registers, load host registers, keep flags */
28908 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28909 "pop %0 \n\t"
28910@@ -8279,6 +8306,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28911 #endif
28912 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28913 [wordsize]"i"(sizeof(ulong))
28914+
28915+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28916+ ,[cs]"i"(__KERNEL_CS)
28917+#endif
28918+
28919 : "cc", "memory"
28920 #ifdef CONFIG_X86_64
28921 , "rax", "rbx", "rdi", "rsi"
28922@@ -8292,7 +8324,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28923 if (debugctlmsr)
28924 update_debugctlmsr(debugctlmsr);
28925
28926-#ifndef CONFIG_X86_64
28927+#ifdef CONFIG_X86_32
28928 /*
28929 * The sysexit path does not restore ds/es, so we must set them to
28930 * a reasonable value ourselves.
28931@@ -8301,8 +8333,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28932 * may be executed in interrupt context, which saves and restore segments
28933 * around it, nullifying its effect.
28934 */
28935- loadsegment(ds, __USER_DS);
28936- loadsegment(es, __USER_DS);
28937+ loadsegment(ds, __KERNEL_DS);
28938+ loadsegment(es, __KERNEL_DS);
28939+ loadsegment(ss, __KERNEL_DS);
28940+
28941+#ifdef CONFIG_PAX_KERNEXEC
28942+ loadsegment(fs, __KERNEL_PERCPU);
28943+#endif
28944+
28945+#ifdef CONFIG_PAX_MEMORY_UDEREF
28946+ __set_fs(current_thread_info()->addr_limit);
28947+#endif
28948+
28949 #endif
28950
28951 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28952diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28953index 8838057..8f42ce3 100644
28954--- a/arch/x86/kvm/x86.c
28955+++ b/arch/x86/kvm/x86.c
28956@@ -1895,8 +1895,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28957 {
28958 struct kvm *kvm = vcpu->kvm;
28959 int lm = is_long_mode(vcpu);
28960- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28961- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28962+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28963+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28964 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28965 : kvm->arch.xen_hvm_config.blob_size_32;
28966 u32 page_num = data & ~PAGE_MASK;
28967@@ -2833,6 +2833,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28968 if (n < msr_list.nmsrs)
28969 goto out;
28970 r = -EFAULT;
28971+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28972+ goto out;
28973 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28974 num_msrs_to_save * sizeof(u32)))
28975 goto out;
28976@@ -5737,7 +5739,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28977 };
28978 #endif
28979
28980-int kvm_arch_init(void *opaque)
28981+int kvm_arch_init(const void *opaque)
28982 {
28983 int r;
28984 struct kvm_x86_ops *ops = opaque;
28985diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28986index ac4453d..1f43bf3 100644
28987--- a/arch/x86/lguest/boot.c
28988+++ b/arch/x86/lguest/boot.c
28989@@ -1340,9 +1340,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28990 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28991 * Launcher to reboot us.
28992 */
28993-static void lguest_restart(char *reason)
28994+static __noreturn void lguest_restart(char *reason)
28995 {
28996 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28997+ BUG();
28998 }
28999
29000 /*G:050
29001diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29002index 00933d5..3a64af9 100644
29003--- a/arch/x86/lib/atomic64_386_32.S
29004+++ b/arch/x86/lib/atomic64_386_32.S
29005@@ -48,6 +48,10 @@ BEGIN(read)
29006 movl (v), %eax
29007 movl 4(v), %edx
29008 RET_ENDP
29009+BEGIN(read_unchecked)
29010+ movl (v), %eax
29011+ movl 4(v), %edx
29012+RET_ENDP
29013 #undef v
29014
29015 #define v %esi
29016@@ -55,6 +59,10 @@ BEGIN(set)
29017 movl %ebx, (v)
29018 movl %ecx, 4(v)
29019 RET_ENDP
29020+BEGIN(set_unchecked)
29021+ movl %ebx, (v)
29022+ movl %ecx, 4(v)
29023+RET_ENDP
29024 #undef v
29025
29026 #define v %esi
29027@@ -70,6 +78,20 @@ RET_ENDP
29028 BEGIN(add)
29029 addl %eax, (v)
29030 adcl %edx, 4(v)
29031+
29032+#ifdef CONFIG_PAX_REFCOUNT
29033+ jno 0f
29034+ subl %eax, (v)
29035+ sbbl %edx, 4(v)
29036+ int $4
29037+0:
29038+ _ASM_EXTABLE(0b, 0b)
29039+#endif
29040+
29041+RET_ENDP
29042+BEGIN(add_unchecked)
29043+ addl %eax, (v)
29044+ adcl %edx, 4(v)
29045 RET_ENDP
29046 #undef v
29047
29048@@ -77,6 +99,24 @@ RET_ENDP
29049 BEGIN(add_return)
29050 addl (v), %eax
29051 adcl 4(v), %edx
29052+
29053+#ifdef CONFIG_PAX_REFCOUNT
29054+ into
29055+1234:
29056+ _ASM_EXTABLE(1234b, 2f)
29057+#endif
29058+
29059+ movl %eax, (v)
29060+ movl %edx, 4(v)
29061+
29062+#ifdef CONFIG_PAX_REFCOUNT
29063+2:
29064+#endif
29065+
29066+RET_ENDP
29067+BEGIN(add_return_unchecked)
29068+ addl (v), %eax
29069+ adcl 4(v), %edx
29070 movl %eax, (v)
29071 movl %edx, 4(v)
29072 RET_ENDP
29073@@ -86,6 +126,20 @@ RET_ENDP
29074 BEGIN(sub)
29075 subl %eax, (v)
29076 sbbl %edx, 4(v)
29077+
29078+#ifdef CONFIG_PAX_REFCOUNT
29079+ jno 0f
29080+ addl %eax, (v)
29081+ adcl %edx, 4(v)
29082+ int $4
29083+0:
29084+ _ASM_EXTABLE(0b, 0b)
29085+#endif
29086+
29087+RET_ENDP
29088+BEGIN(sub_unchecked)
29089+ subl %eax, (v)
29090+ sbbl %edx, 4(v)
29091 RET_ENDP
29092 #undef v
29093
29094@@ -96,6 +150,27 @@ BEGIN(sub_return)
29095 sbbl $0, %edx
29096 addl (v), %eax
29097 adcl 4(v), %edx
29098+
29099+#ifdef CONFIG_PAX_REFCOUNT
29100+ into
29101+1234:
29102+ _ASM_EXTABLE(1234b, 2f)
29103+#endif
29104+
29105+ movl %eax, (v)
29106+ movl %edx, 4(v)
29107+
29108+#ifdef CONFIG_PAX_REFCOUNT
29109+2:
29110+#endif
29111+
29112+RET_ENDP
29113+BEGIN(sub_return_unchecked)
29114+ negl %edx
29115+ negl %eax
29116+ sbbl $0, %edx
29117+ addl (v), %eax
29118+ adcl 4(v), %edx
29119 movl %eax, (v)
29120 movl %edx, 4(v)
29121 RET_ENDP
29122@@ -105,6 +180,20 @@ RET_ENDP
29123 BEGIN(inc)
29124 addl $1, (v)
29125 adcl $0, 4(v)
29126+
29127+#ifdef CONFIG_PAX_REFCOUNT
29128+ jno 0f
29129+ subl $1, (v)
29130+ sbbl $0, 4(v)
29131+ int $4
29132+0:
29133+ _ASM_EXTABLE(0b, 0b)
29134+#endif
29135+
29136+RET_ENDP
29137+BEGIN(inc_unchecked)
29138+ addl $1, (v)
29139+ adcl $0, 4(v)
29140 RET_ENDP
29141 #undef v
29142
29143@@ -114,6 +203,26 @@ BEGIN(inc_return)
29144 movl 4(v), %edx
29145 addl $1, %eax
29146 adcl $0, %edx
29147+
29148+#ifdef CONFIG_PAX_REFCOUNT
29149+ into
29150+1234:
29151+ _ASM_EXTABLE(1234b, 2f)
29152+#endif
29153+
29154+ movl %eax, (v)
29155+ movl %edx, 4(v)
29156+
29157+#ifdef CONFIG_PAX_REFCOUNT
29158+2:
29159+#endif
29160+
29161+RET_ENDP
29162+BEGIN(inc_return_unchecked)
29163+ movl (v), %eax
29164+ movl 4(v), %edx
29165+ addl $1, %eax
29166+ adcl $0, %edx
29167 movl %eax, (v)
29168 movl %edx, 4(v)
29169 RET_ENDP
29170@@ -123,6 +232,20 @@ RET_ENDP
29171 BEGIN(dec)
29172 subl $1, (v)
29173 sbbl $0, 4(v)
29174+
29175+#ifdef CONFIG_PAX_REFCOUNT
29176+ jno 0f
29177+ addl $1, (v)
29178+ adcl $0, 4(v)
29179+ int $4
29180+0:
29181+ _ASM_EXTABLE(0b, 0b)
29182+#endif
29183+
29184+RET_ENDP
29185+BEGIN(dec_unchecked)
29186+ subl $1, (v)
29187+ sbbl $0, 4(v)
29188 RET_ENDP
29189 #undef v
29190
29191@@ -132,6 +255,26 @@ BEGIN(dec_return)
29192 movl 4(v), %edx
29193 subl $1, %eax
29194 sbbl $0, %edx
29195+
29196+#ifdef CONFIG_PAX_REFCOUNT
29197+ into
29198+1234:
29199+ _ASM_EXTABLE(1234b, 2f)
29200+#endif
29201+
29202+ movl %eax, (v)
29203+ movl %edx, 4(v)
29204+
29205+#ifdef CONFIG_PAX_REFCOUNT
29206+2:
29207+#endif
29208+
29209+RET_ENDP
29210+BEGIN(dec_return_unchecked)
29211+ movl (v), %eax
29212+ movl 4(v), %edx
29213+ subl $1, %eax
29214+ sbbl $0, %edx
29215 movl %eax, (v)
29216 movl %edx, 4(v)
29217 RET_ENDP
29218@@ -143,6 +286,13 @@ BEGIN(add_unless)
29219 adcl %edx, %edi
29220 addl (v), %eax
29221 adcl 4(v), %edx
29222+
29223+#ifdef CONFIG_PAX_REFCOUNT
29224+ into
29225+1234:
29226+ _ASM_EXTABLE(1234b, 2f)
29227+#endif
29228+
29229 cmpl %eax, %ecx
29230 je 3f
29231 1:
29232@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29233 1:
29234 addl $1, %eax
29235 adcl $0, %edx
29236+
29237+#ifdef CONFIG_PAX_REFCOUNT
29238+ into
29239+1234:
29240+ _ASM_EXTABLE(1234b, 2f)
29241+#endif
29242+
29243 movl %eax, (v)
29244 movl %edx, 4(v)
29245 movl $1, %eax
29246@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29247 movl 4(v), %edx
29248 subl $1, %eax
29249 sbbl $0, %edx
29250+
29251+#ifdef CONFIG_PAX_REFCOUNT
29252+ into
29253+1234:
29254+ _ASM_EXTABLE(1234b, 1f)
29255+#endif
29256+
29257 js 1f
29258 movl %eax, (v)
29259 movl %edx, 4(v)
29260diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29261index f5cc9eb..51fa319 100644
29262--- a/arch/x86/lib/atomic64_cx8_32.S
29263+++ b/arch/x86/lib/atomic64_cx8_32.S
29264@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29265 CFI_STARTPROC
29266
29267 read64 %ecx
29268+ pax_force_retaddr
29269 ret
29270 CFI_ENDPROC
29271 ENDPROC(atomic64_read_cx8)
29272
29273+ENTRY(atomic64_read_unchecked_cx8)
29274+ CFI_STARTPROC
29275+
29276+ read64 %ecx
29277+ pax_force_retaddr
29278+ ret
29279+ CFI_ENDPROC
29280+ENDPROC(atomic64_read_unchecked_cx8)
29281+
29282 ENTRY(atomic64_set_cx8)
29283 CFI_STARTPROC
29284
29285@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29286 cmpxchg8b (%esi)
29287 jne 1b
29288
29289+ pax_force_retaddr
29290 ret
29291 CFI_ENDPROC
29292 ENDPROC(atomic64_set_cx8)
29293
29294+ENTRY(atomic64_set_unchecked_cx8)
29295+ CFI_STARTPROC
29296+
29297+1:
29298+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29299+ * are atomic on 586 and newer */
29300+ cmpxchg8b (%esi)
29301+ jne 1b
29302+
29303+ pax_force_retaddr
29304+ ret
29305+ CFI_ENDPROC
29306+ENDPROC(atomic64_set_unchecked_cx8)
29307+
29308 ENTRY(atomic64_xchg_cx8)
29309 CFI_STARTPROC
29310
29311@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29312 cmpxchg8b (%esi)
29313 jne 1b
29314
29315+ pax_force_retaddr
29316 ret
29317 CFI_ENDPROC
29318 ENDPROC(atomic64_xchg_cx8)
29319
29320-.macro addsub_return func ins insc
29321-ENTRY(atomic64_\func\()_return_cx8)
29322+.macro addsub_return func ins insc unchecked=""
29323+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29324 CFI_STARTPROC
29325 SAVE ebp
29326 SAVE ebx
29327@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29328 movl %edx, %ecx
29329 \ins\()l %esi, %ebx
29330 \insc\()l %edi, %ecx
29331+
29332+.ifb \unchecked
29333+#ifdef CONFIG_PAX_REFCOUNT
29334+ into
29335+2:
29336+ _ASM_EXTABLE(2b, 3f)
29337+#endif
29338+.endif
29339+
29340 LOCK_PREFIX
29341 cmpxchg8b (%ebp)
29342 jne 1b
29343-
29344-10:
29345 movl %ebx, %eax
29346 movl %ecx, %edx
29347+
29348+.ifb \unchecked
29349+#ifdef CONFIG_PAX_REFCOUNT
29350+3:
29351+#endif
29352+.endif
29353+
29354 RESTORE edi
29355 RESTORE esi
29356 RESTORE ebx
29357 RESTORE ebp
29358+ pax_force_retaddr
29359 ret
29360 CFI_ENDPROC
29361-ENDPROC(atomic64_\func\()_return_cx8)
29362+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29363 .endm
29364
29365 addsub_return add add adc
29366 addsub_return sub sub sbb
29367+addsub_return add add adc _unchecked
29368+addsub_return sub sub sbb _unchecked
29369
29370-.macro incdec_return func ins insc
29371-ENTRY(atomic64_\func\()_return_cx8)
29372+.macro incdec_return func ins insc unchecked=""
29373+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29374 CFI_STARTPROC
29375 SAVE ebx
29376
29377@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29378 movl %edx, %ecx
29379 \ins\()l $1, %ebx
29380 \insc\()l $0, %ecx
29381+
29382+.ifb \unchecked
29383+#ifdef CONFIG_PAX_REFCOUNT
29384+ into
29385+2:
29386+ _ASM_EXTABLE(2b, 3f)
29387+#endif
29388+.endif
29389+
29390 LOCK_PREFIX
29391 cmpxchg8b (%esi)
29392 jne 1b
29393
29394-10:
29395 movl %ebx, %eax
29396 movl %ecx, %edx
29397+
29398+.ifb \unchecked
29399+#ifdef CONFIG_PAX_REFCOUNT
29400+3:
29401+#endif
29402+.endif
29403+
29404 RESTORE ebx
29405+ pax_force_retaddr
29406 ret
29407 CFI_ENDPROC
29408-ENDPROC(atomic64_\func\()_return_cx8)
29409+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29410 .endm
29411
29412 incdec_return inc add adc
29413 incdec_return dec sub sbb
29414+incdec_return inc add adc _unchecked
29415+incdec_return dec sub sbb _unchecked
29416
29417 ENTRY(atomic64_dec_if_positive_cx8)
29418 CFI_STARTPROC
29419@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29420 movl %edx, %ecx
29421 subl $1, %ebx
29422 sbb $0, %ecx
29423+
29424+#ifdef CONFIG_PAX_REFCOUNT
29425+ into
29426+1234:
29427+ _ASM_EXTABLE(1234b, 2f)
29428+#endif
29429+
29430 js 2f
29431 LOCK_PREFIX
29432 cmpxchg8b (%esi)
29433@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29434 movl %ebx, %eax
29435 movl %ecx, %edx
29436 RESTORE ebx
29437+ pax_force_retaddr
29438 ret
29439 CFI_ENDPROC
29440 ENDPROC(atomic64_dec_if_positive_cx8)
29441@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29442 movl %edx, %ecx
29443 addl %ebp, %ebx
29444 adcl %edi, %ecx
29445+
29446+#ifdef CONFIG_PAX_REFCOUNT
29447+ into
29448+1234:
29449+ _ASM_EXTABLE(1234b, 3f)
29450+#endif
29451+
29452 LOCK_PREFIX
29453 cmpxchg8b (%esi)
29454 jne 1b
29455@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29456 CFI_ADJUST_CFA_OFFSET -8
29457 RESTORE ebx
29458 RESTORE ebp
29459+ pax_force_retaddr
29460 ret
29461 4:
29462 cmpl %edx, 4(%esp)
29463@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29464 xorl %ecx, %ecx
29465 addl $1, %ebx
29466 adcl %edx, %ecx
29467+
29468+#ifdef CONFIG_PAX_REFCOUNT
29469+ into
29470+1234:
29471+ _ASM_EXTABLE(1234b, 3f)
29472+#endif
29473+
29474 LOCK_PREFIX
29475 cmpxchg8b (%esi)
29476 jne 1b
29477@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29478 movl $1, %eax
29479 3:
29480 RESTORE ebx
29481+ pax_force_retaddr
29482 ret
29483 CFI_ENDPROC
29484 ENDPROC(atomic64_inc_not_zero_cx8)
29485diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29486index e78b8eee..7e173a8 100644
29487--- a/arch/x86/lib/checksum_32.S
29488+++ b/arch/x86/lib/checksum_32.S
29489@@ -29,7 +29,8 @@
29490 #include <asm/dwarf2.h>
29491 #include <asm/errno.h>
29492 #include <asm/asm.h>
29493-
29494+#include <asm/segment.h>
29495+
29496 /*
29497 * computes a partial checksum, e.g. for TCP/UDP fragments
29498 */
29499@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29500
29501 #define ARGBASE 16
29502 #define FP 12
29503-
29504-ENTRY(csum_partial_copy_generic)
29505+
29506+ENTRY(csum_partial_copy_generic_to_user)
29507 CFI_STARTPROC
29508+
29509+#ifdef CONFIG_PAX_MEMORY_UDEREF
29510+ pushl_cfi %gs
29511+ popl_cfi %es
29512+ jmp csum_partial_copy_generic
29513+#endif
29514+
29515+ENTRY(csum_partial_copy_generic_from_user)
29516+
29517+#ifdef CONFIG_PAX_MEMORY_UDEREF
29518+ pushl_cfi %gs
29519+ popl_cfi %ds
29520+#endif
29521+
29522+ENTRY(csum_partial_copy_generic)
29523 subl $4,%esp
29524 CFI_ADJUST_CFA_OFFSET 4
29525 pushl_cfi %edi
29526@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29527 jmp 4f
29528 SRC(1: movw (%esi), %bx )
29529 addl $2, %esi
29530-DST( movw %bx, (%edi) )
29531+DST( movw %bx, %es:(%edi) )
29532 addl $2, %edi
29533 addw %bx, %ax
29534 adcl $0, %eax
29535@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29536 SRC(1: movl (%esi), %ebx )
29537 SRC( movl 4(%esi), %edx )
29538 adcl %ebx, %eax
29539-DST( movl %ebx, (%edi) )
29540+DST( movl %ebx, %es:(%edi) )
29541 adcl %edx, %eax
29542-DST( movl %edx, 4(%edi) )
29543+DST( movl %edx, %es:4(%edi) )
29544
29545 SRC( movl 8(%esi), %ebx )
29546 SRC( movl 12(%esi), %edx )
29547 adcl %ebx, %eax
29548-DST( movl %ebx, 8(%edi) )
29549+DST( movl %ebx, %es:8(%edi) )
29550 adcl %edx, %eax
29551-DST( movl %edx, 12(%edi) )
29552+DST( movl %edx, %es:12(%edi) )
29553
29554 SRC( movl 16(%esi), %ebx )
29555 SRC( movl 20(%esi), %edx )
29556 adcl %ebx, %eax
29557-DST( movl %ebx, 16(%edi) )
29558+DST( movl %ebx, %es:16(%edi) )
29559 adcl %edx, %eax
29560-DST( movl %edx, 20(%edi) )
29561+DST( movl %edx, %es:20(%edi) )
29562
29563 SRC( movl 24(%esi), %ebx )
29564 SRC( movl 28(%esi), %edx )
29565 adcl %ebx, %eax
29566-DST( movl %ebx, 24(%edi) )
29567+DST( movl %ebx, %es:24(%edi) )
29568 adcl %edx, %eax
29569-DST( movl %edx, 28(%edi) )
29570+DST( movl %edx, %es:28(%edi) )
29571
29572 lea 32(%esi), %esi
29573 lea 32(%edi), %edi
29574@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29575 shrl $2, %edx # This clears CF
29576 SRC(3: movl (%esi), %ebx )
29577 adcl %ebx, %eax
29578-DST( movl %ebx, (%edi) )
29579+DST( movl %ebx, %es:(%edi) )
29580 lea 4(%esi), %esi
29581 lea 4(%edi), %edi
29582 dec %edx
29583@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29584 jb 5f
29585 SRC( movw (%esi), %cx )
29586 leal 2(%esi), %esi
29587-DST( movw %cx, (%edi) )
29588+DST( movw %cx, %es:(%edi) )
29589 leal 2(%edi), %edi
29590 je 6f
29591 shll $16,%ecx
29592 SRC(5: movb (%esi), %cl )
29593-DST( movb %cl, (%edi) )
29594+DST( movb %cl, %es:(%edi) )
29595 6: addl %ecx, %eax
29596 adcl $0, %eax
29597 7:
29598@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29599
29600 6001:
29601 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29602- movl $-EFAULT, (%ebx)
29603+ movl $-EFAULT, %ss:(%ebx)
29604
29605 # zero the complete destination - computing the rest
29606 # is too much work
29607@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29608
29609 6002:
29610 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29611- movl $-EFAULT,(%ebx)
29612+ movl $-EFAULT,%ss:(%ebx)
29613 jmp 5000b
29614
29615 .previous
29616
29617+ pushl_cfi %ss
29618+ popl_cfi %ds
29619+ pushl_cfi %ss
29620+ popl_cfi %es
29621 popl_cfi %ebx
29622 CFI_RESTORE ebx
29623 popl_cfi %esi
29624@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29625 popl_cfi %ecx # equivalent to addl $4,%esp
29626 ret
29627 CFI_ENDPROC
29628-ENDPROC(csum_partial_copy_generic)
29629+ENDPROC(csum_partial_copy_generic_to_user)
29630
29631 #else
29632
29633 /* Version for PentiumII/PPro */
29634
29635 #define ROUND1(x) \
29636+ nop; nop; nop; \
29637 SRC(movl x(%esi), %ebx ) ; \
29638 addl %ebx, %eax ; \
29639- DST(movl %ebx, x(%edi) ) ;
29640+ DST(movl %ebx, %es:x(%edi)) ;
29641
29642 #define ROUND(x) \
29643+ nop; nop; nop; \
29644 SRC(movl x(%esi), %ebx ) ; \
29645 adcl %ebx, %eax ; \
29646- DST(movl %ebx, x(%edi) ) ;
29647+ DST(movl %ebx, %es:x(%edi)) ;
29648
29649 #define ARGBASE 12
29650-
29651-ENTRY(csum_partial_copy_generic)
29652+
29653+ENTRY(csum_partial_copy_generic_to_user)
29654 CFI_STARTPROC
29655+
29656+#ifdef CONFIG_PAX_MEMORY_UDEREF
29657+ pushl_cfi %gs
29658+ popl_cfi %es
29659+ jmp csum_partial_copy_generic
29660+#endif
29661+
29662+ENTRY(csum_partial_copy_generic_from_user)
29663+
29664+#ifdef CONFIG_PAX_MEMORY_UDEREF
29665+ pushl_cfi %gs
29666+ popl_cfi %ds
29667+#endif
29668+
29669+ENTRY(csum_partial_copy_generic)
29670 pushl_cfi %ebx
29671 CFI_REL_OFFSET ebx, 0
29672 pushl_cfi %edi
29673@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29674 subl %ebx, %edi
29675 lea -1(%esi),%edx
29676 andl $-32,%edx
29677- lea 3f(%ebx,%ebx), %ebx
29678+ lea 3f(%ebx,%ebx,2), %ebx
29679 testl %esi, %esi
29680 jmp *%ebx
29681 1: addl $64,%esi
29682@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29683 jb 5f
29684 SRC( movw (%esi), %dx )
29685 leal 2(%esi), %esi
29686-DST( movw %dx, (%edi) )
29687+DST( movw %dx, %es:(%edi) )
29688 leal 2(%edi), %edi
29689 je 6f
29690 shll $16,%edx
29691 5:
29692 SRC( movb (%esi), %dl )
29693-DST( movb %dl, (%edi) )
29694+DST( movb %dl, %es:(%edi) )
29695 6: addl %edx, %eax
29696 adcl $0, %eax
29697 7:
29698 .section .fixup, "ax"
29699 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29700- movl $-EFAULT, (%ebx)
29701+ movl $-EFAULT, %ss:(%ebx)
29702 # zero the complete destination (computing the rest is too much work)
29703 movl ARGBASE+8(%esp),%edi # dst
29704 movl ARGBASE+12(%esp),%ecx # len
29705@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29706 rep; stosb
29707 jmp 7b
29708 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29709- movl $-EFAULT, (%ebx)
29710+ movl $-EFAULT, %ss:(%ebx)
29711 jmp 7b
29712 .previous
29713
29714+#ifdef CONFIG_PAX_MEMORY_UDEREF
29715+ pushl_cfi %ss
29716+ popl_cfi %ds
29717+ pushl_cfi %ss
29718+ popl_cfi %es
29719+#endif
29720+
29721 popl_cfi %esi
29722 CFI_RESTORE esi
29723 popl_cfi %edi
29724@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29725 CFI_RESTORE ebx
29726 ret
29727 CFI_ENDPROC
29728-ENDPROC(csum_partial_copy_generic)
29729+ENDPROC(csum_partial_copy_generic_to_user)
29730
29731 #undef ROUND
29732 #undef ROUND1
29733diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29734index f2145cf..cea889d 100644
29735--- a/arch/x86/lib/clear_page_64.S
29736+++ b/arch/x86/lib/clear_page_64.S
29737@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29738 movl $4096/8,%ecx
29739 xorl %eax,%eax
29740 rep stosq
29741+ pax_force_retaddr
29742 ret
29743 CFI_ENDPROC
29744 ENDPROC(clear_page_c)
29745@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29746 movl $4096,%ecx
29747 xorl %eax,%eax
29748 rep stosb
29749+ pax_force_retaddr
29750 ret
29751 CFI_ENDPROC
29752 ENDPROC(clear_page_c_e)
29753@@ -43,6 +45,7 @@ ENTRY(clear_page)
29754 leaq 64(%rdi),%rdi
29755 jnz .Lloop
29756 nop
29757+ pax_force_retaddr
29758 ret
29759 CFI_ENDPROC
29760 .Lclear_page_end:
29761@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29762
29763 #include <asm/cpufeature.h>
29764
29765- .section .altinstr_replacement,"ax"
29766+ .section .altinstr_replacement,"a"
29767 1: .byte 0xeb /* jmp <disp8> */
29768 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29769 2: .byte 0xeb /* jmp <disp8> */
29770diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29771index 40a1725..5d12ac4 100644
29772--- a/arch/x86/lib/cmpxchg16b_emu.S
29773+++ b/arch/x86/lib/cmpxchg16b_emu.S
29774@@ -8,6 +8,7 @@
29775 #include <linux/linkage.h>
29776 #include <asm/dwarf2.h>
29777 #include <asm/percpu.h>
29778+#include <asm/alternative-asm.h>
29779
29780 .text
29781
29782@@ -46,12 +47,14 @@ CFI_STARTPROC
29783 CFI_REMEMBER_STATE
29784 popfq_cfi
29785 mov $1, %al
29786+ pax_force_retaddr
29787 ret
29788
29789 CFI_RESTORE_STATE
29790 .Lnot_same:
29791 popfq_cfi
29792 xor %al,%al
29793+ pax_force_retaddr
29794 ret
29795
29796 CFI_ENDPROC
29797diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29798index 176cca6..e0d658e 100644
29799--- a/arch/x86/lib/copy_page_64.S
29800+++ b/arch/x86/lib/copy_page_64.S
29801@@ -9,6 +9,7 @@ copy_page_rep:
29802 CFI_STARTPROC
29803 movl $4096/8, %ecx
29804 rep movsq
29805+ pax_force_retaddr
29806 ret
29807 CFI_ENDPROC
29808 ENDPROC(copy_page_rep)
29809@@ -24,8 +25,8 @@ ENTRY(copy_page)
29810 CFI_ADJUST_CFA_OFFSET 2*8
29811 movq %rbx, (%rsp)
29812 CFI_REL_OFFSET rbx, 0
29813- movq %r12, 1*8(%rsp)
29814- CFI_REL_OFFSET r12, 1*8
29815+ movq %r13, 1*8(%rsp)
29816+ CFI_REL_OFFSET r13, 1*8
29817
29818 movl $(4096/64)-5, %ecx
29819 .p2align 4
29820@@ -38,7 +39,7 @@ ENTRY(copy_page)
29821 movq 0x8*4(%rsi), %r9
29822 movq 0x8*5(%rsi), %r10
29823 movq 0x8*6(%rsi), %r11
29824- movq 0x8*7(%rsi), %r12
29825+ movq 0x8*7(%rsi), %r13
29826
29827 prefetcht0 5*64(%rsi)
29828
29829@@ -49,7 +50,7 @@ ENTRY(copy_page)
29830 movq %r9, 0x8*4(%rdi)
29831 movq %r10, 0x8*5(%rdi)
29832 movq %r11, 0x8*6(%rdi)
29833- movq %r12, 0x8*7(%rdi)
29834+ movq %r13, 0x8*7(%rdi)
29835
29836 leaq 64 (%rsi), %rsi
29837 leaq 64 (%rdi), %rdi
29838@@ -68,7 +69,7 @@ ENTRY(copy_page)
29839 movq 0x8*4(%rsi), %r9
29840 movq 0x8*5(%rsi), %r10
29841 movq 0x8*6(%rsi), %r11
29842- movq 0x8*7(%rsi), %r12
29843+ movq 0x8*7(%rsi), %r13
29844
29845 movq %rax, 0x8*0(%rdi)
29846 movq %rbx, 0x8*1(%rdi)
29847@@ -77,7 +78,7 @@ ENTRY(copy_page)
29848 movq %r9, 0x8*4(%rdi)
29849 movq %r10, 0x8*5(%rdi)
29850 movq %r11, 0x8*6(%rdi)
29851- movq %r12, 0x8*7(%rdi)
29852+ movq %r13, 0x8*7(%rdi)
29853
29854 leaq 64(%rdi), %rdi
29855 leaq 64(%rsi), %rsi
29856@@ -85,10 +86,11 @@ ENTRY(copy_page)
29857
29858 movq (%rsp), %rbx
29859 CFI_RESTORE rbx
29860- movq 1*8(%rsp), %r12
29861- CFI_RESTORE r12
29862+ movq 1*8(%rsp), %r13
29863+ CFI_RESTORE r13
29864 addq $2*8, %rsp
29865 CFI_ADJUST_CFA_OFFSET -2*8
29866+ pax_force_retaddr
29867 ret
29868 .Lcopy_page_end:
29869 CFI_ENDPROC
29870@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29871
29872 #include <asm/cpufeature.h>
29873
29874- .section .altinstr_replacement,"ax"
29875+ .section .altinstr_replacement,"a"
29876 1: .byte 0xeb /* jmp <disp8> */
29877 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29878 2:
29879diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29880index dee945d..a84067b 100644
29881--- a/arch/x86/lib/copy_user_64.S
29882+++ b/arch/x86/lib/copy_user_64.S
29883@@ -18,31 +18,7 @@
29884 #include <asm/alternative-asm.h>
29885 #include <asm/asm.h>
29886 #include <asm/smap.h>
29887-
29888-/*
29889- * By placing feature2 after feature1 in altinstructions section, we logically
29890- * implement:
29891- * If CPU has feature2, jmp to alt2 is used
29892- * else if CPU has feature1, jmp to alt1 is used
29893- * else jmp to orig is used.
29894- */
29895- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29896-0:
29897- .byte 0xe9 /* 32bit jump */
29898- .long \orig-1f /* by default jump to orig */
29899-1:
29900- .section .altinstr_replacement,"ax"
29901-2: .byte 0xe9 /* near jump with 32bit immediate */
29902- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29903-3: .byte 0xe9 /* near jump with 32bit immediate */
29904- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29905- .previous
29906-
29907- .section .altinstructions,"a"
29908- altinstruction_entry 0b,2b,\feature1,5,5
29909- altinstruction_entry 0b,3b,\feature2,5,5
29910- .previous
29911- .endm
29912+#include <asm/pgtable.h>
29913
29914 .macro ALIGN_DESTINATION
29915 #ifdef FIX_ALIGNMENT
29916@@ -70,52 +46,6 @@
29917 #endif
29918 .endm
29919
29920-/* Standard copy_to_user with segment limit checking */
29921-ENTRY(_copy_to_user)
29922- CFI_STARTPROC
29923- GET_THREAD_INFO(%rax)
29924- movq %rdi,%rcx
29925- addq %rdx,%rcx
29926- jc bad_to_user
29927- cmpq TI_addr_limit(%rax),%rcx
29928- ja bad_to_user
29929- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29930- copy_user_generic_unrolled,copy_user_generic_string, \
29931- copy_user_enhanced_fast_string
29932- CFI_ENDPROC
29933-ENDPROC(_copy_to_user)
29934-
29935-/* Standard copy_from_user with segment limit checking */
29936-ENTRY(_copy_from_user)
29937- CFI_STARTPROC
29938- GET_THREAD_INFO(%rax)
29939- movq %rsi,%rcx
29940- addq %rdx,%rcx
29941- jc bad_from_user
29942- cmpq TI_addr_limit(%rax),%rcx
29943- ja bad_from_user
29944- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29945- copy_user_generic_unrolled,copy_user_generic_string, \
29946- copy_user_enhanced_fast_string
29947- CFI_ENDPROC
29948-ENDPROC(_copy_from_user)
29949-
29950- .section .fixup,"ax"
29951- /* must zero dest */
29952-ENTRY(bad_from_user)
29953-bad_from_user:
29954- CFI_STARTPROC
29955- movl %edx,%ecx
29956- xorl %eax,%eax
29957- rep
29958- stosb
29959-bad_to_user:
29960- movl %edx,%eax
29961- ret
29962- CFI_ENDPROC
29963-ENDPROC(bad_from_user)
29964- .previous
29965-
29966 /*
29967 * copy_user_generic_unrolled - memory copy with exception handling.
29968 * This version is for CPUs like P4 that don't have efficient micro
29969@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29970 */
29971 ENTRY(copy_user_generic_unrolled)
29972 CFI_STARTPROC
29973+ ASM_PAX_OPEN_USERLAND
29974 ASM_STAC
29975 cmpl $8,%edx
29976 jb 20f /* less then 8 bytes, go to byte copy loop */
29977@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29978 jnz 21b
29979 23: xor %eax,%eax
29980 ASM_CLAC
29981+ ASM_PAX_CLOSE_USERLAND
29982+ pax_force_retaddr
29983 ret
29984
29985 .section .fixup,"ax"
29986@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29987 */
29988 ENTRY(copy_user_generic_string)
29989 CFI_STARTPROC
29990+ ASM_PAX_OPEN_USERLAND
29991 ASM_STAC
29992 cmpl $8,%edx
29993 jb 2f /* less than 8 bytes, go to byte copy loop */
29994@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29995 movsb
29996 xorl %eax,%eax
29997 ASM_CLAC
29998+ ASM_PAX_CLOSE_USERLAND
29999+ pax_force_retaddr
30000 ret
30001
30002 .section .fixup,"ax"
30003@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
30004 */
30005 ENTRY(copy_user_enhanced_fast_string)
30006 CFI_STARTPROC
30007+ ASM_PAX_OPEN_USERLAND
30008 ASM_STAC
30009 movl %edx,%ecx
30010 1: rep
30011 movsb
30012 xorl %eax,%eax
30013 ASM_CLAC
30014+ ASM_PAX_CLOSE_USERLAND
30015+ pax_force_retaddr
30016 ret
30017
30018 .section .fixup,"ax"
30019diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30020index 6a4f43c..c70fb52 100644
30021--- a/arch/x86/lib/copy_user_nocache_64.S
30022+++ b/arch/x86/lib/copy_user_nocache_64.S
30023@@ -8,6 +8,7 @@
30024
30025 #include <linux/linkage.h>
30026 #include <asm/dwarf2.h>
30027+#include <asm/alternative-asm.h>
30028
30029 #define FIX_ALIGNMENT 1
30030
30031@@ -16,6 +17,7 @@
30032 #include <asm/thread_info.h>
30033 #include <asm/asm.h>
30034 #include <asm/smap.h>
30035+#include <asm/pgtable.h>
30036
30037 .macro ALIGN_DESTINATION
30038 #ifdef FIX_ALIGNMENT
30039@@ -49,6 +51,16 @@
30040 */
30041 ENTRY(__copy_user_nocache)
30042 CFI_STARTPROC
30043+
30044+#ifdef CONFIG_PAX_MEMORY_UDEREF
30045+ mov pax_user_shadow_base,%rcx
30046+ cmp %rcx,%rsi
30047+ jae 1f
30048+ add %rcx,%rsi
30049+1:
30050+#endif
30051+
30052+ ASM_PAX_OPEN_USERLAND
30053 ASM_STAC
30054 cmpl $8,%edx
30055 jb 20f /* less then 8 bytes, go to byte copy loop */
30056@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30057 jnz 21b
30058 23: xorl %eax,%eax
30059 ASM_CLAC
30060+ ASM_PAX_CLOSE_USERLAND
30061 sfence
30062+ pax_force_retaddr
30063 ret
30064
30065 .section .fixup,"ax"
30066diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30067index 2419d5f..fe52d0e 100644
30068--- a/arch/x86/lib/csum-copy_64.S
30069+++ b/arch/x86/lib/csum-copy_64.S
30070@@ -9,6 +9,7 @@
30071 #include <asm/dwarf2.h>
30072 #include <asm/errno.h>
30073 #include <asm/asm.h>
30074+#include <asm/alternative-asm.h>
30075
30076 /*
30077 * Checksum copy with exception handling.
30078@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30079 CFI_ADJUST_CFA_OFFSET 7*8
30080 movq %rbx, 2*8(%rsp)
30081 CFI_REL_OFFSET rbx, 2*8
30082- movq %r12, 3*8(%rsp)
30083- CFI_REL_OFFSET r12, 3*8
30084+ movq %r15, 3*8(%rsp)
30085+ CFI_REL_OFFSET r15, 3*8
30086 movq %r14, 4*8(%rsp)
30087 CFI_REL_OFFSET r14, 4*8
30088 movq %r13, 5*8(%rsp)
30089@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30090 movl %edx, %ecx
30091
30092 xorl %r9d, %r9d
30093- movq %rcx, %r12
30094+ movq %rcx, %r15
30095
30096- shrq $6, %r12
30097+ shrq $6, %r15
30098 jz .Lhandle_tail /* < 64 */
30099
30100 clc
30101
30102 /* main loop. clear in 64 byte blocks */
30103 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30104- /* r11: temp3, rdx: temp4, r12 loopcnt */
30105+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30106 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30107 .p2align 4
30108 .Lloop:
30109@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30110 adcq %r14, %rax
30111 adcq %r13, %rax
30112
30113- decl %r12d
30114+ decl %r15d
30115
30116 dest
30117 movq %rbx, (%rsi)
30118@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30119 .Lende:
30120 movq 2*8(%rsp), %rbx
30121 CFI_RESTORE rbx
30122- movq 3*8(%rsp), %r12
30123- CFI_RESTORE r12
30124+ movq 3*8(%rsp), %r15
30125+ CFI_RESTORE r15
30126 movq 4*8(%rsp), %r14
30127 CFI_RESTORE r14
30128 movq 5*8(%rsp), %r13
30129@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30130 CFI_RESTORE rbp
30131 addq $7*8, %rsp
30132 CFI_ADJUST_CFA_OFFSET -7*8
30133+ pax_force_retaddr
30134 ret
30135 CFI_RESTORE_STATE
30136
30137diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30138index 1318f75..44c30fd 100644
30139--- a/arch/x86/lib/csum-wrappers_64.c
30140+++ b/arch/x86/lib/csum-wrappers_64.c
30141@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30142 len -= 2;
30143 }
30144 }
30145+ pax_open_userland();
30146 stac();
30147- isum = csum_partial_copy_generic((__force const void *)src,
30148+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30149 dst, len, isum, errp, NULL);
30150 clac();
30151+ pax_close_userland();
30152 if (unlikely(*errp))
30153 goto out_err;
30154
30155@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30156 }
30157
30158 *errp = 0;
30159+ pax_open_userland();
30160 stac();
30161- ret = csum_partial_copy_generic(src, (void __force *)dst,
30162+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30163 len, isum, NULL, errp);
30164 clac();
30165+ pax_close_userland();
30166 return ret;
30167 }
30168 EXPORT_SYMBOL(csum_partial_copy_to_user);
30169diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30170index a451235..a74bfa3 100644
30171--- a/arch/x86/lib/getuser.S
30172+++ b/arch/x86/lib/getuser.S
30173@@ -33,17 +33,40 @@
30174 #include <asm/thread_info.h>
30175 #include <asm/asm.h>
30176 #include <asm/smap.h>
30177+#include <asm/segment.h>
30178+#include <asm/pgtable.h>
30179+#include <asm/alternative-asm.h>
30180+
30181+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30182+#define __copyuser_seg gs;
30183+#else
30184+#define __copyuser_seg
30185+#endif
30186
30187 .text
30188 ENTRY(__get_user_1)
30189 CFI_STARTPROC
30190+
30191+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30192 GET_THREAD_INFO(%_ASM_DX)
30193 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30194 jae bad_get_user
30195+
30196+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30197+ mov pax_user_shadow_base,%_ASM_DX
30198+ cmp %_ASM_DX,%_ASM_AX
30199+ jae 1234f
30200+ add %_ASM_DX,%_ASM_AX
30201+1234:
30202+#endif
30203+
30204+#endif
30205+
30206 ASM_STAC
30207-1: movzbl (%_ASM_AX),%edx
30208+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30209 xor %eax,%eax
30210 ASM_CLAC
30211+ pax_force_retaddr
30212 ret
30213 CFI_ENDPROC
30214 ENDPROC(__get_user_1)
30215@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30216 ENTRY(__get_user_2)
30217 CFI_STARTPROC
30218 add $1,%_ASM_AX
30219+
30220+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30221 jc bad_get_user
30222 GET_THREAD_INFO(%_ASM_DX)
30223 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30224 jae bad_get_user
30225+
30226+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30227+ mov pax_user_shadow_base,%_ASM_DX
30228+ cmp %_ASM_DX,%_ASM_AX
30229+ jae 1234f
30230+ add %_ASM_DX,%_ASM_AX
30231+1234:
30232+#endif
30233+
30234+#endif
30235+
30236 ASM_STAC
30237-2: movzwl -1(%_ASM_AX),%edx
30238+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30239 xor %eax,%eax
30240 ASM_CLAC
30241+ pax_force_retaddr
30242 ret
30243 CFI_ENDPROC
30244 ENDPROC(__get_user_2)
30245@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30246 ENTRY(__get_user_4)
30247 CFI_STARTPROC
30248 add $3,%_ASM_AX
30249+
30250+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30251 jc bad_get_user
30252 GET_THREAD_INFO(%_ASM_DX)
30253 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30254 jae bad_get_user
30255+
30256+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30257+ mov pax_user_shadow_base,%_ASM_DX
30258+ cmp %_ASM_DX,%_ASM_AX
30259+ jae 1234f
30260+ add %_ASM_DX,%_ASM_AX
30261+1234:
30262+#endif
30263+
30264+#endif
30265+
30266 ASM_STAC
30267-3: movl -3(%_ASM_AX),%edx
30268+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30269 xor %eax,%eax
30270 ASM_CLAC
30271+ pax_force_retaddr
30272 ret
30273 CFI_ENDPROC
30274 ENDPROC(__get_user_4)
30275@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30276 GET_THREAD_INFO(%_ASM_DX)
30277 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30278 jae bad_get_user
30279+
30280+#ifdef CONFIG_PAX_MEMORY_UDEREF
30281+ mov pax_user_shadow_base,%_ASM_DX
30282+ cmp %_ASM_DX,%_ASM_AX
30283+ jae 1234f
30284+ add %_ASM_DX,%_ASM_AX
30285+1234:
30286+#endif
30287+
30288 ASM_STAC
30289 4: movq -7(%_ASM_AX),%rdx
30290 xor %eax,%eax
30291 ASM_CLAC
30292+ pax_force_retaddr
30293 ret
30294 #else
30295 add $7,%_ASM_AX
30296@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30297 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30298 jae bad_get_user_8
30299 ASM_STAC
30300-4: movl -7(%_ASM_AX),%edx
30301-5: movl -3(%_ASM_AX),%ecx
30302+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30303+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30304 xor %eax,%eax
30305 ASM_CLAC
30306+ pax_force_retaddr
30307 ret
30308 #endif
30309 CFI_ENDPROC
30310@@ -113,6 +175,7 @@ bad_get_user:
30311 xor %edx,%edx
30312 mov $(-EFAULT),%_ASM_AX
30313 ASM_CLAC
30314+ pax_force_retaddr
30315 ret
30316 CFI_ENDPROC
30317 END(bad_get_user)
30318@@ -124,6 +187,7 @@ bad_get_user_8:
30319 xor %ecx,%ecx
30320 mov $(-EFAULT),%_ASM_AX
30321 ASM_CLAC
30322+ pax_force_retaddr
30323 ret
30324 CFI_ENDPROC
30325 END(bad_get_user_8)
30326diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30327index 85994f5..9929d7f 100644
30328--- a/arch/x86/lib/insn.c
30329+++ b/arch/x86/lib/insn.c
30330@@ -20,8 +20,10 @@
30331
30332 #ifdef __KERNEL__
30333 #include <linux/string.h>
30334+#include <asm/pgtable_types.h>
30335 #else
30336 #include <string.h>
30337+#define ktla_ktva(addr) addr
30338 #endif
30339 #include <asm/inat.h>
30340 #include <asm/insn.h>
30341@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30342 buf_len = MAX_INSN_SIZE;
30343
30344 memset(insn, 0, sizeof(*insn));
30345- insn->kaddr = kaddr;
30346- insn->end_kaddr = kaddr + buf_len;
30347- insn->next_byte = kaddr;
30348+ insn->kaddr = ktla_ktva(kaddr);
30349+ insn->end_kaddr = insn->kaddr + buf_len;
30350+ insn->next_byte = insn->kaddr;
30351 insn->x86_64 = x86_64 ? 1 : 0;
30352 insn->opnd_bytes = 4;
30353 if (x86_64)
30354diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30355index 05a95e7..326f2fa 100644
30356--- a/arch/x86/lib/iomap_copy_64.S
30357+++ b/arch/x86/lib/iomap_copy_64.S
30358@@ -17,6 +17,7 @@
30359
30360 #include <linux/linkage.h>
30361 #include <asm/dwarf2.h>
30362+#include <asm/alternative-asm.h>
30363
30364 /*
30365 * override generic version in lib/iomap_copy.c
30366@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30367 CFI_STARTPROC
30368 movl %edx,%ecx
30369 rep movsd
30370+ pax_force_retaddr
30371 ret
30372 CFI_ENDPROC
30373 ENDPROC(__iowrite32_copy)
30374diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30375index 89b53c9..97357ca 100644
30376--- a/arch/x86/lib/memcpy_64.S
30377+++ b/arch/x86/lib/memcpy_64.S
30378@@ -24,7 +24,7 @@
30379 * This gets patched over the unrolled variant (below) via the
30380 * alternative instructions framework:
30381 */
30382- .section .altinstr_replacement, "ax", @progbits
30383+ .section .altinstr_replacement, "a", @progbits
30384 .Lmemcpy_c:
30385 movq %rdi, %rax
30386 movq %rdx, %rcx
30387@@ -33,6 +33,7 @@
30388 rep movsq
30389 movl %edx, %ecx
30390 rep movsb
30391+ pax_force_retaddr
30392 ret
30393 .Lmemcpy_e:
30394 .previous
30395@@ -44,11 +45,12 @@
30396 * This gets patched over the unrolled variant (below) via the
30397 * alternative instructions framework:
30398 */
30399- .section .altinstr_replacement, "ax", @progbits
30400+ .section .altinstr_replacement, "a", @progbits
30401 .Lmemcpy_c_e:
30402 movq %rdi, %rax
30403 movq %rdx, %rcx
30404 rep movsb
30405+ pax_force_retaddr
30406 ret
30407 .Lmemcpy_e_e:
30408 .previous
30409@@ -138,6 +140,7 @@ ENTRY(memcpy)
30410 movq %r9, 1*8(%rdi)
30411 movq %r10, -2*8(%rdi, %rdx)
30412 movq %r11, -1*8(%rdi, %rdx)
30413+ pax_force_retaddr
30414 retq
30415 .p2align 4
30416 .Lless_16bytes:
30417@@ -150,6 +153,7 @@ ENTRY(memcpy)
30418 movq -1*8(%rsi, %rdx), %r9
30419 movq %r8, 0*8(%rdi)
30420 movq %r9, -1*8(%rdi, %rdx)
30421+ pax_force_retaddr
30422 retq
30423 .p2align 4
30424 .Lless_8bytes:
30425@@ -163,6 +167,7 @@ ENTRY(memcpy)
30426 movl -4(%rsi, %rdx), %r8d
30427 movl %ecx, (%rdi)
30428 movl %r8d, -4(%rdi, %rdx)
30429+ pax_force_retaddr
30430 retq
30431 .p2align 4
30432 .Lless_3bytes:
30433@@ -181,6 +186,7 @@ ENTRY(memcpy)
30434 movb %cl, (%rdi)
30435
30436 .Lend:
30437+ pax_force_retaddr
30438 retq
30439 CFI_ENDPROC
30440 ENDPROC(memcpy)
30441diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30442index 9c4b530..830b77a 100644
30443--- a/arch/x86/lib/memmove_64.S
30444+++ b/arch/x86/lib/memmove_64.S
30445@@ -205,14 +205,16 @@ ENTRY(__memmove)
30446 movb (%rsi), %r11b
30447 movb %r11b, (%rdi)
30448 13:
30449+ pax_force_retaddr
30450 retq
30451 CFI_ENDPROC
30452
30453- .section .altinstr_replacement,"ax"
30454+ .section .altinstr_replacement,"a"
30455 .Lmemmove_begin_forward_efs:
30456 /* Forward moving data. */
30457 movq %rdx, %rcx
30458 rep movsb
30459+ pax_force_retaddr
30460 retq
30461 .Lmemmove_end_forward_efs:
30462 .previous
30463diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30464index 6f44935..fbf5f6d 100644
30465--- a/arch/x86/lib/memset_64.S
30466+++ b/arch/x86/lib/memset_64.S
30467@@ -16,7 +16,7 @@
30468 *
30469 * rax original destination
30470 */
30471- .section .altinstr_replacement, "ax", @progbits
30472+ .section .altinstr_replacement, "a", @progbits
30473 .Lmemset_c:
30474 movq %rdi,%r9
30475 movq %rdx,%rcx
30476@@ -30,6 +30,7 @@
30477 movl %edx,%ecx
30478 rep stosb
30479 movq %r9,%rax
30480+ pax_force_retaddr
30481 ret
30482 .Lmemset_e:
30483 .previous
30484@@ -45,13 +46,14 @@
30485 *
30486 * rax original destination
30487 */
30488- .section .altinstr_replacement, "ax", @progbits
30489+ .section .altinstr_replacement, "a", @progbits
30490 .Lmemset_c_e:
30491 movq %rdi,%r9
30492 movb %sil,%al
30493 movq %rdx,%rcx
30494 rep stosb
30495 movq %r9,%rax
30496+ pax_force_retaddr
30497 ret
30498 .Lmemset_e_e:
30499 .previous
30500@@ -120,6 +122,7 @@ ENTRY(__memset)
30501
30502 .Lende:
30503 movq %r10,%rax
30504+ pax_force_retaddr
30505 ret
30506
30507 CFI_RESTORE_STATE
30508diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30509index c9f2d9b..e7fd2c0 100644
30510--- a/arch/x86/lib/mmx_32.c
30511+++ b/arch/x86/lib/mmx_32.c
30512@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30513 {
30514 void *p;
30515 int i;
30516+ unsigned long cr0;
30517
30518 if (unlikely(in_interrupt()))
30519 return __memcpy(to, from, len);
30520@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30521 kernel_fpu_begin();
30522
30523 __asm__ __volatile__ (
30524- "1: prefetch (%0)\n" /* This set is 28 bytes */
30525- " prefetch 64(%0)\n"
30526- " prefetch 128(%0)\n"
30527- " prefetch 192(%0)\n"
30528- " prefetch 256(%0)\n"
30529+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30530+ " prefetch 64(%1)\n"
30531+ " prefetch 128(%1)\n"
30532+ " prefetch 192(%1)\n"
30533+ " prefetch 256(%1)\n"
30534 "2: \n"
30535 ".section .fixup, \"ax\"\n"
30536- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30537+ "3: \n"
30538+
30539+#ifdef CONFIG_PAX_KERNEXEC
30540+ " movl %%cr0, %0\n"
30541+ " movl %0, %%eax\n"
30542+ " andl $0xFFFEFFFF, %%eax\n"
30543+ " movl %%eax, %%cr0\n"
30544+#endif
30545+
30546+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30547+
30548+#ifdef CONFIG_PAX_KERNEXEC
30549+ " movl %0, %%cr0\n"
30550+#endif
30551+
30552 " jmp 2b\n"
30553 ".previous\n"
30554 _ASM_EXTABLE(1b, 3b)
30555- : : "r" (from));
30556+ : "=&r" (cr0) : "r" (from) : "ax");
30557
30558 for ( ; i > 5; i--) {
30559 __asm__ __volatile__ (
30560- "1: prefetch 320(%0)\n"
30561- "2: movq (%0), %%mm0\n"
30562- " movq 8(%0), %%mm1\n"
30563- " movq 16(%0), %%mm2\n"
30564- " movq 24(%0), %%mm3\n"
30565- " movq %%mm0, (%1)\n"
30566- " movq %%mm1, 8(%1)\n"
30567- " movq %%mm2, 16(%1)\n"
30568- " movq %%mm3, 24(%1)\n"
30569- " movq 32(%0), %%mm0\n"
30570- " movq 40(%0), %%mm1\n"
30571- " movq 48(%0), %%mm2\n"
30572- " movq 56(%0), %%mm3\n"
30573- " movq %%mm0, 32(%1)\n"
30574- " movq %%mm1, 40(%1)\n"
30575- " movq %%mm2, 48(%1)\n"
30576- " movq %%mm3, 56(%1)\n"
30577+ "1: prefetch 320(%1)\n"
30578+ "2: movq (%1), %%mm0\n"
30579+ " movq 8(%1), %%mm1\n"
30580+ " movq 16(%1), %%mm2\n"
30581+ " movq 24(%1), %%mm3\n"
30582+ " movq %%mm0, (%2)\n"
30583+ " movq %%mm1, 8(%2)\n"
30584+ " movq %%mm2, 16(%2)\n"
30585+ " movq %%mm3, 24(%2)\n"
30586+ " movq 32(%1), %%mm0\n"
30587+ " movq 40(%1), %%mm1\n"
30588+ " movq 48(%1), %%mm2\n"
30589+ " movq 56(%1), %%mm3\n"
30590+ " movq %%mm0, 32(%2)\n"
30591+ " movq %%mm1, 40(%2)\n"
30592+ " movq %%mm2, 48(%2)\n"
30593+ " movq %%mm3, 56(%2)\n"
30594 ".section .fixup, \"ax\"\n"
30595- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30596+ "3:\n"
30597+
30598+#ifdef CONFIG_PAX_KERNEXEC
30599+ " movl %%cr0, %0\n"
30600+ " movl %0, %%eax\n"
30601+ " andl $0xFFFEFFFF, %%eax\n"
30602+ " movl %%eax, %%cr0\n"
30603+#endif
30604+
30605+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30606+
30607+#ifdef CONFIG_PAX_KERNEXEC
30608+ " movl %0, %%cr0\n"
30609+#endif
30610+
30611 " jmp 2b\n"
30612 ".previous\n"
30613 _ASM_EXTABLE(1b, 3b)
30614- : : "r" (from), "r" (to) : "memory");
30615+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30616
30617 from += 64;
30618 to += 64;
30619@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30620 static void fast_copy_page(void *to, void *from)
30621 {
30622 int i;
30623+ unsigned long cr0;
30624
30625 kernel_fpu_begin();
30626
30627@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30628 * but that is for later. -AV
30629 */
30630 __asm__ __volatile__(
30631- "1: prefetch (%0)\n"
30632- " prefetch 64(%0)\n"
30633- " prefetch 128(%0)\n"
30634- " prefetch 192(%0)\n"
30635- " prefetch 256(%0)\n"
30636+ "1: prefetch (%1)\n"
30637+ " prefetch 64(%1)\n"
30638+ " prefetch 128(%1)\n"
30639+ " prefetch 192(%1)\n"
30640+ " prefetch 256(%1)\n"
30641 "2: \n"
30642 ".section .fixup, \"ax\"\n"
30643- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30644+ "3: \n"
30645+
30646+#ifdef CONFIG_PAX_KERNEXEC
30647+ " movl %%cr0, %0\n"
30648+ " movl %0, %%eax\n"
30649+ " andl $0xFFFEFFFF, %%eax\n"
30650+ " movl %%eax, %%cr0\n"
30651+#endif
30652+
30653+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30654+
30655+#ifdef CONFIG_PAX_KERNEXEC
30656+ " movl %0, %%cr0\n"
30657+#endif
30658+
30659 " jmp 2b\n"
30660 ".previous\n"
30661- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30662+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30663
30664 for (i = 0; i < (4096-320)/64; i++) {
30665 __asm__ __volatile__ (
30666- "1: prefetch 320(%0)\n"
30667- "2: movq (%0), %%mm0\n"
30668- " movntq %%mm0, (%1)\n"
30669- " movq 8(%0), %%mm1\n"
30670- " movntq %%mm1, 8(%1)\n"
30671- " movq 16(%0), %%mm2\n"
30672- " movntq %%mm2, 16(%1)\n"
30673- " movq 24(%0), %%mm3\n"
30674- " movntq %%mm3, 24(%1)\n"
30675- " movq 32(%0), %%mm4\n"
30676- " movntq %%mm4, 32(%1)\n"
30677- " movq 40(%0), %%mm5\n"
30678- " movntq %%mm5, 40(%1)\n"
30679- " movq 48(%0), %%mm6\n"
30680- " movntq %%mm6, 48(%1)\n"
30681- " movq 56(%0), %%mm7\n"
30682- " movntq %%mm7, 56(%1)\n"
30683+ "1: prefetch 320(%1)\n"
30684+ "2: movq (%1), %%mm0\n"
30685+ " movntq %%mm0, (%2)\n"
30686+ " movq 8(%1), %%mm1\n"
30687+ " movntq %%mm1, 8(%2)\n"
30688+ " movq 16(%1), %%mm2\n"
30689+ " movntq %%mm2, 16(%2)\n"
30690+ " movq 24(%1), %%mm3\n"
30691+ " movntq %%mm3, 24(%2)\n"
30692+ " movq 32(%1), %%mm4\n"
30693+ " movntq %%mm4, 32(%2)\n"
30694+ " movq 40(%1), %%mm5\n"
30695+ " movntq %%mm5, 40(%2)\n"
30696+ " movq 48(%1), %%mm6\n"
30697+ " movntq %%mm6, 48(%2)\n"
30698+ " movq 56(%1), %%mm7\n"
30699+ " movntq %%mm7, 56(%2)\n"
30700 ".section .fixup, \"ax\"\n"
30701- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30702+ "3:\n"
30703+
30704+#ifdef CONFIG_PAX_KERNEXEC
30705+ " movl %%cr0, %0\n"
30706+ " movl %0, %%eax\n"
30707+ " andl $0xFFFEFFFF, %%eax\n"
30708+ " movl %%eax, %%cr0\n"
30709+#endif
30710+
30711+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30712+
30713+#ifdef CONFIG_PAX_KERNEXEC
30714+ " movl %0, %%cr0\n"
30715+#endif
30716+
30717 " jmp 2b\n"
30718 ".previous\n"
30719- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30720+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30721
30722 from += 64;
30723 to += 64;
30724@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30725 static void fast_copy_page(void *to, void *from)
30726 {
30727 int i;
30728+ unsigned long cr0;
30729
30730 kernel_fpu_begin();
30731
30732 __asm__ __volatile__ (
30733- "1: prefetch (%0)\n"
30734- " prefetch 64(%0)\n"
30735- " prefetch 128(%0)\n"
30736- " prefetch 192(%0)\n"
30737- " prefetch 256(%0)\n"
30738+ "1: prefetch (%1)\n"
30739+ " prefetch 64(%1)\n"
30740+ " prefetch 128(%1)\n"
30741+ " prefetch 192(%1)\n"
30742+ " prefetch 256(%1)\n"
30743 "2: \n"
30744 ".section .fixup, \"ax\"\n"
30745- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30746+ "3: \n"
30747+
30748+#ifdef CONFIG_PAX_KERNEXEC
30749+ " movl %%cr0, %0\n"
30750+ " movl %0, %%eax\n"
30751+ " andl $0xFFFEFFFF, %%eax\n"
30752+ " movl %%eax, %%cr0\n"
30753+#endif
30754+
30755+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30756+
30757+#ifdef CONFIG_PAX_KERNEXEC
30758+ " movl %0, %%cr0\n"
30759+#endif
30760+
30761 " jmp 2b\n"
30762 ".previous\n"
30763- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30764+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30765
30766 for (i = 0; i < 4096/64; i++) {
30767 __asm__ __volatile__ (
30768- "1: prefetch 320(%0)\n"
30769- "2: movq (%0), %%mm0\n"
30770- " movq 8(%0), %%mm1\n"
30771- " movq 16(%0), %%mm2\n"
30772- " movq 24(%0), %%mm3\n"
30773- " movq %%mm0, (%1)\n"
30774- " movq %%mm1, 8(%1)\n"
30775- " movq %%mm2, 16(%1)\n"
30776- " movq %%mm3, 24(%1)\n"
30777- " movq 32(%0), %%mm0\n"
30778- " movq 40(%0), %%mm1\n"
30779- " movq 48(%0), %%mm2\n"
30780- " movq 56(%0), %%mm3\n"
30781- " movq %%mm0, 32(%1)\n"
30782- " movq %%mm1, 40(%1)\n"
30783- " movq %%mm2, 48(%1)\n"
30784- " movq %%mm3, 56(%1)\n"
30785+ "1: prefetch 320(%1)\n"
30786+ "2: movq (%1), %%mm0\n"
30787+ " movq 8(%1), %%mm1\n"
30788+ " movq 16(%1), %%mm2\n"
30789+ " movq 24(%1), %%mm3\n"
30790+ " movq %%mm0, (%2)\n"
30791+ " movq %%mm1, 8(%2)\n"
30792+ " movq %%mm2, 16(%2)\n"
30793+ " movq %%mm3, 24(%2)\n"
30794+ " movq 32(%1), %%mm0\n"
30795+ " movq 40(%1), %%mm1\n"
30796+ " movq 48(%1), %%mm2\n"
30797+ " movq 56(%1), %%mm3\n"
30798+ " movq %%mm0, 32(%2)\n"
30799+ " movq %%mm1, 40(%2)\n"
30800+ " movq %%mm2, 48(%2)\n"
30801+ " movq %%mm3, 56(%2)\n"
30802 ".section .fixup, \"ax\"\n"
30803- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30804+ "3:\n"
30805+
30806+#ifdef CONFIG_PAX_KERNEXEC
30807+ " movl %%cr0, %0\n"
30808+ " movl %0, %%eax\n"
30809+ " andl $0xFFFEFFFF, %%eax\n"
30810+ " movl %%eax, %%cr0\n"
30811+#endif
30812+
30813+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30814+
30815+#ifdef CONFIG_PAX_KERNEXEC
30816+ " movl %0, %%cr0\n"
30817+#endif
30818+
30819 " jmp 2b\n"
30820 ".previous\n"
30821 _ASM_EXTABLE(1b, 3b)
30822- : : "r" (from), "r" (to) : "memory");
30823+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30824
30825 from += 64;
30826 to += 64;
30827diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30828index f6d13ee..d789440 100644
30829--- a/arch/x86/lib/msr-reg.S
30830+++ b/arch/x86/lib/msr-reg.S
30831@@ -3,6 +3,7 @@
30832 #include <asm/dwarf2.h>
30833 #include <asm/asm.h>
30834 #include <asm/msr.h>
30835+#include <asm/alternative-asm.h>
30836
30837 #ifdef CONFIG_X86_64
30838 /*
30839@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30840 movl %edi, 28(%r10)
30841 popq_cfi %rbp
30842 popq_cfi %rbx
30843+ pax_force_retaddr
30844 ret
30845 3:
30846 CFI_RESTORE_STATE
30847diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30848index fc6ba17..14ad9a5 100644
30849--- a/arch/x86/lib/putuser.S
30850+++ b/arch/x86/lib/putuser.S
30851@@ -16,7 +16,9 @@
30852 #include <asm/errno.h>
30853 #include <asm/asm.h>
30854 #include <asm/smap.h>
30855-
30856+#include <asm/segment.h>
30857+#include <asm/pgtable.h>
30858+#include <asm/alternative-asm.h>
30859
30860 /*
30861 * __put_user_X
30862@@ -30,57 +32,125 @@
30863 * as they get called from within inline assembly.
30864 */
30865
30866-#define ENTER CFI_STARTPROC ; \
30867- GET_THREAD_INFO(%_ASM_BX)
30868-#define EXIT ASM_CLAC ; \
30869- ret ; \
30870+#define ENTER CFI_STARTPROC
30871+#define EXIT ASM_CLAC ; \
30872+ pax_force_retaddr ; \
30873+ ret ; \
30874 CFI_ENDPROC
30875
30876+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30877+#define _DEST %_ASM_CX,%_ASM_BX
30878+#else
30879+#define _DEST %_ASM_CX
30880+#endif
30881+
30882+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30883+#define __copyuser_seg gs;
30884+#else
30885+#define __copyuser_seg
30886+#endif
30887+
30888 .text
30889 ENTRY(__put_user_1)
30890 ENTER
30891+
30892+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30893+ GET_THREAD_INFO(%_ASM_BX)
30894 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30895 jae bad_put_user
30896+
30897+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30898+ mov pax_user_shadow_base,%_ASM_BX
30899+ cmp %_ASM_BX,%_ASM_CX
30900+ jb 1234f
30901+ xor %ebx,%ebx
30902+1234:
30903+#endif
30904+
30905+#endif
30906+
30907 ASM_STAC
30908-1: movb %al,(%_ASM_CX)
30909+1: __copyuser_seg movb %al,(_DEST)
30910 xor %eax,%eax
30911 EXIT
30912 ENDPROC(__put_user_1)
30913
30914 ENTRY(__put_user_2)
30915 ENTER
30916+
30917+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30918+ GET_THREAD_INFO(%_ASM_BX)
30919 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30920 sub $1,%_ASM_BX
30921 cmp %_ASM_BX,%_ASM_CX
30922 jae bad_put_user
30923+
30924+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30925+ mov pax_user_shadow_base,%_ASM_BX
30926+ cmp %_ASM_BX,%_ASM_CX
30927+ jb 1234f
30928+ xor %ebx,%ebx
30929+1234:
30930+#endif
30931+
30932+#endif
30933+
30934 ASM_STAC
30935-2: movw %ax,(%_ASM_CX)
30936+2: __copyuser_seg movw %ax,(_DEST)
30937 xor %eax,%eax
30938 EXIT
30939 ENDPROC(__put_user_2)
30940
30941 ENTRY(__put_user_4)
30942 ENTER
30943+
30944+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30945+ GET_THREAD_INFO(%_ASM_BX)
30946 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30947 sub $3,%_ASM_BX
30948 cmp %_ASM_BX,%_ASM_CX
30949 jae bad_put_user
30950+
30951+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30952+ mov pax_user_shadow_base,%_ASM_BX
30953+ cmp %_ASM_BX,%_ASM_CX
30954+ jb 1234f
30955+ xor %ebx,%ebx
30956+1234:
30957+#endif
30958+
30959+#endif
30960+
30961 ASM_STAC
30962-3: movl %eax,(%_ASM_CX)
30963+3: __copyuser_seg movl %eax,(_DEST)
30964 xor %eax,%eax
30965 EXIT
30966 ENDPROC(__put_user_4)
30967
30968 ENTRY(__put_user_8)
30969 ENTER
30970+
30971+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30972+ GET_THREAD_INFO(%_ASM_BX)
30973 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30974 sub $7,%_ASM_BX
30975 cmp %_ASM_BX,%_ASM_CX
30976 jae bad_put_user
30977+
30978+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30979+ mov pax_user_shadow_base,%_ASM_BX
30980+ cmp %_ASM_BX,%_ASM_CX
30981+ jb 1234f
30982+ xor %ebx,%ebx
30983+1234:
30984+#endif
30985+
30986+#endif
30987+
30988 ASM_STAC
30989-4: mov %_ASM_AX,(%_ASM_CX)
30990+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30991 #ifdef CONFIG_X86_32
30992-5: movl %edx,4(%_ASM_CX)
30993+5: __copyuser_seg movl %edx,4(_DEST)
30994 #endif
30995 xor %eax,%eax
30996 EXIT
30997diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30998index 5dff5f0..cadebf4 100644
30999--- a/arch/x86/lib/rwsem.S
31000+++ b/arch/x86/lib/rwsem.S
31001@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
31002 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31003 CFI_RESTORE __ASM_REG(dx)
31004 restore_common_regs
31005+ pax_force_retaddr
31006 ret
31007 CFI_ENDPROC
31008 ENDPROC(call_rwsem_down_read_failed)
31009@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31010 movq %rax,%rdi
31011 call rwsem_down_write_failed
31012 restore_common_regs
31013+ pax_force_retaddr
31014 ret
31015 CFI_ENDPROC
31016 ENDPROC(call_rwsem_down_write_failed)
31017@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31018 movq %rax,%rdi
31019 call rwsem_wake
31020 restore_common_regs
31021-1: ret
31022+1: pax_force_retaddr
31023+ ret
31024 CFI_ENDPROC
31025 ENDPROC(call_rwsem_wake)
31026
31027@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31028 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31029 CFI_RESTORE __ASM_REG(dx)
31030 restore_common_regs
31031+ pax_force_retaddr
31032 ret
31033 CFI_ENDPROC
31034 ENDPROC(call_rwsem_downgrade_wake)
31035diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31036index b30b5eb..2b57052 100644
31037--- a/arch/x86/lib/thunk_64.S
31038+++ b/arch/x86/lib/thunk_64.S
31039@@ -9,6 +9,7 @@
31040 #include <asm/dwarf2.h>
31041 #include <asm/calling.h>
31042 #include <asm/asm.h>
31043+#include <asm/alternative-asm.h>
31044
31045 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31046 .macro THUNK name, func, put_ret_addr_in_rdi=0
31047@@ -16,11 +17,11 @@
31048 \name:
31049 CFI_STARTPROC
31050
31051- /* this one pushes 9 elems, the next one would be %rIP */
31052- SAVE_ARGS
31053+ /* this one pushes 15+1 elems, the next one would be %rIP */
31054+ SAVE_ARGS 8
31055
31056 .if \put_ret_addr_in_rdi
31057- movq_cfi_restore 9*8, rdi
31058+ movq_cfi_restore RIP, rdi
31059 .endif
31060
31061 call \func
31062@@ -47,9 +48,10 @@
31063
31064 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31065 CFI_STARTPROC
31066- SAVE_ARGS
31067+ SAVE_ARGS 8
31068 restore:
31069- RESTORE_ARGS
31070+ RESTORE_ARGS 1,8
31071+ pax_force_retaddr
31072 ret
31073 CFI_ENDPROC
31074 _ASM_NOKPROBE(restore)
31075diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31076index e2f5e21..4b22130 100644
31077--- a/arch/x86/lib/usercopy_32.c
31078+++ b/arch/x86/lib/usercopy_32.c
31079@@ -42,11 +42,13 @@ do { \
31080 int __d0; \
31081 might_fault(); \
31082 __asm__ __volatile__( \
31083+ __COPYUSER_SET_ES \
31084 ASM_STAC "\n" \
31085 "0: rep; stosl\n" \
31086 " movl %2,%0\n" \
31087 "1: rep; stosb\n" \
31088 "2: " ASM_CLAC "\n" \
31089+ __COPYUSER_RESTORE_ES \
31090 ".section .fixup,\"ax\"\n" \
31091 "3: lea 0(%2,%0,4),%0\n" \
31092 " jmp 2b\n" \
31093@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31094
31095 #ifdef CONFIG_X86_INTEL_USERCOPY
31096 static unsigned long
31097-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31098+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31099 {
31100 int d0, d1;
31101 __asm__ __volatile__(
31102@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31103 " .align 2,0x90\n"
31104 "3: movl 0(%4), %%eax\n"
31105 "4: movl 4(%4), %%edx\n"
31106- "5: movl %%eax, 0(%3)\n"
31107- "6: movl %%edx, 4(%3)\n"
31108+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31109+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31110 "7: movl 8(%4), %%eax\n"
31111 "8: movl 12(%4),%%edx\n"
31112- "9: movl %%eax, 8(%3)\n"
31113- "10: movl %%edx, 12(%3)\n"
31114+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31115+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31116 "11: movl 16(%4), %%eax\n"
31117 "12: movl 20(%4), %%edx\n"
31118- "13: movl %%eax, 16(%3)\n"
31119- "14: movl %%edx, 20(%3)\n"
31120+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31121+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31122 "15: movl 24(%4), %%eax\n"
31123 "16: movl 28(%4), %%edx\n"
31124- "17: movl %%eax, 24(%3)\n"
31125- "18: movl %%edx, 28(%3)\n"
31126+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31127+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31128 "19: movl 32(%4), %%eax\n"
31129 "20: movl 36(%4), %%edx\n"
31130- "21: movl %%eax, 32(%3)\n"
31131- "22: movl %%edx, 36(%3)\n"
31132+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31133+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31134 "23: movl 40(%4), %%eax\n"
31135 "24: movl 44(%4), %%edx\n"
31136- "25: movl %%eax, 40(%3)\n"
31137- "26: movl %%edx, 44(%3)\n"
31138+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31139+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31140 "27: movl 48(%4), %%eax\n"
31141 "28: movl 52(%4), %%edx\n"
31142- "29: movl %%eax, 48(%3)\n"
31143- "30: movl %%edx, 52(%3)\n"
31144+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31145+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31146 "31: movl 56(%4), %%eax\n"
31147 "32: movl 60(%4), %%edx\n"
31148- "33: movl %%eax, 56(%3)\n"
31149- "34: movl %%edx, 60(%3)\n"
31150+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31151+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31152 " addl $-64, %0\n"
31153 " addl $64, %4\n"
31154 " addl $64, %3\n"
31155@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31156 " shrl $2, %0\n"
31157 " andl $3, %%eax\n"
31158 " cld\n"
31159+ __COPYUSER_SET_ES
31160 "99: rep; movsl\n"
31161 "36: movl %%eax, %0\n"
31162 "37: rep; movsb\n"
31163 "100:\n"
31164+ __COPYUSER_RESTORE_ES
31165+ ".section .fixup,\"ax\"\n"
31166+ "101: lea 0(%%eax,%0,4),%0\n"
31167+ " jmp 100b\n"
31168+ ".previous\n"
31169+ _ASM_EXTABLE(1b,100b)
31170+ _ASM_EXTABLE(2b,100b)
31171+ _ASM_EXTABLE(3b,100b)
31172+ _ASM_EXTABLE(4b,100b)
31173+ _ASM_EXTABLE(5b,100b)
31174+ _ASM_EXTABLE(6b,100b)
31175+ _ASM_EXTABLE(7b,100b)
31176+ _ASM_EXTABLE(8b,100b)
31177+ _ASM_EXTABLE(9b,100b)
31178+ _ASM_EXTABLE(10b,100b)
31179+ _ASM_EXTABLE(11b,100b)
31180+ _ASM_EXTABLE(12b,100b)
31181+ _ASM_EXTABLE(13b,100b)
31182+ _ASM_EXTABLE(14b,100b)
31183+ _ASM_EXTABLE(15b,100b)
31184+ _ASM_EXTABLE(16b,100b)
31185+ _ASM_EXTABLE(17b,100b)
31186+ _ASM_EXTABLE(18b,100b)
31187+ _ASM_EXTABLE(19b,100b)
31188+ _ASM_EXTABLE(20b,100b)
31189+ _ASM_EXTABLE(21b,100b)
31190+ _ASM_EXTABLE(22b,100b)
31191+ _ASM_EXTABLE(23b,100b)
31192+ _ASM_EXTABLE(24b,100b)
31193+ _ASM_EXTABLE(25b,100b)
31194+ _ASM_EXTABLE(26b,100b)
31195+ _ASM_EXTABLE(27b,100b)
31196+ _ASM_EXTABLE(28b,100b)
31197+ _ASM_EXTABLE(29b,100b)
31198+ _ASM_EXTABLE(30b,100b)
31199+ _ASM_EXTABLE(31b,100b)
31200+ _ASM_EXTABLE(32b,100b)
31201+ _ASM_EXTABLE(33b,100b)
31202+ _ASM_EXTABLE(34b,100b)
31203+ _ASM_EXTABLE(35b,100b)
31204+ _ASM_EXTABLE(36b,100b)
31205+ _ASM_EXTABLE(37b,100b)
31206+ _ASM_EXTABLE(99b,101b)
31207+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31208+ : "1"(to), "2"(from), "0"(size)
31209+ : "eax", "edx", "memory");
31210+ return size;
31211+}
31212+
31213+static unsigned long
31214+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31215+{
31216+ int d0, d1;
31217+ __asm__ __volatile__(
31218+ " .align 2,0x90\n"
31219+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31220+ " cmpl $67, %0\n"
31221+ " jbe 3f\n"
31222+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31223+ " .align 2,0x90\n"
31224+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31225+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31226+ "5: movl %%eax, 0(%3)\n"
31227+ "6: movl %%edx, 4(%3)\n"
31228+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31229+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31230+ "9: movl %%eax, 8(%3)\n"
31231+ "10: movl %%edx, 12(%3)\n"
31232+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31233+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31234+ "13: movl %%eax, 16(%3)\n"
31235+ "14: movl %%edx, 20(%3)\n"
31236+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31237+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31238+ "17: movl %%eax, 24(%3)\n"
31239+ "18: movl %%edx, 28(%3)\n"
31240+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31241+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31242+ "21: movl %%eax, 32(%3)\n"
31243+ "22: movl %%edx, 36(%3)\n"
31244+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31245+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31246+ "25: movl %%eax, 40(%3)\n"
31247+ "26: movl %%edx, 44(%3)\n"
31248+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31249+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31250+ "29: movl %%eax, 48(%3)\n"
31251+ "30: movl %%edx, 52(%3)\n"
31252+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31253+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31254+ "33: movl %%eax, 56(%3)\n"
31255+ "34: movl %%edx, 60(%3)\n"
31256+ " addl $-64, %0\n"
31257+ " addl $64, %4\n"
31258+ " addl $64, %3\n"
31259+ " cmpl $63, %0\n"
31260+ " ja 1b\n"
31261+ "35: movl %0, %%eax\n"
31262+ " shrl $2, %0\n"
31263+ " andl $3, %%eax\n"
31264+ " cld\n"
31265+ "99: rep; "__copyuser_seg" movsl\n"
31266+ "36: movl %%eax, %0\n"
31267+ "37: rep; "__copyuser_seg" movsb\n"
31268+ "100:\n"
31269 ".section .fixup,\"ax\"\n"
31270 "101: lea 0(%%eax,%0,4),%0\n"
31271 " jmp 100b\n"
31272@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31273 int d0, d1;
31274 __asm__ __volatile__(
31275 " .align 2,0x90\n"
31276- "0: movl 32(%4), %%eax\n"
31277+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31278 " cmpl $67, %0\n"
31279 " jbe 2f\n"
31280- "1: movl 64(%4), %%eax\n"
31281+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31282 " .align 2,0x90\n"
31283- "2: movl 0(%4), %%eax\n"
31284- "21: movl 4(%4), %%edx\n"
31285+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31286+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31287 " movl %%eax, 0(%3)\n"
31288 " movl %%edx, 4(%3)\n"
31289- "3: movl 8(%4), %%eax\n"
31290- "31: movl 12(%4),%%edx\n"
31291+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31292+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31293 " movl %%eax, 8(%3)\n"
31294 " movl %%edx, 12(%3)\n"
31295- "4: movl 16(%4), %%eax\n"
31296- "41: movl 20(%4), %%edx\n"
31297+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31298+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31299 " movl %%eax, 16(%3)\n"
31300 " movl %%edx, 20(%3)\n"
31301- "10: movl 24(%4), %%eax\n"
31302- "51: movl 28(%4), %%edx\n"
31303+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31304+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31305 " movl %%eax, 24(%3)\n"
31306 " movl %%edx, 28(%3)\n"
31307- "11: movl 32(%4), %%eax\n"
31308- "61: movl 36(%4), %%edx\n"
31309+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31310+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31311 " movl %%eax, 32(%3)\n"
31312 " movl %%edx, 36(%3)\n"
31313- "12: movl 40(%4), %%eax\n"
31314- "71: movl 44(%4), %%edx\n"
31315+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31316+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31317 " movl %%eax, 40(%3)\n"
31318 " movl %%edx, 44(%3)\n"
31319- "13: movl 48(%4), %%eax\n"
31320- "81: movl 52(%4), %%edx\n"
31321+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31322+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31323 " movl %%eax, 48(%3)\n"
31324 " movl %%edx, 52(%3)\n"
31325- "14: movl 56(%4), %%eax\n"
31326- "91: movl 60(%4), %%edx\n"
31327+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31328+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31329 " movl %%eax, 56(%3)\n"
31330 " movl %%edx, 60(%3)\n"
31331 " addl $-64, %0\n"
31332@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31333 " shrl $2, %0\n"
31334 " andl $3, %%eax\n"
31335 " cld\n"
31336- "6: rep; movsl\n"
31337+ "6: rep; "__copyuser_seg" movsl\n"
31338 " movl %%eax,%0\n"
31339- "7: rep; movsb\n"
31340+ "7: rep; "__copyuser_seg" movsb\n"
31341 "8:\n"
31342 ".section .fixup,\"ax\"\n"
31343 "9: lea 0(%%eax,%0,4),%0\n"
31344@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31345
31346 __asm__ __volatile__(
31347 " .align 2,0x90\n"
31348- "0: movl 32(%4), %%eax\n"
31349+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31350 " cmpl $67, %0\n"
31351 " jbe 2f\n"
31352- "1: movl 64(%4), %%eax\n"
31353+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31354 " .align 2,0x90\n"
31355- "2: movl 0(%4), %%eax\n"
31356- "21: movl 4(%4), %%edx\n"
31357+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31358+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31359 " movnti %%eax, 0(%3)\n"
31360 " movnti %%edx, 4(%3)\n"
31361- "3: movl 8(%4), %%eax\n"
31362- "31: movl 12(%4),%%edx\n"
31363+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31364+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31365 " movnti %%eax, 8(%3)\n"
31366 " movnti %%edx, 12(%3)\n"
31367- "4: movl 16(%4), %%eax\n"
31368- "41: movl 20(%4), %%edx\n"
31369+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31370+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31371 " movnti %%eax, 16(%3)\n"
31372 " movnti %%edx, 20(%3)\n"
31373- "10: movl 24(%4), %%eax\n"
31374- "51: movl 28(%4), %%edx\n"
31375+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31376+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31377 " movnti %%eax, 24(%3)\n"
31378 " movnti %%edx, 28(%3)\n"
31379- "11: movl 32(%4), %%eax\n"
31380- "61: movl 36(%4), %%edx\n"
31381+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31382+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31383 " movnti %%eax, 32(%3)\n"
31384 " movnti %%edx, 36(%3)\n"
31385- "12: movl 40(%4), %%eax\n"
31386- "71: movl 44(%4), %%edx\n"
31387+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31388+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31389 " movnti %%eax, 40(%3)\n"
31390 " movnti %%edx, 44(%3)\n"
31391- "13: movl 48(%4), %%eax\n"
31392- "81: movl 52(%4), %%edx\n"
31393+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31394+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31395 " movnti %%eax, 48(%3)\n"
31396 " movnti %%edx, 52(%3)\n"
31397- "14: movl 56(%4), %%eax\n"
31398- "91: movl 60(%4), %%edx\n"
31399+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31400+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31401 " movnti %%eax, 56(%3)\n"
31402 " movnti %%edx, 60(%3)\n"
31403 " addl $-64, %0\n"
31404@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31405 " shrl $2, %0\n"
31406 " andl $3, %%eax\n"
31407 " cld\n"
31408- "6: rep; movsl\n"
31409+ "6: rep; "__copyuser_seg" movsl\n"
31410 " movl %%eax,%0\n"
31411- "7: rep; movsb\n"
31412+ "7: rep; "__copyuser_seg" movsb\n"
31413 "8:\n"
31414 ".section .fixup,\"ax\"\n"
31415 "9: lea 0(%%eax,%0,4),%0\n"
31416@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31417
31418 __asm__ __volatile__(
31419 " .align 2,0x90\n"
31420- "0: movl 32(%4), %%eax\n"
31421+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31422 " cmpl $67, %0\n"
31423 " jbe 2f\n"
31424- "1: movl 64(%4), %%eax\n"
31425+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31426 " .align 2,0x90\n"
31427- "2: movl 0(%4), %%eax\n"
31428- "21: movl 4(%4), %%edx\n"
31429+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31430+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31431 " movnti %%eax, 0(%3)\n"
31432 " movnti %%edx, 4(%3)\n"
31433- "3: movl 8(%4), %%eax\n"
31434- "31: movl 12(%4),%%edx\n"
31435+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31436+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31437 " movnti %%eax, 8(%3)\n"
31438 " movnti %%edx, 12(%3)\n"
31439- "4: movl 16(%4), %%eax\n"
31440- "41: movl 20(%4), %%edx\n"
31441+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31442+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31443 " movnti %%eax, 16(%3)\n"
31444 " movnti %%edx, 20(%3)\n"
31445- "10: movl 24(%4), %%eax\n"
31446- "51: movl 28(%4), %%edx\n"
31447+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31448+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31449 " movnti %%eax, 24(%3)\n"
31450 " movnti %%edx, 28(%3)\n"
31451- "11: movl 32(%4), %%eax\n"
31452- "61: movl 36(%4), %%edx\n"
31453+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31454+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31455 " movnti %%eax, 32(%3)\n"
31456 " movnti %%edx, 36(%3)\n"
31457- "12: movl 40(%4), %%eax\n"
31458- "71: movl 44(%4), %%edx\n"
31459+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31460+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31461 " movnti %%eax, 40(%3)\n"
31462 " movnti %%edx, 44(%3)\n"
31463- "13: movl 48(%4), %%eax\n"
31464- "81: movl 52(%4), %%edx\n"
31465+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31466+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31467 " movnti %%eax, 48(%3)\n"
31468 " movnti %%edx, 52(%3)\n"
31469- "14: movl 56(%4), %%eax\n"
31470- "91: movl 60(%4), %%edx\n"
31471+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31472+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31473 " movnti %%eax, 56(%3)\n"
31474 " movnti %%edx, 60(%3)\n"
31475 " addl $-64, %0\n"
31476@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31477 " shrl $2, %0\n"
31478 " andl $3, %%eax\n"
31479 " cld\n"
31480- "6: rep; movsl\n"
31481+ "6: rep; "__copyuser_seg" movsl\n"
31482 " movl %%eax,%0\n"
31483- "7: rep; movsb\n"
31484+ "7: rep; "__copyuser_seg" movsb\n"
31485 "8:\n"
31486 ".section .fixup,\"ax\"\n"
31487 "9: lea 0(%%eax,%0,4),%0\n"
31488@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31489 */
31490 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31491 unsigned long size);
31492-unsigned long __copy_user_intel(void __user *to, const void *from,
31493+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31494+ unsigned long size);
31495+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31496 unsigned long size);
31497 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31498 const void __user *from, unsigned long size);
31499 #endif /* CONFIG_X86_INTEL_USERCOPY */
31500
31501 /* Generic arbitrary sized copy. */
31502-#define __copy_user(to, from, size) \
31503+#define __copy_user(to, from, size, prefix, set, restore) \
31504 do { \
31505 int __d0, __d1, __d2; \
31506 __asm__ __volatile__( \
31507+ set \
31508 " cmp $7,%0\n" \
31509 " jbe 1f\n" \
31510 " movl %1,%0\n" \
31511 " negl %0\n" \
31512 " andl $7,%0\n" \
31513 " subl %0,%3\n" \
31514- "4: rep; movsb\n" \
31515+ "4: rep; "prefix"movsb\n" \
31516 " movl %3,%0\n" \
31517 " shrl $2,%0\n" \
31518 " andl $3,%3\n" \
31519 " .align 2,0x90\n" \
31520- "0: rep; movsl\n" \
31521+ "0: rep; "prefix"movsl\n" \
31522 " movl %3,%0\n" \
31523- "1: rep; movsb\n" \
31524+ "1: rep; "prefix"movsb\n" \
31525 "2:\n" \
31526+ restore \
31527 ".section .fixup,\"ax\"\n" \
31528 "5: addl %3,%0\n" \
31529 " jmp 2b\n" \
31530@@ -538,14 +650,14 @@ do { \
31531 " negl %0\n" \
31532 " andl $7,%0\n" \
31533 " subl %0,%3\n" \
31534- "4: rep; movsb\n" \
31535+ "4: rep; "__copyuser_seg"movsb\n" \
31536 " movl %3,%0\n" \
31537 " shrl $2,%0\n" \
31538 " andl $3,%3\n" \
31539 " .align 2,0x90\n" \
31540- "0: rep; movsl\n" \
31541+ "0: rep; "__copyuser_seg"movsl\n" \
31542 " movl %3,%0\n" \
31543- "1: rep; movsb\n" \
31544+ "1: rep; "__copyuser_seg"movsb\n" \
31545 "2:\n" \
31546 ".section .fixup,\"ax\"\n" \
31547 "5: addl %3,%0\n" \
31548@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31549 {
31550 stac();
31551 if (movsl_is_ok(to, from, n))
31552- __copy_user(to, from, n);
31553+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31554 else
31555- n = __copy_user_intel(to, from, n);
31556+ n = __generic_copy_to_user_intel(to, from, n);
31557 clac();
31558 return n;
31559 }
31560@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31561 {
31562 stac();
31563 if (movsl_is_ok(to, from, n))
31564- __copy_user(to, from, n);
31565+ __copy_user(to, from, n, __copyuser_seg, "", "");
31566 else
31567- n = __copy_user_intel((void __user *)to,
31568- (const void *)from, n);
31569+ n = __generic_copy_from_user_intel(to, from, n);
31570 clac();
31571 return n;
31572 }
31573@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31574 if (n > 64 && cpu_has_xmm2)
31575 n = __copy_user_intel_nocache(to, from, n);
31576 else
31577- __copy_user(to, from, n);
31578+ __copy_user(to, from, n, __copyuser_seg, "", "");
31579 #else
31580- __copy_user(to, from, n);
31581+ __copy_user(to, from, n, __copyuser_seg, "", "");
31582 #endif
31583 clac();
31584 return n;
31585 }
31586 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31587
31588-/**
31589- * copy_to_user: - Copy a block of data into user space.
31590- * @to: Destination address, in user space.
31591- * @from: Source address, in kernel space.
31592- * @n: Number of bytes to copy.
31593- *
31594- * Context: User context only. This function may sleep.
31595- *
31596- * Copy data from kernel space to user space.
31597- *
31598- * Returns number of bytes that could not be copied.
31599- * On success, this will be zero.
31600- */
31601-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31602+#ifdef CONFIG_PAX_MEMORY_UDEREF
31603+void __set_fs(mm_segment_t x)
31604 {
31605- if (access_ok(VERIFY_WRITE, to, n))
31606- n = __copy_to_user(to, from, n);
31607- return n;
31608+ switch (x.seg) {
31609+ case 0:
31610+ loadsegment(gs, 0);
31611+ break;
31612+ case TASK_SIZE_MAX:
31613+ loadsegment(gs, __USER_DS);
31614+ break;
31615+ case -1UL:
31616+ loadsegment(gs, __KERNEL_DS);
31617+ break;
31618+ default:
31619+ BUG();
31620+ }
31621 }
31622-EXPORT_SYMBOL(_copy_to_user);
31623+EXPORT_SYMBOL(__set_fs);
31624
31625-/**
31626- * copy_from_user: - Copy a block of data from user space.
31627- * @to: Destination address, in kernel space.
31628- * @from: Source address, in user space.
31629- * @n: Number of bytes to copy.
31630- *
31631- * Context: User context only. This function may sleep.
31632- *
31633- * Copy data from user space to kernel space.
31634- *
31635- * Returns number of bytes that could not be copied.
31636- * On success, this will be zero.
31637- *
31638- * If some data could not be copied, this function will pad the copied
31639- * data to the requested size using zero bytes.
31640- */
31641-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31642+void set_fs(mm_segment_t x)
31643 {
31644- if (access_ok(VERIFY_READ, from, n))
31645- n = __copy_from_user(to, from, n);
31646- else
31647- memset(to, 0, n);
31648- return n;
31649+ current_thread_info()->addr_limit = x;
31650+ __set_fs(x);
31651 }
31652-EXPORT_SYMBOL(_copy_from_user);
31653+EXPORT_SYMBOL(set_fs);
31654+#endif
31655diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31656index 0a42327..7a82465 100644
31657--- a/arch/x86/lib/usercopy_64.c
31658+++ b/arch/x86/lib/usercopy_64.c
31659@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31660 might_fault();
31661 /* no memory constraint because it doesn't change any memory gcc knows
31662 about */
31663+ pax_open_userland();
31664 stac();
31665 asm volatile(
31666 " testq %[size8],%[size8]\n"
31667@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31668 _ASM_EXTABLE(0b,3b)
31669 _ASM_EXTABLE(1b,2b)
31670 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31671- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31672+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31673 [zero] "r" (0UL), [eight] "r" (8UL));
31674 clac();
31675+ pax_close_userland();
31676 return size;
31677 }
31678 EXPORT_SYMBOL(__clear_user);
31679@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31680 }
31681 EXPORT_SYMBOL(clear_user);
31682
31683-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31684+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31685 {
31686- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31687- return copy_user_generic((__force void *)to, (__force void *)from, len);
31688- }
31689- return len;
31690+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31691+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31692+ return len;
31693 }
31694 EXPORT_SYMBOL(copy_in_user);
31695
31696@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31697 * it is not necessary to optimize tail handling.
31698 */
31699 __visible unsigned long
31700-copy_user_handle_tail(char *to, char *from, unsigned len)
31701+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31702 {
31703+ clac();
31704+ pax_close_userland();
31705 for (; len; --len, to++) {
31706 char c;
31707
31708@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31709 if (__put_user_nocheck(c, to, sizeof(char)))
31710 break;
31711 }
31712- clac();
31713
31714 /* If the destination is a kernel buffer, we always clear the end */
31715- if (!__addr_ok(to))
31716+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31717 memset(to, 0, len);
31718 return len;
31719 }
31720diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31721index c4cc740..60a7362 100644
31722--- a/arch/x86/mm/Makefile
31723+++ b/arch/x86/mm/Makefile
31724@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31725 obj-$(CONFIG_MEMTEST) += memtest.o
31726
31727 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31728+
31729+quote:="
31730+obj-$(CONFIG_X86_64) += uderef_64.o
31731+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31732diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31733index 903ec1e..c4166b2 100644
31734--- a/arch/x86/mm/extable.c
31735+++ b/arch/x86/mm/extable.c
31736@@ -6,12 +6,24 @@
31737 static inline unsigned long
31738 ex_insn_addr(const struct exception_table_entry *x)
31739 {
31740- return (unsigned long)&x->insn + x->insn;
31741+ unsigned long reloc = 0;
31742+
31743+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31744+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31745+#endif
31746+
31747+ return (unsigned long)&x->insn + x->insn + reloc;
31748 }
31749 static inline unsigned long
31750 ex_fixup_addr(const struct exception_table_entry *x)
31751 {
31752- return (unsigned long)&x->fixup + x->fixup;
31753+ unsigned long reloc = 0;
31754+
31755+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31756+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31757+#endif
31758+
31759+ return (unsigned long)&x->fixup + x->fixup + reloc;
31760 }
31761
31762 int fixup_exception(struct pt_regs *regs)
31763@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31764 unsigned long new_ip;
31765
31766 #ifdef CONFIG_PNPBIOS
31767- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31768+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31769 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31770 extern u32 pnp_bios_is_utter_crap;
31771 pnp_bios_is_utter_crap = 1;
31772@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31773 i += 4;
31774 p->fixup -= i;
31775 i += 4;
31776+
31777+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31778+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31779+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31780+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31781+#endif
31782+
31783 }
31784 }
31785
31786diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31787index ede025f..380466b 100644
31788--- a/arch/x86/mm/fault.c
31789+++ b/arch/x86/mm/fault.c
31790@@ -13,12 +13,19 @@
31791 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31792 #include <linux/prefetch.h> /* prefetchw */
31793 #include <linux/context_tracking.h> /* exception_enter(), ... */
31794+#include <linux/unistd.h>
31795+#include <linux/compiler.h>
31796
31797 #include <asm/traps.h> /* dotraplinkage, ... */
31798 #include <asm/pgalloc.h> /* pgd_*(), ... */
31799 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31800 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31801 #include <asm/vsyscall.h> /* emulate_vsyscall */
31802+#include <asm/tlbflush.h>
31803+
31804+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31805+#include <asm/stacktrace.h>
31806+#endif
31807
31808 #define CREATE_TRACE_POINTS
31809 #include <asm/trace/exceptions.h>
31810@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31811 int ret = 0;
31812
31813 /* kprobe_running() needs smp_processor_id() */
31814- if (kprobes_built_in() && !user_mode_vm(regs)) {
31815+ if (kprobes_built_in() && !user_mode(regs)) {
31816 preempt_disable();
31817 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31818 ret = 1;
31819@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31820 return !instr_lo || (instr_lo>>1) == 1;
31821 case 0x00:
31822 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31823- if (probe_kernel_address(instr, opcode))
31824+ if (user_mode(regs)) {
31825+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31826+ return 0;
31827+ } else if (probe_kernel_address(instr, opcode))
31828 return 0;
31829
31830 *prefetch = (instr_lo == 0xF) &&
31831@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31832 while (instr < max_instr) {
31833 unsigned char opcode;
31834
31835- if (probe_kernel_address(instr, opcode))
31836+ if (user_mode(regs)) {
31837+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31838+ break;
31839+ } else if (probe_kernel_address(instr, opcode))
31840 break;
31841
31842 instr++;
31843@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31844 force_sig_info(si_signo, &info, tsk);
31845 }
31846
31847+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31848+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31849+#endif
31850+
31851+#ifdef CONFIG_PAX_EMUTRAMP
31852+static int pax_handle_fetch_fault(struct pt_regs *regs);
31853+#endif
31854+
31855+#ifdef CONFIG_PAX_PAGEEXEC
31856+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31857+{
31858+ pgd_t *pgd;
31859+ pud_t *pud;
31860+ pmd_t *pmd;
31861+
31862+ pgd = pgd_offset(mm, address);
31863+ if (!pgd_present(*pgd))
31864+ return NULL;
31865+ pud = pud_offset(pgd, address);
31866+ if (!pud_present(*pud))
31867+ return NULL;
31868+ pmd = pmd_offset(pud, address);
31869+ if (!pmd_present(*pmd))
31870+ return NULL;
31871+ return pmd;
31872+}
31873+#endif
31874+
31875 DEFINE_SPINLOCK(pgd_lock);
31876 LIST_HEAD(pgd_list);
31877
31878@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31879 for (address = VMALLOC_START & PMD_MASK;
31880 address >= TASK_SIZE && address < FIXADDR_TOP;
31881 address += PMD_SIZE) {
31882+
31883+#ifdef CONFIG_PAX_PER_CPU_PGD
31884+ unsigned long cpu;
31885+#else
31886 struct page *page;
31887+#endif
31888
31889 spin_lock(&pgd_lock);
31890+
31891+#ifdef CONFIG_PAX_PER_CPU_PGD
31892+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31893+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31894+ pmd_t *ret;
31895+
31896+ ret = vmalloc_sync_one(pgd, address);
31897+ if (!ret)
31898+ break;
31899+ pgd = get_cpu_pgd(cpu, kernel);
31900+#else
31901 list_for_each_entry(page, &pgd_list, lru) {
31902+ pgd_t *pgd;
31903 spinlock_t *pgt_lock;
31904 pmd_t *ret;
31905
31906@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31907 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31908
31909 spin_lock(pgt_lock);
31910- ret = vmalloc_sync_one(page_address(page), address);
31911+ pgd = page_address(page);
31912+#endif
31913+
31914+ ret = vmalloc_sync_one(pgd, address);
31915+
31916+#ifndef CONFIG_PAX_PER_CPU_PGD
31917 spin_unlock(pgt_lock);
31918+#endif
31919
31920 if (!ret)
31921 break;
31922@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31923 * an interrupt in the middle of a task switch..
31924 */
31925 pgd_paddr = read_cr3();
31926+
31927+#ifdef CONFIG_PAX_PER_CPU_PGD
31928+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31929+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31930+#endif
31931+
31932 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31933 if (!pmd_k)
31934 return -1;
31935@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31936 * happen within a race in page table update. In the later
31937 * case just flush:
31938 */
31939- pgd = pgd_offset(current->active_mm, address);
31940+
31941 pgd_ref = pgd_offset_k(address);
31942 if (pgd_none(*pgd_ref))
31943 return -1;
31944
31945+#ifdef CONFIG_PAX_PER_CPU_PGD
31946+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31947+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31948+ if (pgd_none(*pgd)) {
31949+ set_pgd(pgd, *pgd_ref);
31950+ arch_flush_lazy_mmu_mode();
31951+ } else {
31952+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31953+ }
31954+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31955+#else
31956+ pgd = pgd_offset(current->active_mm, address);
31957+#endif
31958+
31959 if (pgd_none(*pgd)) {
31960 set_pgd(pgd, *pgd_ref);
31961 arch_flush_lazy_mmu_mode();
31962@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31963 static int is_errata100(struct pt_regs *regs, unsigned long address)
31964 {
31965 #ifdef CONFIG_X86_64
31966- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31967+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31968 return 1;
31969 #endif
31970 return 0;
31971@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31972 }
31973
31974 static const char nx_warning[] = KERN_CRIT
31975-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31976+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31977 static const char smep_warning[] = KERN_CRIT
31978-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31979+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31980
31981 static void
31982 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31983@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31984 if (!oops_may_print())
31985 return;
31986
31987- if (error_code & PF_INSTR) {
31988+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31989 unsigned int level;
31990 pgd_t *pgd;
31991 pte_t *pte;
31992@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31993 pte = lookup_address_in_pgd(pgd, address, &level);
31994
31995 if (pte && pte_present(*pte) && !pte_exec(*pte))
31996- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31997+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31998 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31999 (pgd_flags(*pgd) & _PAGE_USER) &&
32000 (__read_cr4() & X86_CR4_SMEP))
32001- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32002+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32003 }
32004
32005+#ifdef CONFIG_PAX_KERNEXEC
32006+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32007+ if (current->signal->curr_ip)
32008+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32009+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32010+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32011+ else
32012+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32013+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32014+ }
32015+#endif
32016+
32017 printk(KERN_ALERT "BUG: unable to handle kernel ");
32018 if (address < PAGE_SIZE)
32019 printk(KERN_CONT "NULL pointer dereference");
32020@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32021 return;
32022 }
32023 #endif
32024+
32025+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32026+ if (pax_is_fetch_fault(regs, error_code, address)) {
32027+
32028+#ifdef CONFIG_PAX_EMUTRAMP
32029+ switch (pax_handle_fetch_fault(regs)) {
32030+ case 2:
32031+ return;
32032+ }
32033+#endif
32034+
32035+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32036+ do_group_exit(SIGKILL);
32037+ }
32038+#endif
32039+
32040 /* Kernel addresses are always protection faults: */
32041 if (address >= TASK_SIZE)
32042 error_code |= PF_PROT;
32043@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32044 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32045 printk(KERN_ERR
32046 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32047- tsk->comm, tsk->pid, address);
32048+ tsk->comm, task_pid_nr(tsk), address);
32049 code = BUS_MCEERR_AR;
32050 }
32051 #endif
32052@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32053 return 1;
32054 }
32055
32056+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32057+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32058+{
32059+ pte_t *pte;
32060+ pmd_t *pmd;
32061+ spinlock_t *ptl;
32062+ unsigned char pte_mask;
32063+
32064+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32065+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32066+ return 0;
32067+
32068+ /* PaX: it's our fault, let's handle it if we can */
32069+
32070+ /* PaX: take a look at read faults before acquiring any locks */
32071+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32072+ /* instruction fetch attempt from a protected page in user mode */
32073+ up_read(&mm->mmap_sem);
32074+
32075+#ifdef CONFIG_PAX_EMUTRAMP
32076+ switch (pax_handle_fetch_fault(regs)) {
32077+ case 2:
32078+ return 1;
32079+ }
32080+#endif
32081+
32082+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32083+ do_group_exit(SIGKILL);
32084+ }
32085+
32086+ pmd = pax_get_pmd(mm, address);
32087+ if (unlikely(!pmd))
32088+ return 0;
32089+
32090+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32091+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32092+ pte_unmap_unlock(pte, ptl);
32093+ return 0;
32094+ }
32095+
32096+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32097+ /* write attempt to a protected page in user mode */
32098+ pte_unmap_unlock(pte, ptl);
32099+ return 0;
32100+ }
32101+
32102+#ifdef CONFIG_SMP
32103+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32104+#else
32105+ if (likely(address > get_limit(regs->cs)))
32106+#endif
32107+ {
32108+ set_pte(pte, pte_mkread(*pte));
32109+ __flush_tlb_one(address);
32110+ pte_unmap_unlock(pte, ptl);
32111+ up_read(&mm->mmap_sem);
32112+ return 1;
32113+ }
32114+
32115+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32116+
32117+ /*
32118+ * PaX: fill DTLB with user rights and retry
32119+ */
32120+ __asm__ __volatile__ (
32121+ "orb %2,(%1)\n"
32122+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32123+/*
32124+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32125+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32126+ * page fault when examined during a TLB load attempt. this is true not only
32127+ * for PTEs holding a non-present entry but also present entries that will
32128+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32129+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32130+ * for our target pages since their PTEs are simply not in the TLBs at all.
32131+
32132+ * the best thing in omitting it is that we gain around 15-20% speed in the
32133+ * fast path of the page fault handler and can get rid of tracing since we
32134+ * can no longer flush unintended entries.
32135+ */
32136+ "invlpg (%0)\n"
32137+#endif
32138+ __copyuser_seg"testb $0,(%0)\n"
32139+ "xorb %3,(%1)\n"
32140+ :
32141+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32142+ : "memory", "cc");
32143+ pte_unmap_unlock(pte, ptl);
32144+ up_read(&mm->mmap_sem);
32145+ return 1;
32146+}
32147+#endif
32148+
32149 /*
32150 * Handle a spurious fault caused by a stale TLB entry.
32151 *
32152@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32153 static inline int
32154 access_error(unsigned long error_code, struct vm_area_struct *vma)
32155 {
32156+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32157+ return 1;
32158+
32159 if (error_code & PF_WRITE) {
32160 /* write, present and write, not present: */
32161 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32162@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32163 if (error_code & PF_USER)
32164 return false;
32165
32166- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32167+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32168 return false;
32169
32170 return true;
32171@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32172 tsk = current;
32173 mm = tsk->mm;
32174
32175+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32176+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32177+ if (!search_exception_tables(regs->ip)) {
32178+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32179+ bad_area_nosemaphore(regs, error_code, address);
32180+ return;
32181+ }
32182+ if (address < pax_user_shadow_base) {
32183+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32184+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32185+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32186+ } else
32187+ address -= pax_user_shadow_base;
32188+ }
32189+#endif
32190+
32191 /*
32192 * Detect and handle instructions that would cause a page fault for
32193 * both a tracked kernel page and a userspace page.
32194@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32195 * User-mode registers count as a user access even for any
32196 * potential system fault or CPU buglet:
32197 */
32198- if (user_mode_vm(regs)) {
32199+ if (user_mode(regs)) {
32200 local_irq_enable();
32201 error_code |= PF_USER;
32202 flags |= FAULT_FLAG_USER;
32203@@ -1187,6 +1411,11 @@ retry:
32204 might_sleep();
32205 }
32206
32207+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32208+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32209+ return;
32210+#endif
32211+
32212 vma = find_vma(mm, address);
32213 if (unlikely(!vma)) {
32214 bad_area(regs, error_code, address);
32215@@ -1198,18 +1427,24 @@ retry:
32216 bad_area(regs, error_code, address);
32217 return;
32218 }
32219- if (error_code & PF_USER) {
32220- /*
32221- * Accessing the stack below %sp is always a bug.
32222- * The large cushion allows instructions like enter
32223- * and pusha to work. ("enter $65535, $31" pushes
32224- * 32 pointers and then decrements %sp by 65535.)
32225- */
32226- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32227- bad_area(regs, error_code, address);
32228- return;
32229- }
32230+ /*
32231+ * Accessing the stack below %sp is always a bug.
32232+ * The large cushion allows instructions like enter
32233+ * and pusha to work. ("enter $65535, $31" pushes
32234+ * 32 pointers and then decrements %sp by 65535.)
32235+ */
32236+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32237+ bad_area(regs, error_code, address);
32238+ return;
32239 }
32240+
32241+#ifdef CONFIG_PAX_SEGMEXEC
32242+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32243+ bad_area(regs, error_code, address);
32244+ return;
32245+ }
32246+#endif
32247+
32248 if (unlikely(expand_stack(vma, address))) {
32249 bad_area(regs, error_code, address);
32250 return;
32251@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32252 }
32253 NOKPROBE_SYMBOL(trace_do_page_fault);
32254 #endif /* CONFIG_TRACING */
32255+
32256+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32257+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32258+{
32259+ struct mm_struct *mm = current->mm;
32260+ unsigned long ip = regs->ip;
32261+
32262+ if (v8086_mode(regs))
32263+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32264+
32265+#ifdef CONFIG_PAX_PAGEEXEC
32266+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32267+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32268+ return true;
32269+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32270+ return true;
32271+ return false;
32272+ }
32273+#endif
32274+
32275+#ifdef CONFIG_PAX_SEGMEXEC
32276+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32277+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32278+ return true;
32279+ return false;
32280+ }
32281+#endif
32282+
32283+ return false;
32284+}
32285+#endif
32286+
32287+#ifdef CONFIG_PAX_EMUTRAMP
32288+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32289+{
32290+ int err;
32291+
32292+ do { /* PaX: libffi trampoline emulation */
32293+ unsigned char mov, jmp;
32294+ unsigned int addr1, addr2;
32295+
32296+#ifdef CONFIG_X86_64
32297+ if ((regs->ip + 9) >> 32)
32298+ break;
32299+#endif
32300+
32301+ err = get_user(mov, (unsigned char __user *)regs->ip);
32302+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32303+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32304+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32305+
32306+ if (err)
32307+ break;
32308+
32309+ if (mov == 0xB8 && jmp == 0xE9) {
32310+ regs->ax = addr1;
32311+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32312+ return 2;
32313+ }
32314+ } while (0);
32315+
32316+ do { /* PaX: gcc trampoline emulation #1 */
32317+ unsigned char mov1, mov2;
32318+ unsigned short jmp;
32319+ unsigned int addr1, addr2;
32320+
32321+#ifdef CONFIG_X86_64
32322+ if ((regs->ip + 11) >> 32)
32323+ break;
32324+#endif
32325+
32326+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32327+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32328+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32329+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32330+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32331+
32332+ if (err)
32333+ break;
32334+
32335+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32336+ regs->cx = addr1;
32337+ regs->ax = addr2;
32338+ regs->ip = addr2;
32339+ return 2;
32340+ }
32341+ } while (0);
32342+
32343+ do { /* PaX: gcc trampoline emulation #2 */
32344+ unsigned char mov, jmp;
32345+ unsigned int addr1, addr2;
32346+
32347+#ifdef CONFIG_X86_64
32348+ if ((regs->ip + 9) >> 32)
32349+ break;
32350+#endif
32351+
32352+ err = get_user(mov, (unsigned char __user *)regs->ip);
32353+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32354+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32355+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32356+
32357+ if (err)
32358+ break;
32359+
32360+ if (mov == 0xB9 && jmp == 0xE9) {
32361+ regs->cx = addr1;
32362+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32363+ return 2;
32364+ }
32365+ } while (0);
32366+
32367+ return 1; /* PaX in action */
32368+}
32369+
32370+#ifdef CONFIG_X86_64
32371+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32372+{
32373+ int err;
32374+
32375+ do { /* PaX: libffi trampoline emulation */
32376+ unsigned short mov1, mov2, jmp1;
32377+ unsigned char stcclc, jmp2;
32378+ unsigned long addr1, addr2;
32379+
32380+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32381+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32382+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32383+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32384+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32385+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32386+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32387+
32388+ if (err)
32389+ break;
32390+
32391+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32392+ regs->r11 = addr1;
32393+ regs->r10 = addr2;
32394+ if (stcclc == 0xF8)
32395+ regs->flags &= ~X86_EFLAGS_CF;
32396+ else
32397+ regs->flags |= X86_EFLAGS_CF;
32398+ regs->ip = addr1;
32399+ return 2;
32400+ }
32401+ } while (0);
32402+
32403+ do { /* PaX: gcc trampoline emulation #1 */
32404+ unsigned short mov1, mov2, jmp1;
32405+ unsigned char jmp2;
32406+ unsigned int addr1;
32407+ unsigned long addr2;
32408+
32409+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32410+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32411+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32412+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32413+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32414+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32415+
32416+ if (err)
32417+ break;
32418+
32419+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32420+ regs->r11 = addr1;
32421+ regs->r10 = addr2;
32422+ regs->ip = addr1;
32423+ return 2;
32424+ }
32425+ } while (0);
32426+
32427+ do { /* PaX: gcc trampoline emulation #2 */
32428+ unsigned short mov1, mov2, jmp1;
32429+ unsigned char jmp2;
32430+ unsigned long addr1, addr2;
32431+
32432+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32433+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32434+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32435+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32436+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32437+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32438+
32439+ if (err)
32440+ break;
32441+
32442+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32443+ regs->r11 = addr1;
32444+ regs->r10 = addr2;
32445+ regs->ip = addr1;
32446+ return 2;
32447+ }
32448+ } while (0);
32449+
32450+ return 1; /* PaX in action */
32451+}
32452+#endif
32453+
32454+/*
32455+ * PaX: decide what to do with offenders (regs->ip = fault address)
32456+ *
32457+ * returns 1 when task should be killed
32458+ * 2 when gcc trampoline was detected
32459+ */
32460+static int pax_handle_fetch_fault(struct pt_regs *regs)
32461+{
32462+ if (v8086_mode(regs))
32463+ return 1;
32464+
32465+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32466+ return 1;
32467+
32468+#ifdef CONFIG_X86_32
32469+ return pax_handle_fetch_fault_32(regs);
32470+#else
32471+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32472+ return pax_handle_fetch_fault_32(regs);
32473+ else
32474+ return pax_handle_fetch_fault_64(regs);
32475+#endif
32476+}
32477+#endif
32478+
32479+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32480+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32481+{
32482+ long i;
32483+
32484+ printk(KERN_ERR "PAX: bytes at PC: ");
32485+ for (i = 0; i < 20; i++) {
32486+ unsigned char c;
32487+ if (get_user(c, (unsigned char __force_user *)pc+i))
32488+ printk(KERN_CONT "?? ");
32489+ else
32490+ printk(KERN_CONT "%02x ", c);
32491+ }
32492+ printk("\n");
32493+
32494+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32495+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32496+ unsigned long c;
32497+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32498+#ifdef CONFIG_X86_32
32499+ printk(KERN_CONT "???????? ");
32500+#else
32501+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32502+ printk(KERN_CONT "???????? ???????? ");
32503+ else
32504+ printk(KERN_CONT "???????????????? ");
32505+#endif
32506+ } else {
32507+#ifdef CONFIG_X86_64
32508+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32509+ printk(KERN_CONT "%08x ", (unsigned int)c);
32510+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32511+ } else
32512+#endif
32513+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32514+ }
32515+ }
32516+ printk("\n");
32517+}
32518+#endif
32519+
32520+/**
32521+ * probe_kernel_write(): safely attempt to write to a location
32522+ * @dst: address to write to
32523+ * @src: pointer to the data that shall be written
32524+ * @size: size of the data chunk
32525+ *
32526+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32527+ * happens, handle that and return -EFAULT.
32528+ */
32529+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32530+{
32531+ long ret;
32532+ mm_segment_t old_fs = get_fs();
32533+
32534+ set_fs(KERNEL_DS);
32535+ pagefault_disable();
32536+ pax_open_kernel();
32537+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32538+ pax_close_kernel();
32539+ pagefault_enable();
32540+ set_fs(old_fs);
32541+
32542+ return ret ? -EFAULT : 0;
32543+}
32544diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32545index 81bf3d2..7ef25c2 100644
32546--- a/arch/x86/mm/gup.c
32547+++ b/arch/x86/mm/gup.c
32548@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32549 addr = start;
32550 len = (unsigned long) nr_pages << PAGE_SHIFT;
32551 end = start + len;
32552- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32553+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32554 (void __user *)start, len)))
32555 return 0;
32556
32557@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32558 goto slow_irqon;
32559 #endif
32560
32561+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32562+ (void __user *)start, len)))
32563+ return 0;
32564+
32565 /*
32566 * XXX: batch / limit 'nr', to avoid large irq off latency
32567 * needs some instrumenting to determine the common sizes used by
32568diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32569index 4500142..53a363c 100644
32570--- a/arch/x86/mm/highmem_32.c
32571+++ b/arch/x86/mm/highmem_32.c
32572@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32573 idx = type + KM_TYPE_NR*smp_processor_id();
32574 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32575 BUG_ON(!pte_none(*(kmap_pte-idx)));
32576+
32577+ pax_open_kernel();
32578 set_pte(kmap_pte-idx, mk_pte(page, prot));
32579+ pax_close_kernel();
32580+
32581 arch_flush_lazy_mmu_mode();
32582
32583 return (void *)vaddr;
32584diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32585index 42982b2..7168fc3 100644
32586--- a/arch/x86/mm/hugetlbpage.c
32587+++ b/arch/x86/mm/hugetlbpage.c
32588@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32589 #ifdef CONFIG_HUGETLB_PAGE
32590 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32591 unsigned long addr, unsigned long len,
32592- unsigned long pgoff, unsigned long flags)
32593+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32594 {
32595 struct hstate *h = hstate_file(file);
32596 struct vm_unmapped_area_info info;
32597-
32598+
32599 info.flags = 0;
32600 info.length = len;
32601 info.low_limit = current->mm->mmap_legacy_base;
32602 info.high_limit = TASK_SIZE;
32603 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32604 info.align_offset = 0;
32605+ info.threadstack_offset = offset;
32606 return vm_unmapped_area(&info);
32607 }
32608
32609 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32610 unsigned long addr0, unsigned long len,
32611- unsigned long pgoff, unsigned long flags)
32612+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32613 {
32614 struct hstate *h = hstate_file(file);
32615 struct vm_unmapped_area_info info;
32616@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32617 info.high_limit = current->mm->mmap_base;
32618 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32619 info.align_offset = 0;
32620+ info.threadstack_offset = offset;
32621 addr = vm_unmapped_area(&info);
32622
32623 /*
32624@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32625 VM_BUG_ON(addr != -ENOMEM);
32626 info.flags = 0;
32627 info.low_limit = TASK_UNMAPPED_BASE;
32628+
32629+#ifdef CONFIG_PAX_RANDMMAP
32630+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32631+ info.low_limit += current->mm->delta_mmap;
32632+#endif
32633+
32634 info.high_limit = TASK_SIZE;
32635 addr = vm_unmapped_area(&info);
32636 }
32637@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32638 struct hstate *h = hstate_file(file);
32639 struct mm_struct *mm = current->mm;
32640 struct vm_area_struct *vma;
32641+ unsigned long pax_task_size = TASK_SIZE;
32642+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32643
32644 if (len & ~huge_page_mask(h))
32645 return -EINVAL;
32646- if (len > TASK_SIZE)
32647+
32648+#ifdef CONFIG_PAX_SEGMEXEC
32649+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32650+ pax_task_size = SEGMEXEC_TASK_SIZE;
32651+#endif
32652+
32653+ pax_task_size -= PAGE_SIZE;
32654+
32655+ if (len > pax_task_size)
32656 return -ENOMEM;
32657
32658 if (flags & MAP_FIXED) {
32659@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32660 return addr;
32661 }
32662
32663+#ifdef CONFIG_PAX_RANDMMAP
32664+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32665+#endif
32666+
32667 if (addr) {
32668 addr = ALIGN(addr, huge_page_size(h));
32669 vma = find_vma(mm, addr);
32670- if (TASK_SIZE - len >= addr &&
32671- (!vma || addr + len <= vma->vm_start))
32672+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32673 return addr;
32674 }
32675 if (mm->get_unmapped_area == arch_get_unmapped_area)
32676 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32677- pgoff, flags);
32678+ pgoff, flags, offset);
32679 else
32680 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32681- pgoff, flags);
32682+ pgoff, flags, offset);
32683 }
32684 #endif /* CONFIG_HUGETLB_PAGE */
32685
32686diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32687index a110efc..a31a18f 100644
32688--- a/arch/x86/mm/init.c
32689+++ b/arch/x86/mm/init.c
32690@@ -4,6 +4,7 @@
32691 #include <linux/swap.h>
32692 #include <linux/memblock.h>
32693 #include <linux/bootmem.h> /* for max_low_pfn */
32694+#include <linux/tboot.h>
32695
32696 #include <asm/cacheflush.h>
32697 #include <asm/e820.h>
32698@@ -17,6 +18,8 @@
32699 #include <asm/proto.h>
32700 #include <asm/dma.h> /* for MAX_DMA_PFN */
32701 #include <asm/microcode.h>
32702+#include <asm/desc.h>
32703+#include <asm/bios_ebda.h>
32704
32705 /*
32706 * We need to define the tracepoints somewhere, and tlb.c
32707@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
32708 early_ioremap_page_table_range_init();
32709 #endif
32710
32711+#ifdef CONFIG_PAX_PER_CPU_PGD
32712+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32713+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32714+ KERNEL_PGD_PTRS);
32715+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32716+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32717+ KERNEL_PGD_PTRS);
32718+ load_cr3(get_cpu_pgd(0, kernel));
32719+#else
32720 load_cr3(swapper_pg_dir);
32721+#endif
32722+
32723 __flush_tlb_all();
32724
32725 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32726@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
32727 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32728 * mmio resources as well as potential bios/acpi data regions.
32729 */
32730+
32731+#ifdef CONFIG_GRKERNSEC_KMEM
32732+static unsigned int ebda_start __read_only;
32733+static unsigned int ebda_end __read_only;
32734+#endif
32735+
32736 int devmem_is_allowed(unsigned long pagenr)
32737 {
32738- if (pagenr < 256)
32739+#ifdef CONFIG_GRKERNSEC_KMEM
32740+ /* allow BDA */
32741+ if (!pagenr)
32742 return 1;
32743+ /* allow EBDA */
32744+ if (pagenr >= ebda_start && pagenr < ebda_end)
32745+ return 1;
32746+ /* if tboot is in use, allow access to its hardcoded serial log range */
32747+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32748+ return 1;
32749+#else
32750+ if (!pagenr)
32751+ return 1;
32752+#ifdef CONFIG_VM86
32753+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32754+ return 1;
32755+#endif
32756+#endif
32757+
32758+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32759+ return 1;
32760+#ifdef CONFIG_GRKERNSEC_KMEM
32761+ /* throw out everything else below 1MB */
32762+ if (pagenr <= 256)
32763+ return 0;
32764+#endif
32765 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32766 return 0;
32767 if (!page_is_ram(pagenr))
32768@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32769 #endif
32770 }
32771
32772+#ifdef CONFIG_GRKERNSEC_KMEM
32773+static inline void gr_init_ebda(void)
32774+{
32775+ unsigned int ebda_addr;
32776+ unsigned int ebda_size = 0;
32777+
32778+ ebda_addr = get_bios_ebda();
32779+ if (ebda_addr) {
32780+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32781+ ebda_size <<= 10;
32782+ }
32783+ if (ebda_addr && ebda_size) {
32784+ ebda_start = ebda_addr >> PAGE_SHIFT;
32785+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32786+ } else {
32787+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32788+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32789+ }
32790+}
32791+#else
32792+static inline void gr_init_ebda(void) { }
32793+#endif
32794+
32795 void free_initmem(void)
32796 {
32797+#ifdef CONFIG_PAX_KERNEXEC
32798+#ifdef CONFIG_X86_32
32799+ /* PaX: limit KERNEL_CS to actual size */
32800+ unsigned long addr, limit;
32801+ struct desc_struct d;
32802+ int cpu;
32803+#else
32804+ pgd_t *pgd;
32805+ pud_t *pud;
32806+ pmd_t *pmd;
32807+ unsigned long addr, end;
32808+#endif
32809+#endif
32810+
32811+ gr_init_ebda();
32812+
32813+#ifdef CONFIG_PAX_KERNEXEC
32814+#ifdef CONFIG_X86_32
32815+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32816+ limit = (limit - 1UL) >> PAGE_SHIFT;
32817+
32818+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32819+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32820+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32821+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32822+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32823+ }
32824+
32825+ /* PaX: make KERNEL_CS read-only */
32826+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32827+ if (!paravirt_enabled())
32828+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32829+/*
32830+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32831+ pgd = pgd_offset_k(addr);
32832+ pud = pud_offset(pgd, addr);
32833+ pmd = pmd_offset(pud, addr);
32834+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32835+ }
32836+*/
32837+#ifdef CONFIG_X86_PAE
32838+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32839+/*
32840+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32841+ pgd = pgd_offset_k(addr);
32842+ pud = pud_offset(pgd, addr);
32843+ pmd = pmd_offset(pud, addr);
32844+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32845+ }
32846+*/
32847+#endif
32848+
32849+#ifdef CONFIG_MODULES
32850+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32851+#endif
32852+
32853+#else
32854+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32855+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32856+ pgd = pgd_offset_k(addr);
32857+ pud = pud_offset(pgd, addr);
32858+ pmd = pmd_offset(pud, addr);
32859+ if (!pmd_present(*pmd))
32860+ continue;
32861+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32862+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32863+ else
32864+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32865+ }
32866+
32867+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32868+ end = addr + KERNEL_IMAGE_SIZE;
32869+ for (; addr < end; addr += PMD_SIZE) {
32870+ pgd = pgd_offset_k(addr);
32871+ pud = pud_offset(pgd, addr);
32872+ pmd = pmd_offset(pud, addr);
32873+ if (!pmd_present(*pmd))
32874+ continue;
32875+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32876+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32877+ }
32878+#endif
32879+
32880+ flush_tlb_all();
32881+#endif
32882+
32883 free_init_pages("unused kernel",
32884 (unsigned long)(&__init_begin),
32885 (unsigned long)(&__init_end));
32886diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32887index c8140e1..59257fc 100644
32888--- a/arch/x86/mm/init_32.c
32889+++ b/arch/x86/mm/init_32.c
32890@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32891 bool __read_mostly __vmalloc_start_set = false;
32892
32893 /*
32894- * Creates a middle page table and puts a pointer to it in the
32895- * given global directory entry. This only returns the gd entry
32896- * in non-PAE compilation mode, since the middle layer is folded.
32897- */
32898-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32899-{
32900- pud_t *pud;
32901- pmd_t *pmd_table;
32902-
32903-#ifdef CONFIG_X86_PAE
32904- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32905- pmd_table = (pmd_t *)alloc_low_page();
32906- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32907- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32908- pud = pud_offset(pgd, 0);
32909- BUG_ON(pmd_table != pmd_offset(pud, 0));
32910-
32911- return pmd_table;
32912- }
32913-#endif
32914- pud = pud_offset(pgd, 0);
32915- pmd_table = pmd_offset(pud, 0);
32916-
32917- return pmd_table;
32918-}
32919-
32920-/*
32921 * Create a page table and place a pointer to it in a middle page
32922 * directory entry:
32923 */
32924@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32925 pte_t *page_table = (pte_t *)alloc_low_page();
32926
32927 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32928+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32929+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32930+#else
32931 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32932+#endif
32933 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32934 }
32935
32936 return pte_offset_kernel(pmd, 0);
32937 }
32938
32939+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32940+{
32941+ pud_t *pud;
32942+ pmd_t *pmd_table;
32943+
32944+ pud = pud_offset(pgd, 0);
32945+ pmd_table = pmd_offset(pud, 0);
32946+
32947+ return pmd_table;
32948+}
32949+
32950 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32951 {
32952 int pgd_idx = pgd_index(vaddr);
32953@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32954 int pgd_idx, pmd_idx;
32955 unsigned long vaddr;
32956 pgd_t *pgd;
32957+ pud_t *pud;
32958 pmd_t *pmd;
32959 pte_t *pte = NULL;
32960 unsigned long count = page_table_range_init_count(start, end);
32961@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32962 pgd = pgd_base + pgd_idx;
32963
32964 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32965- pmd = one_md_table_init(pgd);
32966- pmd = pmd + pmd_index(vaddr);
32967+ pud = pud_offset(pgd, vaddr);
32968+ pmd = pmd_offset(pud, vaddr);
32969+
32970+#ifdef CONFIG_X86_PAE
32971+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32972+#endif
32973+
32974 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32975 pmd++, pmd_idx++) {
32976 pte = page_table_kmap_check(one_page_table_init(pmd),
32977@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32978 }
32979 }
32980
32981-static inline int is_kernel_text(unsigned long addr)
32982+static inline int is_kernel_text(unsigned long start, unsigned long end)
32983 {
32984- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32985- return 1;
32986- return 0;
32987+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32988+ end <= ktla_ktva((unsigned long)_stext)) &&
32989+ (start >= ktla_ktva((unsigned long)_einittext) ||
32990+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32991+
32992+#ifdef CONFIG_ACPI_SLEEP
32993+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32994+#endif
32995+
32996+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32997+ return 0;
32998+ return 1;
32999 }
33000
33001 /*
33002@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33003 unsigned long last_map_addr = end;
33004 unsigned long start_pfn, end_pfn;
33005 pgd_t *pgd_base = swapper_pg_dir;
33006- int pgd_idx, pmd_idx, pte_ofs;
33007+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33008 unsigned long pfn;
33009 pgd_t *pgd;
33010+ pud_t *pud;
33011 pmd_t *pmd;
33012 pte_t *pte;
33013 unsigned pages_2m, pages_4k;
33014@@ -291,8 +295,13 @@ repeat:
33015 pfn = start_pfn;
33016 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33017 pgd = pgd_base + pgd_idx;
33018- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33019- pmd = one_md_table_init(pgd);
33020+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33021+ pud = pud_offset(pgd, 0);
33022+ pmd = pmd_offset(pud, 0);
33023+
33024+#ifdef CONFIG_X86_PAE
33025+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33026+#endif
33027
33028 if (pfn >= end_pfn)
33029 continue;
33030@@ -304,14 +313,13 @@ repeat:
33031 #endif
33032 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33033 pmd++, pmd_idx++) {
33034- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33035+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33036
33037 /*
33038 * Map with big pages if possible, otherwise
33039 * create normal page tables:
33040 */
33041 if (use_pse) {
33042- unsigned int addr2;
33043 pgprot_t prot = PAGE_KERNEL_LARGE;
33044 /*
33045 * first pass will use the same initial
33046@@ -322,11 +330,7 @@ repeat:
33047 _PAGE_PSE);
33048
33049 pfn &= PMD_MASK >> PAGE_SHIFT;
33050- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33051- PAGE_OFFSET + PAGE_SIZE-1;
33052-
33053- if (is_kernel_text(addr) ||
33054- is_kernel_text(addr2))
33055+ if (is_kernel_text(address, address + PMD_SIZE))
33056 prot = PAGE_KERNEL_LARGE_EXEC;
33057
33058 pages_2m++;
33059@@ -343,7 +347,7 @@ repeat:
33060 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33061 pte += pte_ofs;
33062 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33063- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33064+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33065 pgprot_t prot = PAGE_KERNEL;
33066 /*
33067 * first pass will use the same initial
33068@@ -351,7 +355,7 @@ repeat:
33069 */
33070 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33071
33072- if (is_kernel_text(addr))
33073+ if (is_kernel_text(address, address + PAGE_SIZE))
33074 prot = PAGE_KERNEL_EXEC;
33075
33076 pages_4k++;
33077@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33078
33079 pud = pud_offset(pgd, va);
33080 pmd = pmd_offset(pud, va);
33081- if (!pmd_present(*pmd))
33082+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33083 break;
33084
33085 /* should not be large page here */
33086@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33087
33088 static void __init pagetable_init(void)
33089 {
33090- pgd_t *pgd_base = swapper_pg_dir;
33091-
33092- permanent_kmaps_init(pgd_base);
33093+ permanent_kmaps_init(swapper_pg_dir);
33094 }
33095
33096-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33097+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33098 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33099
33100 /* user-defined highmem size */
33101@@ -787,10 +789,10 @@ void __init mem_init(void)
33102 ((unsigned long)&__init_end -
33103 (unsigned long)&__init_begin) >> 10,
33104
33105- (unsigned long)&_etext, (unsigned long)&_edata,
33106- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33107+ (unsigned long)&_sdata, (unsigned long)&_edata,
33108+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33109
33110- (unsigned long)&_text, (unsigned long)&_etext,
33111+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33112 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33113
33114 /*
33115@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33116 if (!kernel_set_to_readonly)
33117 return;
33118
33119+ start = ktla_ktva(start);
33120 pr_debug("Set kernel text: %lx - %lx for read write\n",
33121 start, start+size);
33122
33123@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33124 if (!kernel_set_to_readonly)
33125 return;
33126
33127+ start = ktla_ktva(start);
33128 pr_debug("Set kernel text: %lx - %lx for read only\n",
33129 start, start+size);
33130
33131@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33132 unsigned long start = PFN_ALIGN(_text);
33133 unsigned long size = PFN_ALIGN(_etext) - start;
33134
33135+ start = ktla_ktva(start);
33136 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33137 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33138 size >> 10);
33139diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33140index 30eb05a..ae671ac 100644
33141--- a/arch/x86/mm/init_64.c
33142+++ b/arch/x86/mm/init_64.c
33143@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33144 * around without checking the pgd every time.
33145 */
33146
33147-pteval_t __supported_pte_mask __read_mostly = ~0;
33148+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33149 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33150
33151 int force_personality32;
33152@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33153
33154 for (address = start; address <= end; address += PGDIR_SIZE) {
33155 const pgd_t *pgd_ref = pgd_offset_k(address);
33156+
33157+#ifdef CONFIG_PAX_PER_CPU_PGD
33158+ unsigned long cpu;
33159+#else
33160 struct page *page;
33161+#endif
33162
33163 /*
33164 * When it is called after memory hot remove, pgd_none()
33165@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33166 continue;
33167
33168 spin_lock(&pgd_lock);
33169+
33170+#ifdef CONFIG_PAX_PER_CPU_PGD
33171+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33172+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33173+
33174+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33175+ BUG_ON(pgd_page_vaddr(*pgd)
33176+ != pgd_page_vaddr(*pgd_ref));
33177+
33178+ if (removed) {
33179+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33180+ pgd_clear(pgd);
33181+ } else {
33182+ if (pgd_none(*pgd))
33183+ set_pgd(pgd, *pgd_ref);
33184+ }
33185+
33186+ pgd = pgd_offset_cpu(cpu, kernel, address);
33187+#else
33188 list_for_each_entry(page, &pgd_list, lru) {
33189 pgd_t *pgd;
33190 spinlock_t *pgt_lock;
33191@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33192 /* the pgt_lock only for Xen */
33193 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33194 spin_lock(pgt_lock);
33195+#endif
33196
33197 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33198 BUG_ON(pgd_page_vaddr(*pgd)
33199@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33200 set_pgd(pgd, *pgd_ref);
33201 }
33202
33203+#ifndef CONFIG_PAX_PER_CPU_PGD
33204 spin_unlock(pgt_lock);
33205+#endif
33206+
33207 }
33208 spin_unlock(&pgd_lock);
33209 }
33210@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33211 {
33212 if (pgd_none(*pgd)) {
33213 pud_t *pud = (pud_t *)spp_getpage();
33214- pgd_populate(&init_mm, pgd, pud);
33215+ pgd_populate_kernel(&init_mm, pgd, pud);
33216 if (pud != pud_offset(pgd, 0))
33217 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33218 pud, pud_offset(pgd, 0));
33219@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33220 {
33221 if (pud_none(*pud)) {
33222 pmd_t *pmd = (pmd_t *) spp_getpage();
33223- pud_populate(&init_mm, pud, pmd);
33224+ pud_populate_kernel(&init_mm, pud, pmd);
33225 if (pmd != pmd_offset(pud, 0))
33226 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33227 pmd, pmd_offset(pud, 0));
33228@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33229 pmd = fill_pmd(pud, vaddr);
33230 pte = fill_pte(pmd, vaddr);
33231
33232+ pax_open_kernel();
33233 set_pte(pte, new_pte);
33234+ pax_close_kernel();
33235
33236 /*
33237 * It's enough to flush this one mapping.
33238@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33239 pgd = pgd_offset_k((unsigned long)__va(phys));
33240 if (pgd_none(*pgd)) {
33241 pud = (pud_t *) spp_getpage();
33242- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33243- _PAGE_USER));
33244+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33245 }
33246 pud = pud_offset(pgd, (unsigned long)__va(phys));
33247 if (pud_none(*pud)) {
33248 pmd = (pmd_t *) spp_getpage();
33249- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33250- _PAGE_USER));
33251+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33252 }
33253 pmd = pmd_offset(pud, phys);
33254 BUG_ON(!pmd_none(*pmd));
33255@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33256 prot);
33257
33258 spin_lock(&init_mm.page_table_lock);
33259- pud_populate(&init_mm, pud, pmd);
33260+ pud_populate_kernel(&init_mm, pud, pmd);
33261 spin_unlock(&init_mm.page_table_lock);
33262 }
33263 __flush_tlb_all();
33264@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33265 page_size_mask);
33266
33267 spin_lock(&init_mm.page_table_lock);
33268- pgd_populate(&init_mm, pgd, pud);
33269+ pgd_populate_kernel(&init_mm, pgd, pud);
33270 spin_unlock(&init_mm.page_table_lock);
33271 pgd_changed = true;
33272 }
33273diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33274index 9ca35fc..4b2b7b7 100644
33275--- a/arch/x86/mm/iomap_32.c
33276+++ b/arch/x86/mm/iomap_32.c
33277@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33278 type = kmap_atomic_idx_push();
33279 idx = type + KM_TYPE_NR * smp_processor_id();
33280 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33281+
33282+ pax_open_kernel();
33283 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33284+ pax_close_kernel();
33285+
33286 arch_flush_lazy_mmu_mode();
33287
33288 return (void *)vaddr;
33289diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33290index fdf617c..b9e85bc 100644
33291--- a/arch/x86/mm/ioremap.c
33292+++ b/arch/x86/mm/ioremap.c
33293@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33294 unsigned long i;
33295
33296 for (i = 0; i < nr_pages; ++i)
33297- if (pfn_valid(start_pfn + i) &&
33298- !PageReserved(pfn_to_page(start_pfn + i)))
33299+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33300+ !PageReserved(pfn_to_page(start_pfn + i))))
33301 return 1;
33302
33303 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33304@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33305 *
33306 * Caller must ensure there is only one unmapping for the same pointer.
33307 */
33308-void iounmap(volatile void __iomem *addr)
33309+void iounmap(const volatile void __iomem *addr)
33310 {
33311 struct vm_struct *p, *o;
33312
33313@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33314 */
33315 void *xlate_dev_mem_ptr(phys_addr_t phys)
33316 {
33317- void *addr;
33318- unsigned long start = phys & PAGE_MASK;
33319-
33320 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33321- if (page_is_ram(start >> PAGE_SHIFT))
33322+ if (page_is_ram(phys >> PAGE_SHIFT))
33323+#ifdef CONFIG_HIGHMEM
33324+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33325+#endif
33326 return __va(phys);
33327
33328- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33329- if (addr)
33330- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33331-
33332- return addr;
33333+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33334 }
33335
33336 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33337 {
33338 if (page_is_ram(phys >> PAGE_SHIFT))
33339+#ifdef CONFIG_HIGHMEM
33340+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33341+#endif
33342 return;
33343
33344 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33345 return;
33346 }
33347
33348-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33349+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33350
33351 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33352 {
33353@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33354 early_ioremap_setup();
33355
33356 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33357- memset(bm_pte, 0, sizeof(bm_pte));
33358- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33359+ pmd_populate_user(&init_mm, pmd, bm_pte);
33360
33361 /*
33362 * The boot-ioremap range spans multiple pmds, for which
33363diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33364index b4f2e7e..96c9c3e 100644
33365--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33366+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33367@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33368 * memory (e.g. tracked pages)? For now, we need this to avoid
33369 * invoking kmemcheck for PnP BIOS calls.
33370 */
33371- if (regs->flags & X86_VM_MASK)
33372+ if (v8086_mode(regs))
33373 return false;
33374- if (regs->cs != __KERNEL_CS)
33375+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33376 return false;
33377
33378 pte = kmemcheck_pte_lookup(address);
33379diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33380index df4552b..12c129c 100644
33381--- a/arch/x86/mm/mmap.c
33382+++ b/arch/x86/mm/mmap.c
33383@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33384 * Leave an at least ~128 MB hole with possible stack randomization.
33385 */
33386 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33387-#define MAX_GAP (TASK_SIZE/6*5)
33388+#define MAX_GAP (pax_task_size/6*5)
33389
33390 static int mmap_is_legacy(void)
33391 {
33392@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33393 return rnd << PAGE_SHIFT;
33394 }
33395
33396-static unsigned long mmap_base(void)
33397+static unsigned long mmap_base(struct mm_struct *mm)
33398 {
33399 unsigned long gap = rlimit(RLIMIT_STACK);
33400+ unsigned long pax_task_size = TASK_SIZE;
33401+
33402+#ifdef CONFIG_PAX_SEGMEXEC
33403+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33404+ pax_task_size = SEGMEXEC_TASK_SIZE;
33405+#endif
33406
33407 if (gap < MIN_GAP)
33408 gap = MIN_GAP;
33409 else if (gap > MAX_GAP)
33410 gap = MAX_GAP;
33411
33412- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33413+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33414 }
33415
33416 /*
33417 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33418 * does, but not when emulating X86_32
33419 */
33420-static unsigned long mmap_legacy_base(void)
33421+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33422 {
33423- if (mmap_is_ia32())
33424+ if (mmap_is_ia32()) {
33425+
33426+#ifdef CONFIG_PAX_SEGMEXEC
33427+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33428+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33429+ else
33430+#endif
33431+
33432 return TASK_UNMAPPED_BASE;
33433- else
33434+ } else
33435 return TASK_UNMAPPED_BASE + mmap_rnd();
33436 }
33437
33438@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33439 */
33440 void arch_pick_mmap_layout(struct mm_struct *mm)
33441 {
33442- mm->mmap_legacy_base = mmap_legacy_base();
33443- mm->mmap_base = mmap_base();
33444+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33445+ mm->mmap_base = mmap_base(mm);
33446+
33447+#ifdef CONFIG_PAX_RANDMMAP
33448+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33449+ mm->mmap_legacy_base += mm->delta_mmap;
33450+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33451+ }
33452+#endif
33453
33454 if (mmap_is_legacy()) {
33455 mm->mmap_base = mm->mmap_legacy_base;
33456diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33457index 0057a7a..95c7edd 100644
33458--- a/arch/x86/mm/mmio-mod.c
33459+++ b/arch/x86/mm/mmio-mod.c
33460@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33461 break;
33462 default:
33463 {
33464- unsigned char *ip = (unsigned char *)instptr;
33465+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33466 my_trace->opcode = MMIO_UNKNOWN_OP;
33467 my_trace->width = 0;
33468 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33469@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33470 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33471 void __iomem *addr)
33472 {
33473- static atomic_t next_id;
33474+ static atomic_unchecked_t next_id;
33475 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33476 /* These are page-unaligned. */
33477 struct mmiotrace_map map = {
33478@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33479 .private = trace
33480 },
33481 .phys = offset,
33482- .id = atomic_inc_return(&next_id)
33483+ .id = atomic_inc_return_unchecked(&next_id)
33484 };
33485 map.map_id = trace->id;
33486
33487@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33488 ioremap_trace_core(offset, size, addr);
33489 }
33490
33491-static void iounmap_trace_core(volatile void __iomem *addr)
33492+static void iounmap_trace_core(const volatile void __iomem *addr)
33493 {
33494 struct mmiotrace_map map = {
33495 .phys = 0,
33496@@ -328,7 +328,7 @@ not_enabled:
33497 }
33498 }
33499
33500-void mmiotrace_iounmap(volatile void __iomem *addr)
33501+void mmiotrace_iounmap(const volatile void __iomem *addr)
33502 {
33503 might_sleep();
33504 if (is_enabled()) /* recheck and proper locking in *_core() */
33505diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33506index cd4785b..25188b6 100644
33507--- a/arch/x86/mm/numa.c
33508+++ b/arch/x86/mm/numa.c
33509@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33510 }
33511 }
33512
33513-static int __init numa_register_memblks(struct numa_meminfo *mi)
33514+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33515 {
33516 unsigned long uninitialized_var(pfn_align);
33517 int i, nid;
33518diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33519index 536ea2f..f42c293 100644
33520--- a/arch/x86/mm/pageattr.c
33521+++ b/arch/x86/mm/pageattr.c
33522@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33523 */
33524 #ifdef CONFIG_PCI_BIOS
33525 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33526- pgprot_val(forbidden) |= _PAGE_NX;
33527+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33528 #endif
33529
33530 /*
33531@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33532 * Does not cover __inittext since that is gone later on. On
33533 * 64bit we do not enforce !NX on the low mapping
33534 */
33535- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33536- pgprot_val(forbidden) |= _PAGE_NX;
33537+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33538+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33539
33540+#ifdef CONFIG_DEBUG_RODATA
33541 /*
33542 * The .rodata section needs to be read-only. Using the pfn
33543 * catches all aliases.
33544@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33545 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33546 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33547 pgprot_val(forbidden) |= _PAGE_RW;
33548+#endif
33549
33550 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33551 /*
33552@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33553 }
33554 #endif
33555
33556+#ifdef CONFIG_PAX_KERNEXEC
33557+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33558+ pgprot_val(forbidden) |= _PAGE_RW;
33559+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33560+ }
33561+#endif
33562+
33563 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33564
33565 return prot;
33566@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33567 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33568 {
33569 /* change init_mm */
33570+ pax_open_kernel();
33571 set_pte_atomic(kpte, pte);
33572+
33573 #ifdef CONFIG_X86_32
33574 if (!SHARED_KERNEL_PMD) {
33575+
33576+#ifdef CONFIG_PAX_PER_CPU_PGD
33577+ unsigned long cpu;
33578+#else
33579 struct page *page;
33580+#endif
33581
33582+#ifdef CONFIG_PAX_PER_CPU_PGD
33583+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33584+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33585+#else
33586 list_for_each_entry(page, &pgd_list, lru) {
33587- pgd_t *pgd;
33588+ pgd_t *pgd = (pgd_t *)page_address(page);
33589+#endif
33590+
33591 pud_t *pud;
33592 pmd_t *pmd;
33593
33594- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33595+ pgd += pgd_index(address);
33596 pud = pud_offset(pgd, address);
33597 pmd = pmd_offset(pud, address);
33598 set_pte_atomic((pte_t *)pmd, pte);
33599 }
33600 }
33601 #endif
33602+ pax_close_kernel();
33603 }
33604
33605 static int
33606diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33607index 7ac6869..c0ba541 100644
33608--- a/arch/x86/mm/pat.c
33609+++ b/arch/x86/mm/pat.c
33610@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33611 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33612
33613 if (pg_flags == _PGMT_DEFAULT)
33614- return -1;
33615+ return _PAGE_CACHE_MODE_NUM;
33616 else if (pg_flags == _PGMT_WC)
33617 return _PAGE_CACHE_MODE_WC;
33618 else if (pg_flags == _PGMT_UC_MINUS)
33619@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33620
33621 page = pfn_to_page(pfn);
33622 type = get_page_memtype(page);
33623- if (type != -1) {
33624+ if (type != _PAGE_CACHE_MODE_NUM) {
33625 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33626 start, end - 1, type, req_type);
33627 if (new_type)
33628@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33629
33630 if (!entry) {
33631 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33632- current->comm, current->pid, start, end - 1);
33633+ current->comm, task_pid_nr(current), start, end - 1);
33634 return -EINVAL;
33635 }
33636
33637@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33638 page = pfn_to_page(paddr >> PAGE_SHIFT);
33639 rettype = get_page_memtype(page);
33640 /*
33641- * -1 from get_page_memtype() implies RAM page is in its
33642+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33643 * default state and not reserved, and hence of type WB
33644 */
33645- if (rettype == -1)
33646+ if (rettype == _PAGE_CACHE_MODE_NUM)
33647 rettype = _PAGE_CACHE_MODE_WB;
33648
33649 return rettype;
33650@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33651
33652 while (cursor < to) {
33653 if (!devmem_is_allowed(pfn)) {
33654- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33655- current->comm, from, to - 1);
33656+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33657+ current->comm, from, to - 1, cursor);
33658 return 0;
33659 }
33660 cursor += PAGE_SIZE;
33661@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33662 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33663 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33664 "for [mem %#010Lx-%#010Lx]\n",
33665- current->comm, current->pid,
33666+ current->comm, task_pid_nr(current),
33667 cattr_name(pcm),
33668 base, (unsigned long long)(base + size-1));
33669 return -EINVAL;
33670@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33671 pcm = lookup_memtype(paddr);
33672 if (want_pcm != pcm) {
33673 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33674- current->comm, current->pid,
33675+ current->comm, task_pid_nr(current),
33676 cattr_name(want_pcm),
33677 (unsigned long long)paddr,
33678 (unsigned long long)(paddr + size - 1),
33679@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33680 free_memtype(paddr, paddr + size);
33681 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33682 " for [mem %#010Lx-%#010Lx], got %s\n",
33683- current->comm, current->pid,
33684+ current->comm, task_pid_nr(current),
33685 cattr_name(want_pcm),
33686 (unsigned long long)paddr,
33687 (unsigned long long)(paddr + size - 1),
33688diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33689index 6582adc..fcc5d0b 100644
33690--- a/arch/x86/mm/pat_rbtree.c
33691+++ b/arch/x86/mm/pat_rbtree.c
33692@@ -161,7 +161,7 @@ success:
33693
33694 failure:
33695 printk(KERN_INFO "%s:%d conflicting memory types "
33696- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33697+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33698 end, cattr_name(found_type), cattr_name(match->type));
33699 return -EBUSY;
33700 }
33701diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33702index 9f0614d..92ae64a 100644
33703--- a/arch/x86/mm/pf_in.c
33704+++ b/arch/x86/mm/pf_in.c
33705@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33706 int i;
33707 enum reason_type rv = OTHERS;
33708
33709- p = (unsigned char *)ins_addr;
33710+ p = (unsigned char *)ktla_ktva(ins_addr);
33711 p += skip_prefix(p, &prf);
33712 p += get_opcode(p, &opcode);
33713
33714@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33715 struct prefix_bits prf;
33716 int i;
33717
33718- p = (unsigned char *)ins_addr;
33719+ p = (unsigned char *)ktla_ktva(ins_addr);
33720 p += skip_prefix(p, &prf);
33721 p += get_opcode(p, &opcode);
33722
33723@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33724 struct prefix_bits prf;
33725 int i;
33726
33727- p = (unsigned char *)ins_addr;
33728+ p = (unsigned char *)ktla_ktva(ins_addr);
33729 p += skip_prefix(p, &prf);
33730 p += get_opcode(p, &opcode);
33731
33732@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33733 struct prefix_bits prf;
33734 int i;
33735
33736- p = (unsigned char *)ins_addr;
33737+ p = (unsigned char *)ktla_ktva(ins_addr);
33738 p += skip_prefix(p, &prf);
33739 p += get_opcode(p, &opcode);
33740 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33741@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33742 struct prefix_bits prf;
33743 int i;
33744
33745- p = (unsigned char *)ins_addr;
33746+ p = (unsigned char *)ktla_ktva(ins_addr);
33747 p += skip_prefix(p, &prf);
33748 p += get_opcode(p, &opcode);
33749 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33750diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33751index 7b22ada..b11e66f 100644
33752--- a/arch/x86/mm/pgtable.c
33753+++ b/arch/x86/mm/pgtable.c
33754@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33755 list_del(&page->lru);
33756 }
33757
33758-#define UNSHARED_PTRS_PER_PGD \
33759- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33760+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33761+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33762
33763+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33764+{
33765+ unsigned int count = USER_PGD_PTRS;
33766
33767+ if (!pax_user_shadow_base)
33768+ return;
33769+
33770+ while (count--)
33771+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33772+}
33773+#endif
33774+
33775+#ifdef CONFIG_PAX_PER_CPU_PGD
33776+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33777+{
33778+ unsigned int count = USER_PGD_PTRS;
33779+
33780+ while (count--) {
33781+ pgd_t pgd;
33782+
33783+#ifdef CONFIG_X86_64
33784+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33785+#else
33786+ pgd = *src++;
33787+#endif
33788+
33789+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33790+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33791+#endif
33792+
33793+ *dst++ = pgd;
33794+ }
33795+
33796+}
33797+#endif
33798+
33799+#ifdef CONFIG_X86_64
33800+#define pxd_t pud_t
33801+#define pyd_t pgd_t
33802+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33803+#define pgtable_pxd_page_ctor(page) true
33804+#define pgtable_pxd_page_dtor(page) do {} while (0)
33805+#define pxd_free(mm, pud) pud_free((mm), (pud))
33806+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33807+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33808+#define PYD_SIZE PGDIR_SIZE
33809+#define mm_inc_nr_pxds(mm) do {} while (0)
33810+#define mm_dec_nr_pxds(mm) do {} while (0)
33811+#else
33812+#define pxd_t pmd_t
33813+#define pyd_t pud_t
33814+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33815+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33816+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33817+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33818+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33819+#define pyd_offset(mm, address) pud_offset((mm), (address))
33820+#define PYD_SIZE PUD_SIZE
33821+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33822+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33823+#endif
33824+
33825+#ifdef CONFIG_PAX_PER_CPU_PGD
33826+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33827+static inline void pgd_dtor(pgd_t *pgd) {}
33828+#else
33829 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33830 {
33831 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33832@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
33833 pgd_list_del(pgd);
33834 spin_unlock(&pgd_lock);
33835 }
33836+#endif
33837
33838 /*
33839 * List of all pgd's needed for non-PAE so it can invalidate entries
33840@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
33841 * -- nyc
33842 */
33843
33844-#ifdef CONFIG_X86_PAE
33845+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33846 /*
33847 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33848 * updating the top-level pagetable entries to guarantee the
33849@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
33850 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33851 * and initialize the kernel pmds here.
33852 */
33853-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33854+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33855
33856 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33857 {
33858@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33859 */
33860 flush_tlb_mm(mm);
33861 }
33862+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33863+#define PREALLOCATED_PXDS USER_PGD_PTRS
33864 #else /* !CONFIG_X86_PAE */
33865
33866 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33867-#define PREALLOCATED_PMDS 0
33868+#define PREALLOCATED_PXDS 0
33869
33870 #endif /* CONFIG_X86_PAE */
33871
33872-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33873+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33874 {
33875 int i;
33876
33877- for(i = 0; i < PREALLOCATED_PMDS; i++)
33878- if (pmds[i]) {
33879- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33880- free_page((unsigned long)pmds[i]);
33881- mm_dec_nr_pmds(mm);
33882+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33883+ if (pxds[i]) {
33884+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33885+ free_page((unsigned long)pxds[i]);
33886+ mm_dec_nr_pxds(mm);
33887 }
33888 }
33889
33890-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33891+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33892 {
33893 int i;
33894 bool failed = false;
33895
33896- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33897- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33898- if (!pmd)
33899+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33900+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33901+ if (!pxd)
33902 failed = true;
33903- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33904- free_page((unsigned long)pmd);
33905- pmd = NULL;
33906+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33907+ free_page((unsigned long)pxd);
33908+ pxd = NULL;
33909 failed = true;
33910 }
33911- if (pmd)
33912- mm_inc_nr_pmds(mm);
33913- pmds[i] = pmd;
33914+ if (pxd)
33915+ mm_inc_nr_pxds(mm);
33916+ pxds[i] = pxd;
33917 }
33918
33919 if (failed) {
33920- free_pmds(mm, pmds);
33921+ free_pxds(mm, pxds);
33922 return -ENOMEM;
33923 }
33924
33925@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33926 * preallocate which never got a corresponding vma will need to be
33927 * freed manually.
33928 */
33929-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33930+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33931 {
33932 int i;
33933
33934- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33935+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33936 pgd_t pgd = pgdp[i];
33937
33938 if (pgd_val(pgd) != 0) {
33939- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33940+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33941
33942- pgdp[i] = native_make_pgd(0);
33943+ set_pgd(pgdp + i, native_make_pgd(0));
33944
33945- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33946- pmd_free(mm, pmd);
33947- mm_dec_nr_pmds(mm);
33948+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33949+ pxd_free(mm, pxd);
33950+ mm_dec_nr_pxds(mm);
33951 }
33952 }
33953 }
33954
33955-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33956+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33957 {
33958- pud_t *pud;
33959+ pyd_t *pyd;
33960 int i;
33961
33962- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33963+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33964 return;
33965
33966- pud = pud_offset(pgd, 0);
33967+#ifdef CONFIG_X86_64
33968+ pyd = pyd_offset(mm, 0L);
33969+#else
33970+ pyd = pyd_offset(pgd, 0L);
33971+#endif
33972
33973- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33974- pmd_t *pmd = pmds[i];
33975+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33976+ pxd_t *pxd = pxds[i];
33977
33978 if (i >= KERNEL_PGD_BOUNDARY)
33979- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33980- sizeof(pmd_t) * PTRS_PER_PMD);
33981+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33982+ sizeof(pxd_t) * PTRS_PER_PMD);
33983
33984- pud_populate(mm, pud, pmd);
33985+ pyd_populate(mm, pyd, pxd);
33986 }
33987 }
33988
33989 pgd_t *pgd_alloc(struct mm_struct *mm)
33990 {
33991 pgd_t *pgd;
33992- pmd_t *pmds[PREALLOCATED_PMDS];
33993+ pxd_t *pxds[PREALLOCATED_PXDS];
33994
33995 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33996
33997@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33998
33999 mm->pgd = pgd;
34000
34001- if (preallocate_pmds(mm, pmds) != 0)
34002+ if (preallocate_pxds(mm, pxds) != 0)
34003 goto out_free_pgd;
34004
34005 if (paravirt_pgd_alloc(mm) != 0)
34006- goto out_free_pmds;
34007+ goto out_free_pxds;
34008
34009 /*
34010 * Make sure that pre-populating the pmds is atomic with
34011@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34012 spin_lock(&pgd_lock);
34013
34014 pgd_ctor(mm, pgd);
34015- pgd_prepopulate_pmd(mm, pgd, pmds);
34016+ pgd_prepopulate_pxd(mm, pgd, pxds);
34017
34018 spin_unlock(&pgd_lock);
34019
34020 return pgd;
34021
34022-out_free_pmds:
34023- free_pmds(mm, pmds);
34024+out_free_pxds:
34025+ free_pxds(mm, pxds);
34026 out_free_pgd:
34027 free_page((unsigned long)pgd);
34028 out:
34029@@ -317,7 +389,7 @@ out:
34030
34031 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34032 {
34033- pgd_mop_up_pmds(mm, pgd);
34034+ pgd_mop_up_pxds(mm, pgd);
34035 pgd_dtor(pgd);
34036 paravirt_pgd_free(mm, pgd);
34037 free_page((unsigned long)pgd);
34038diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34039index 75cc097..79a097f 100644
34040--- a/arch/x86/mm/pgtable_32.c
34041+++ b/arch/x86/mm/pgtable_32.c
34042@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34043 return;
34044 }
34045 pte = pte_offset_kernel(pmd, vaddr);
34046+
34047+ pax_open_kernel();
34048 if (pte_val(pteval))
34049 set_pte_at(&init_mm, vaddr, pte, pteval);
34050 else
34051 pte_clear(&init_mm, vaddr, pte);
34052+ pax_close_kernel();
34053
34054 /*
34055 * It's enough to flush this one mapping.
34056diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34057index e666cbb..61788c45 100644
34058--- a/arch/x86/mm/physaddr.c
34059+++ b/arch/x86/mm/physaddr.c
34060@@ -10,7 +10,7 @@
34061 #ifdef CONFIG_X86_64
34062
34063 #ifdef CONFIG_DEBUG_VIRTUAL
34064-unsigned long __phys_addr(unsigned long x)
34065+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34066 {
34067 unsigned long y = x - __START_KERNEL_map;
34068
34069@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34070 #else
34071
34072 #ifdef CONFIG_DEBUG_VIRTUAL
34073-unsigned long __phys_addr(unsigned long x)
34074+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34075 {
34076 unsigned long phys_addr = x - PAGE_OFFSET;
34077 /* VMALLOC_* aren't constants */
34078diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34079index 90555bf..f5f1828 100644
34080--- a/arch/x86/mm/setup_nx.c
34081+++ b/arch/x86/mm/setup_nx.c
34082@@ -5,8 +5,10 @@
34083 #include <asm/pgtable.h>
34084 #include <asm/proto.h>
34085
34086+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34087 static int disable_nx;
34088
34089+#ifndef CONFIG_PAX_PAGEEXEC
34090 /*
34091 * noexec = on|off
34092 *
34093@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34094 return 0;
34095 }
34096 early_param("noexec", noexec_setup);
34097+#endif
34098+
34099+#endif
34100
34101 void x86_configure_nx(void)
34102 {
34103+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34104 if (cpu_has_nx && !disable_nx)
34105 __supported_pte_mask |= _PAGE_NX;
34106 else
34107+#endif
34108 __supported_pte_mask &= ~_PAGE_NX;
34109 }
34110
34111diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34112index 3250f23..7a97ba2 100644
34113--- a/arch/x86/mm/tlb.c
34114+++ b/arch/x86/mm/tlb.c
34115@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34116 BUG();
34117 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34118 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34119+
34120+#ifndef CONFIG_PAX_PER_CPU_PGD
34121 load_cr3(swapper_pg_dir);
34122+#endif
34123+
34124 /*
34125 * This gets called in the idle path where RCU
34126 * functions differently. Tracing normally
34127diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34128new file mode 100644
34129index 0000000..dace51c
34130--- /dev/null
34131+++ b/arch/x86/mm/uderef_64.c
34132@@ -0,0 +1,37 @@
34133+#include <linux/mm.h>
34134+#include <asm/pgtable.h>
34135+#include <asm/uaccess.h>
34136+
34137+#ifdef CONFIG_PAX_MEMORY_UDEREF
34138+/* PaX: due to the special call convention these functions must
34139+ * - remain leaf functions under all configurations,
34140+ * - never be called directly, only dereferenced from the wrappers.
34141+ */
34142+void __pax_open_userland(void)
34143+{
34144+ unsigned int cpu;
34145+
34146+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34147+ return;
34148+
34149+ cpu = raw_get_cpu();
34150+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34151+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34152+ raw_put_cpu_no_resched();
34153+}
34154+EXPORT_SYMBOL(__pax_open_userland);
34155+
34156+void __pax_close_userland(void)
34157+{
34158+ unsigned int cpu;
34159+
34160+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34161+ return;
34162+
34163+ cpu = raw_get_cpu();
34164+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34165+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34166+ raw_put_cpu_no_resched();
34167+}
34168+EXPORT_SYMBOL(__pax_close_userland);
34169+#endif
34170diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34171index 6440221..f84b5c7 100644
34172--- a/arch/x86/net/bpf_jit.S
34173+++ b/arch/x86/net/bpf_jit.S
34174@@ -9,6 +9,7 @@
34175 */
34176 #include <linux/linkage.h>
34177 #include <asm/dwarf2.h>
34178+#include <asm/alternative-asm.h>
34179
34180 /*
34181 * Calling convention :
34182@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34183 jle bpf_slow_path_word
34184 mov (SKBDATA,%rsi),%eax
34185 bswap %eax /* ntohl() */
34186+ pax_force_retaddr
34187 ret
34188
34189 sk_load_half:
34190@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34191 jle bpf_slow_path_half
34192 movzwl (SKBDATA,%rsi),%eax
34193 rol $8,%ax # ntohs()
34194+ pax_force_retaddr
34195 ret
34196
34197 sk_load_byte:
34198@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34199 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34200 jle bpf_slow_path_byte
34201 movzbl (SKBDATA,%rsi),%eax
34202+ pax_force_retaddr
34203 ret
34204
34205 /* rsi contains offset and can be scratched */
34206@@ -90,6 +94,7 @@ bpf_slow_path_word:
34207 js bpf_error
34208 mov - MAX_BPF_STACK + 32(%rbp),%eax
34209 bswap %eax
34210+ pax_force_retaddr
34211 ret
34212
34213 bpf_slow_path_half:
34214@@ -98,12 +103,14 @@ bpf_slow_path_half:
34215 mov - MAX_BPF_STACK + 32(%rbp),%ax
34216 rol $8,%ax
34217 movzwl %ax,%eax
34218+ pax_force_retaddr
34219 ret
34220
34221 bpf_slow_path_byte:
34222 bpf_slow_path_common(1)
34223 js bpf_error
34224 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34225+ pax_force_retaddr
34226 ret
34227
34228 #define sk_negative_common(SIZE) \
34229@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34230 sk_negative_common(4)
34231 mov (%rax), %eax
34232 bswap %eax
34233+ pax_force_retaddr
34234 ret
34235
34236 bpf_slow_path_half_neg:
34237@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34238 mov (%rax),%ax
34239 rol $8,%ax
34240 movzwl %ax,%eax
34241+ pax_force_retaddr
34242 ret
34243
34244 bpf_slow_path_byte_neg:
34245@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34246 .globl sk_load_byte_negative_offset
34247 sk_negative_common(1)
34248 movzbl (%rax), %eax
34249+ pax_force_retaddr
34250 ret
34251
34252 bpf_error:
34253@@ -156,4 +166,5 @@ bpf_error:
34254 mov - MAX_BPF_STACK + 16(%rbp),%r14
34255 mov - MAX_BPF_STACK + 24(%rbp),%r15
34256 leaveq
34257+ pax_force_retaddr
34258 ret
34259diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34260index 9875143..36776ae 100644
34261--- a/arch/x86/net/bpf_jit_comp.c
34262+++ b/arch/x86/net/bpf_jit_comp.c
34263@@ -13,7 +13,11 @@
34264 #include <linux/if_vlan.h>
34265 #include <asm/cacheflush.h>
34266
34267+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34268+int bpf_jit_enable __read_only;
34269+#else
34270 int bpf_jit_enable __read_mostly;
34271+#endif
34272
34273 /*
34274 * assembly code in arch/x86/net/bpf_jit.S
34275@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34276 static void jit_fill_hole(void *area, unsigned int size)
34277 {
34278 /* fill whole space with int3 instructions */
34279+ pax_open_kernel();
34280 memset(area, 0xcc, size);
34281+ pax_close_kernel();
34282 }
34283
34284 struct jit_context {
34285@@ -559,6 +565,13 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
34286 if (is_ereg(dst_reg))
34287 EMIT1(0x41);
34288 EMIT3(0xC1, add_1reg(0xC8, dst_reg), 8);
34289+
34290+ /* emit 'movzwl eax, ax' */
34291+ if (is_ereg(dst_reg))
34292+ EMIT3(0x45, 0x0F, 0xB7);
34293+ else
34294+ EMIT2(0x0F, 0xB7);
34295+ EMIT1(add_2reg(0xC0, dst_reg, dst_reg));
34296 break;
34297 case 32:
34298 /* emit 'bswap eax' to swap lower 4 bytes */
34299@@ -577,6 +590,27 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image,
34300 break;
34301
34302 case BPF_ALU | BPF_END | BPF_FROM_LE:
34303+ switch (imm32) {
34304+ case 16:
34305+ /* emit 'movzwl eax, ax' to zero extend 16-bit
34306+ * into 64 bit
34307+ */
34308+ if (is_ereg(dst_reg))
34309+ EMIT3(0x45, 0x0F, 0xB7);
34310+ else
34311+ EMIT2(0x0F, 0xB7);
34312+ EMIT1(add_2reg(0xC0, dst_reg, dst_reg));
34313+ break;
34314+ case 32:
34315+ /* emit 'mov eax, eax' to clear upper 32-bits */
34316+ if (is_ereg(dst_reg))
34317+ EMIT1(0x45);
34318+ EMIT2(0x89, add_2reg(0xC0, dst_reg, dst_reg));
34319+ break;
34320+ case 64:
34321+ /* nop */
34322+ break;
34323+ }
34324 break;
34325
34326 /* ST: *(u8*)(dst_reg + off) = imm */
34327@@ -896,7 +930,9 @@ common_load:
34328 pr_err("bpf_jit_compile fatal error\n");
34329 return -EFAULT;
34330 }
34331+ pax_open_kernel();
34332 memcpy(image + proglen, temp, ilen);
34333+ pax_close_kernel();
34334 }
34335 proglen += ilen;
34336 addrs[i] = proglen;
34337@@ -968,7 +1004,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34338
34339 if (image) {
34340 bpf_flush_icache(header, image + proglen);
34341- set_memory_ro((unsigned long)header, header->pages);
34342 prog->bpf_func = (void *)image;
34343 prog->jited = true;
34344 }
34345@@ -981,12 +1016,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34346 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34347 struct bpf_binary_header *header = (void *)addr;
34348
34349- if (!fp->jited)
34350- goto free_filter;
34351+ if (fp->jited)
34352+ bpf_jit_binary_free(header);
34353
34354- set_memory_rw(addr, header->pages);
34355- bpf_jit_binary_free(header);
34356-
34357-free_filter:
34358 bpf_prog_unlock_free(fp);
34359 }
34360diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34361index 5d04be5..2beeaa2 100644
34362--- a/arch/x86/oprofile/backtrace.c
34363+++ b/arch/x86/oprofile/backtrace.c
34364@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34365 struct stack_frame_ia32 *fp;
34366 unsigned long bytes;
34367
34368- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34369+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34370 if (bytes != 0)
34371 return NULL;
34372
34373- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34374+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34375
34376 oprofile_add_trace(bufhead[0].return_address);
34377
34378@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34379 struct stack_frame bufhead[2];
34380 unsigned long bytes;
34381
34382- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34383+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34384 if (bytes != 0)
34385 return NULL;
34386
34387@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34388 {
34389 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34390
34391- if (!user_mode_vm(regs)) {
34392+ if (!user_mode(regs)) {
34393 unsigned long stack = kernel_stack_pointer(regs);
34394 if (depth)
34395 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34396diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34397index 1d2e639..f6ef82a 100644
34398--- a/arch/x86/oprofile/nmi_int.c
34399+++ b/arch/x86/oprofile/nmi_int.c
34400@@ -23,6 +23,7 @@
34401 #include <asm/nmi.h>
34402 #include <asm/msr.h>
34403 #include <asm/apic.h>
34404+#include <asm/pgtable.h>
34405
34406 #include "op_counter.h"
34407 #include "op_x86_model.h"
34408@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34409 if (ret)
34410 return ret;
34411
34412- if (!model->num_virt_counters)
34413- model->num_virt_counters = model->num_counters;
34414+ if (!model->num_virt_counters) {
34415+ pax_open_kernel();
34416+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34417+ pax_close_kernel();
34418+ }
34419
34420 mux_init(ops);
34421
34422diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34423index 50d86c0..7985318 100644
34424--- a/arch/x86/oprofile/op_model_amd.c
34425+++ b/arch/x86/oprofile/op_model_amd.c
34426@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34427 num_counters = AMD64_NUM_COUNTERS;
34428 }
34429
34430- op_amd_spec.num_counters = num_counters;
34431- op_amd_spec.num_controls = num_counters;
34432- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34433+ pax_open_kernel();
34434+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34435+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34436+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34437+ pax_close_kernel();
34438
34439 return 0;
34440 }
34441diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34442index d90528e..0127e2b 100644
34443--- a/arch/x86/oprofile/op_model_ppro.c
34444+++ b/arch/x86/oprofile/op_model_ppro.c
34445@@ -19,6 +19,7 @@
34446 #include <asm/msr.h>
34447 #include <asm/apic.h>
34448 #include <asm/nmi.h>
34449+#include <asm/pgtable.h>
34450
34451 #include "op_x86_model.h"
34452 #include "op_counter.h"
34453@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34454
34455 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34456
34457- op_arch_perfmon_spec.num_counters = num_counters;
34458- op_arch_perfmon_spec.num_controls = num_counters;
34459+ pax_open_kernel();
34460+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34461+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34462+ pax_close_kernel();
34463 }
34464
34465 static int arch_perfmon_init(struct oprofile_operations *ignore)
34466diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34467index 71e8a67..6a313bb 100644
34468--- a/arch/x86/oprofile/op_x86_model.h
34469+++ b/arch/x86/oprofile/op_x86_model.h
34470@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34471 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34472 struct op_msrs const * const msrs);
34473 #endif
34474-};
34475+} __do_const;
34476
34477 struct op_counter_config;
34478
34479diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34480index 852aa4c..71613f2 100644
34481--- a/arch/x86/pci/intel_mid_pci.c
34482+++ b/arch/x86/pci/intel_mid_pci.c
34483@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34484 pci_mmcfg_late_init();
34485 pcibios_enable_irq = intel_mid_pci_irq_enable;
34486 pcibios_disable_irq = intel_mid_pci_irq_disable;
34487- pci_root_ops = intel_mid_pci_ops;
34488+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34489 pci_soc_mode = 1;
34490 /* Continue with standard init */
34491 return 1;
34492diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34493index 5dc6ca5..25c03f5 100644
34494--- a/arch/x86/pci/irq.c
34495+++ b/arch/x86/pci/irq.c
34496@@ -51,7 +51,7 @@ struct irq_router {
34497 struct irq_router_handler {
34498 u16 vendor;
34499 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34500-};
34501+} __do_const;
34502
34503 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34504 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34505@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34506 return 0;
34507 }
34508
34509-static __initdata struct irq_router_handler pirq_routers[] = {
34510+static __initconst const struct irq_router_handler pirq_routers[] = {
34511 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34512 { PCI_VENDOR_ID_AL, ali_router_probe },
34513 { PCI_VENDOR_ID_ITE, ite_router_probe },
34514@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34515 static void __init pirq_find_router(struct irq_router *r)
34516 {
34517 struct irq_routing_table *rt = pirq_table;
34518- struct irq_router_handler *h;
34519+ const struct irq_router_handler *h;
34520
34521 #ifdef CONFIG_PCI_BIOS
34522 if (!rt->signature) {
34523@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34524 return 0;
34525 }
34526
34527-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34528+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34529 {
34530 .callback = fix_broken_hp_bios_irq9,
34531 .ident = "HP Pavilion N5400 Series Laptop",
34532diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34533index 9b83b90..4112152 100644
34534--- a/arch/x86/pci/pcbios.c
34535+++ b/arch/x86/pci/pcbios.c
34536@@ -79,7 +79,7 @@ union bios32 {
34537 static struct {
34538 unsigned long address;
34539 unsigned short segment;
34540-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34541+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34542
34543 /*
34544 * Returns the entry point for the given service, NULL on error
34545@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34546 unsigned long length; /* %ecx */
34547 unsigned long entry; /* %edx */
34548 unsigned long flags;
34549+ struct desc_struct d, *gdt;
34550
34551 local_irq_save(flags);
34552- __asm__("lcall *(%%edi); cld"
34553+
34554+ gdt = get_cpu_gdt_table(smp_processor_id());
34555+
34556+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34557+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34558+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34559+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34560+
34561+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34562 : "=a" (return_code),
34563 "=b" (address),
34564 "=c" (length),
34565 "=d" (entry)
34566 : "0" (service),
34567 "1" (0),
34568- "D" (&bios32_indirect));
34569+ "D" (&bios32_indirect),
34570+ "r"(__PCIBIOS_DS)
34571+ : "memory");
34572+
34573+ pax_open_kernel();
34574+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34575+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34576+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34577+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34578+ pax_close_kernel();
34579+
34580 local_irq_restore(flags);
34581
34582 switch (return_code) {
34583- case 0:
34584- return address + entry;
34585- case 0x80: /* Not present */
34586- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34587- return 0;
34588- default: /* Shouldn't happen */
34589- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34590- service, return_code);
34591+ case 0: {
34592+ int cpu;
34593+ unsigned char flags;
34594+
34595+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34596+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34597+ printk(KERN_WARNING "bios32_service: not valid\n");
34598 return 0;
34599+ }
34600+ address = address + PAGE_OFFSET;
34601+ length += 16UL; /* some BIOSs underreport this... */
34602+ flags = 4;
34603+ if (length >= 64*1024*1024) {
34604+ length >>= PAGE_SHIFT;
34605+ flags |= 8;
34606+ }
34607+
34608+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34609+ gdt = get_cpu_gdt_table(cpu);
34610+ pack_descriptor(&d, address, length, 0x9b, flags);
34611+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34612+ pack_descriptor(&d, address, length, 0x93, flags);
34613+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34614+ }
34615+ return entry;
34616+ }
34617+ case 0x80: /* Not present */
34618+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34619+ return 0;
34620+ default: /* Shouldn't happen */
34621+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34622+ service, return_code);
34623+ return 0;
34624 }
34625 }
34626
34627 static struct {
34628 unsigned long address;
34629 unsigned short segment;
34630-} pci_indirect = { 0, __KERNEL_CS };
34631+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34632
34633-static int pci_bios_present;
34634+static int pci_bios_present __read_only;
34635
34636 static int __init check_pcibios(void)
34637 {
34638@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34639 unsigned long flags, pcibios_entry;
34640
34641 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34642- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34643+ pci_indirect.address = pcibios_entry;
34644
34645 local_irq_save(flags);
34646- __asm__(
34647- "lcall *(%%edi); cld\n\t"
34648+ __asm__("movw %w6, %%ds\n\t"
34649+ "lcall *%%ss:(%%edi); cld\n\t"
34650+ "push %%ss\n\t"
34651+ "pop %%ds\n\t"
34652 "jc 1f\n\t"
34653 "xor %%ah, %%ah\n"
34654 "1:"
34655@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34656 "=b" (ebx),
34657 "=c" (ecx)
34658 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34659- "D" (&pci_indirect)
34660+ "D" (&pci_indirect),
34661+ "r" (__PCIBIOS_DS)
34662 : "memory");
34663 local_irq_restore(flags);
34664
34665@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34666
34667 switch (len) {
34668 case 1:
34669- __asm__("lcall *(%%esi); cld\n\t"
34670+ __asm__("movw %w6, %%ds\n\t"
34671+ "lcall *%%ss:(%%esi); cld\n\t"
34672+ "push %%ss\n\t"
34673+ "pop %%ds\n\t"
34674 "jc 1f\n\t"
34675 "xor %%ah, %%ah\n"
34676 "1:"
34677@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34678 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34679 "b" (bx),
34680 "D" ((long)reg),
34681- "S" (&pci_indirect));
34682+ "S" (&pci_indirect),
34683+ "r" (__PCIBIOS_DS));
34684 /*
34685 * Zero-extend the result beyond 8 bits, do not trust the
34686 * BIOS having done it:
34687@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34688 *value &= 0xff;
34689 break;
34690 case 2:
34691- __asm__("lcall *(%%esi); cld\n\t"
34692+ __asm__("movw %w6, %%ds\n\t"
34693+ "lcall *%%ss:(%%esi); cld\n\t"
34694+ "push %%ss\n\t"
34695+ "pop %%ds\n\t"
34696 "jc 1f\n\t"
34697 "xor %%ah, %%ah\n"
34698 "1:"
34699@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34700 : "1" (PCIBIOS_READ_CONFIG_WORD),
34701 "b" (bx),
34702 "D" ((long)reg),
34703- "S" (&pci_indirect));
34704+ "S" (&pci_indirect),
34705+ "r" (__PCIBIOS_DS));
34706 /*
34707 * Zero-extend the result beyond 16 bits, do not trust the
34708 * BIOS having done it:
34709@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34710 *value &= 0xffff;
34711 break;
34712 case 4:
34713- __asm__("lcall *(%%esi); cld\n\t"
34714+ __asm__("movw %w6, %%ds\n\t"
34715+ "lcall *%%ss:(%%esi); cld\n\t"
34716+ "push %%ss\n\t"
34717+ "pop %%ds\n\t"
34718 "jc 1f\n\t"
34719 "xor %%ah, %%ah\n"
34720 "1:"
34721@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34722 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34723 "b" (bx),
34724 "D" ((long)reg),
34725- "S" (&pci_indirect));
34726+ "S" (&pci_indirect),
34727+ "r" (__PCIBIOS_DS));
34728 break;
34729 }
34730
34731@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34732
34733 switch (len) {
34734 case 1:
34735- __asm__("lcall *(%%esi); cld\n\t"
34736+ __asm__("movw %w6, %%ds\n\t"
34737+ "lcall *%%ss:(%%esi); cld\n\t"
34738+ "push %%ss\n\t"
34739+ "pop %%ds\n\t"
34740 "jc 1f\n\t"
34741 "xor %%ah, %%ah\n"
34742 "1:"
34743@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34744 "c" (value),
34745 "b" (bx),
34746 "D" ((long)reg),
34747- "S" (&pci_indirect));
34748+ "S" (&pci_indirect),
34749+ "r" (__PCIBIOS_DS));
34750 break;
34751 case 2:
34752- __asm__("lcall *(%%esi); cld\n\t"
34753+ __asm__("movw %w6, %%ds\n\t"
34754+ "lcall *%%ss:(%%esi); cld\n\t"
34755+ "push %%ss\n\t"
34756+ "pop %%ds\n\t"
34757 "jc 1f\n\t"
34758 "xor %%ah, %%ah\n"
34759 "1:"
34760@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34761 "c" (value),
34762 "b" (bx),
34763 "D" ((long)reg),
34764- "S" (&pci_indirect));
34765+ "S" (&pci_indirect),
34766+ "r" (__PCIBIOS_DS));
34767 break;
34768 case 4:
34769- __asm__("lcall *(%%esi); cld\n\t"
34770+ __asm__("movw %w6, %%ds\n\t"
34771+ "lcall *%%ss:(%%esi); cld\n\t"
34772+ "push %%ss\n\t"
34773+ "pop %%ds\n\t"
34774 "jc 1f\n\t"
34775 "xor %%ah, %%ah\n"
34776 "1:"
34777@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34778 "c" (value),
34779 "b" (bx),
34780 "D" ((long)reg),
34781- "S" (&pci_indirect));
34782+ "S" (&pci_indirect),
34783+ "r" (__PCIBIOS_DS));
34784 break;
34785 }
34786
34787@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34788
34789 DBG("PCI: Fetching IRQ routing table... ");
34790 __asm__("push %%es\n\t"
34791+ "movw %w8, %%ds\n\t"
34792 "push %%ds\n\t"
34793 "pop %%es\n\t"
34794- "lcall *(%%esi); cld\n\t"
34795+ "lcall *%%ss:(%%esi); cld\n\t"
34796 "pop %%es\n\t"
34797+ "push %%ss\n\t"
34798+ "pop %%ds\n"
34799 "jc 1f\n\t"
34800 "xor %%ah, %%ah\n"
34801 "1:"
34802@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34803 "1" (0),
34804 "D" ((long) &opt),
34805 "S" (&pci_indirect),
34806- "m" (opt)
34807+ "m" (opt),
34808+ "r" (__PCIBIOS_DS)
34809 : "memory");
34810 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34811 if (ret & 0xff00)
34812@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34813 {
34814 int ret;
34815
34816- __asm__("lcall *(%%esi); cld\n\t"
34817+ __asm__("movw %w5, %%ds\n\t"
34818+ "lcall *%%ss:(%%esi); cld\n\t"
34819+ "push %%ss\n\t"
34820+ "pop %%ds\n"
34821 "jc 1f\n\t"
34822 "xor %%ah, %%ah\n"
34823 "1:"
34824@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34825 : "0" (PCIBIOS_SET_PCI_HW_INT),
34826 "b" ((dev->bus->number << 8) | dev->devfn),
34827 "c" ((irq << 8) | (pin + 10)),
34828- "S" (&pci_indirect));
34829+ "S" (&pci_indirect),
34830+ "r" (__PCIBIOS_DS));
34831 return !(ret & 0xff00);
34832 }
34833 EXPORT_SYMBOL(pcibios_set_irq_routing);
34834diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34835index 40e7cda..c7e6672 100644
34836--- a/arch/x86/platform/efi/efi_32.c
34837+++ b/arch/x86/platform/efi/efi_32.c
34838@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34839 {
34840 struct desc_ptr gdt_descr;
34841
34842+#ifdef CONFIG_PAX_KERNEXEC
34843+ struct desc_struct d;
34844+#endif
34845+
34846 local_irq_save(efi_rt_eflags);
34847
34848 load_cr3(initial_page_table);
34849 __flush_tlb_all();
34850
34851+#ifdef CONFIG_PAX_KERNEXEC
34852+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34853+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34854+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34855+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34856+#endif
34857+
34858 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34859 gdt_descr.size = GDT_SIZE - 1;
34860 load_gdt(&gdt_descr);
34861@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34862 {
34863 struct desc_ptr gdt_descr;
34864
34865+#ifdef CONFIG_PAX_KERNEXEC
34866+ struct desc_struct d;
34867+
34868+ memset(&d, 0, sizeof d);
34869+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34870+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34871+#endif
34872+
34873 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34874 gdt_descr.size = GDT_SIZE - 1;
34875 load_gdt(&gdt_descr);
34876
34877+#ifdef CONFIG_PAX_PER_CPU_PGD
34878+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34879+#else
34880 load_cr3(swapper_pg_dir);
34881+#endif
34882+
34883 __flush_tlb_all();
34884
34885 local_irq_restore(efi_rt_eflags);
34886diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34887index 17e80d8..9fa6e41 100644
34888--- a/arch/x86/platform/efi/efi_64.c
34889+++ b/arch/x86/platform/efi/efi_64.c
34890@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34891 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34892 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34893 }
34894+
34895+#ifdef CONFIG_PAX_PER_CPU_PGD
34896+ load_cr3(swapper_pg_dir);
34897+#endif
34898+
34899 __flush_tlb_all();
34900 }
34901
34902@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
34903 for (pgd = 0; pgd < n_pgds; pgd++)
34904 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34905 kfree(save_pgd);
34906+
34907+#ifdef CONFIG_PAX_PER_CPU_PGD
34908+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34909+#endif
34910+
34911 __flush_tlb_all();
34912 local_irq_restore(efi_flags);
34913 early_code_mapping_set_exec(0);
34914@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34915 unsigned npages;
34916 pgd_t *pgd;
34917
34918- if (efi_enabled(EFI_OLD_MEMMAP))
34919+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34920+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34921+ * able to execute the EFI services.
34922+ */
34923+ if (__supported_pte_mask & _PAGE_NX) {
34924+ unsigned long addr = (unsigned long) __va(0);
34925+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34926+
34927+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34928+#ifdef CONFIG_PAX_PER_CPU_PGD
34929+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34930+#endif
34931+ set_pgd(pgd_offset_k(addr), pe);
34932+ }
34933+
34934 return 0;
34935+ }
34936
34937 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34938 pgd = __va(efi_scratch.efi_pgt);
34939diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34940index 040192b..7d3300f 100644
34941--- a/arch/x86/platform/efi/efi_stub_32.S
34942+++ b/arch/x86/platform/efi/efi_stub_32.S
34943@@ -6,7 +6,9 @@
34944 */
34945
34946 #include <linux/linkage.h>
34947+#include <linux/init.h>
34948 #include <asm/page_types.h>
34949+#include <asm/segment.h>
34950
34951 /*
34952 * efi_call_phys(void *, ...) is a function with variable parameters.
34953@@ -20,7 +22,7 @@
34954 * service functions will comply with gcc calling convention, too.
34955 */
34956
34957-.text
34958+__INIT
34959 ENTRY(efi_call_phys)
34960 /*
34961 * 0. The function can only be called in Linux kernel. So CS has been
34962@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34963 * The mapping of lower virtual memory has been created in prolog and
34964 * epilog.
34965 */
34966- movl $1f, %edx
34967- subl $__PAGE_OFFSET, %edx
34968- jmp *%edx
34969+#ifdef CONFIG_PAX_KERNEXEC
34970+ movl $(__KERNEXEC_EFI_DS), %edx
34971+ mov %edx, %ds
34972+ mov %edx, %es
34973+ mov %edx, %ss
34974+ addl $2f,(1f)
34975+ ljmp *(1f)
34976+
34977+__INITDATA
34978+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34979+.previous
34980+
34981+2:
34982+ subl $2b,(1b)
34983+#else
34984+ jmp 1f-__PAGE_OFFSET
34985 1:
34986+#endif
34987
34988 /*
34989 * 2. Now on the top of stack is the return
34990@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34991 * parameter 2, ..., param n. To make things easy, we save the return
34992 * address of efi_call_phys in a global variable.
34993 */
34994- popl %edx
34995- movl %edx, saved_return_addr
34996- /* get the function pointer into ECX*/
34997- popl %ecx
34998- movl %ecx, efi_rt_function_ptr
34999- movl $2f, %edx
35000- subl $__PAGE_OFFSET, %edx
35001- pushl %edx
35002+ popl (saved_return_addr)
35003+ popl (efi_rt_function_ptr)
35004
35005 /*
35006 * 3. Clear PG bit in %CR0.
35007@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35008 /*
35009 * 5. Call the physical function.
35010 */
35011- jmp *%ecx
35012+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35013
35014-2:
35015 /*
35016 * 6. After EFI runtime service returns, control will return to
35017 * following instruction. We'd better readjust stack pointer first.
35018@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35019 movl %cr0, %edx
35020 orl $0x80000000, %edx
35021 movl %edx, %cr0
35022- jmp 1f
35023-1:
35024+
35025 /*
35026 * 8. Now restore the virtual mode from flat mode by
35027 * adding EIP with PAGE_OFFSET.
35028 */
35029- movl $1f, %edx
35030- jmp *%edx
35031+#ifdef CONFIG_PAX_KERNEXEC
35032+ movl $(__KERNEL_DS), %edx
35033+ mov %edx, %ds
35034+ mov %edx, %es
35035+ mov %edx, %ss
35036+ ljmp $(__KERNEL_CS),$1f
35037+#else
35038+ jmp 1f+__PAGE_OFFSET
35039+#endif
35040 1:
35041
35042 /*
35043 * 9. Balance the stack. And because EAX contain the return value,
35044 * we'd better not clobber it.
35045 */
35046- leal efi_rt_function_ptr, %edx
35047- movl (%edx), %ecx
35048- pushl %ecx
35049+ pushl (efi_rt_function_ptr)
35050
35051 /*
35052- * 10. Push the saved return address onto the stack and return.
35053+ * 10. Return to the saved return address.
35054 */
35055- leal saved_return_addr, %edx
35056- movl (%edx), %ecx
35057- pushl %ecx
35058- ret
35059+ jmpl *(saved_return_addr)
35060 ENDPROC(efi_call_phys)
35061 .previous
35062
35063-.data
35064+__INITDATA
35065 saved_return_addr:
35066 .long 0
35067 efi_rt_function_ptr:
35068diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35069index 86d0f9e..6d499f4 100644
35070--- a/arch/x86/platform/efi/efi_stub_64.S
35071+++ b/arch/x86/platform/efi/efi_stub_64.S
35072@@ -11,6 +11,7 @@
35073 #include <asm/msr.h>
35074 #include <asm/processor-flags.h>
35075 #include <asm/page_types.h>
35076+#include <asm/alternative-asm.h>
35077
35078 #define SAVE_XMM \
35079 mov %rsp, %rax; \
35080@@ -88,6 +89,7 @@ ENTRY(efi_call)
35081 RESTORE_PGT
35082 addq $48, %rsp
35083 RESTORE_XMM
35084+ pax_force_retaddr 0, 1
35085 ret
35086 ENDPROC(efi_call)
35087
35088diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35089index 3005f0c..d06aeb0 100644
35090--- a/arch/x86/platform/intel-mid/intel-mid.c
35091+++ b/arch/x86/platform/intel-mid/intel-mid.c
35092@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35093 /* intel_mid_ops to store sub arch ops */
35094 struct intel_mid_ops *intel_mid_ops;
35095 /* getter function for sub arch ops*/
35096-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35097+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35098 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35099 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35100
35101@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35102 {
35103 };
35104
35105-static void intel_mid_reboot(void)
35106+static void __noreturn intel_mid_reboot(void)
35107 {
35108 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35109+ BUG();
35110 }
35111
35112 static unsigned long __init intel_mid_calibrate_tsc(void)
35113diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35114index 3c1c386..59a68ed 100644
35115--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35116+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35117@@ -13,6 +13,6 @@
35118 /* For every CPU addition a new get_<cpuname>_ops interface needs
35119 * to be added.
35120 */
35121-extern void *get_penwell_ops(void);
35122-extern void *get_cloverview_ops(void);
35123-extern void *get_tangier_ops(void);
35124+extern const void *get_penwell_ops(void);
35125+extern const void *get_cloverview_ops(void);
35126+extern const void *get_tangier_ops(void);
35127diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35128index 23381d2..8ddc10e 100644
35129--- a/arch/x86/platform/intel-mid/mfld.c
35130+++ b/arch/x86/platform/intel-mid/mfld.c
35131@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35132 pm_power_off = mfld_power_off;
35133 }
35134
35135-void *get_penwell_ops(void)
35136+const void *get_penwell_ops(void)
35137 {
35138 return &penwell_ops;
35139 }
35140
35141-void *get_cloverview_ops(void)
35142+const void *get_cloverview_ops(void)
35143 {
35144 return &penwell_ops;
35145 }
35146diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35147index aaca917..66eadbc 100644
35148--- a/arch/x86/platform/intel-mid/mrfl.c
35149+++ b/arch/x86/platform/intel-mid/mrfl.c
35150@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35151 .arch_setup = tangier_arch_setup,
35152 };
35153
35154-void *get_tangier_ops(void)
35155+const void *get_tangier_ops(void)
35156 {
35157 return &tangier_ops;
35158 }
35159diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35160index c9a0838..fae0977 100644
35161--- a/arch/x86/platform/intel-quark/imr_selftest.c
35162+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35163@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35164 */
35165 static void __init imr_self_test(void)
35166 {
35167- phys_addr_t base = virt_to_phys(&_text);
35168+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35169 size_t size = virt_to_phys(&__end_rodata) - base;
35170 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35171 int ret;
35172diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35173index d6ee929..3637cb5 100644
35174--- a/arch/x86/platform/olpc/olpc_dt.c
35175+++ b/arch/x86/platform/olpc/olpc_dt.c
35176@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35177 return res;
35178 }
35179
35180-static struct of_pdt_ops prom_olpc_ops __initdata = {
35181+static struct of_pdt_ops prom_olpc_ops __initconst = {
35182 .nextprop = olpc_dt_nextprop,
35183 .getproplen = olpc_dt_getproplen,
35184 .getproperty = olpc_dt_getproperty,
35185diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35186index 3e32ed5..cc0adc5 100644
35187--- a/arch/x86/power/cpu.c
35188+++ b/arch/x86/power/cpu.c
35189@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35190 static void fix_processor_context(void)
35191 {
35192 int cpu = smp_processor_id();
35193- struct tss_struct *t = &per_cpu(init_tss, cpu);
35194-#ifdef CONFIG_X86_64
35195- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35196- tss_desc tss;
35197-#endif
35198+ struct tss_struct *t = init_tss + cpu;
35199+
35200 set_tss_desc(cpu, t); /*
35201 * This just modifies memory; should not be
35202 * necessary. But... This is necessary, because
35203@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35204 */
35205
35206 #ifdef CONFIG_X86_64
35207- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35208- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35209- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35210-
35211 syscall_init(); /* This sets MSR_*STAR and related */
35212 #endif
35213 load_TR_desc(); /* This does ltr */
35214diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35215index 0b7a63d..0d0f2c2 100644
35216--- a/arch/x86/realmode/init.c
35217+++ b/arch/x86/realmode/init.c
35218@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35219 __va(real_mode_header->trampoline_header);
35220
35221 #ifdef CONFIG_X86_32
35222- trampoline_header->start = __pa_symbol(startup_32_smp);
35223+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35224+
35225+#ifdef CONFIG_PAX_KERNEXEC
35226+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35227+#endif
35228+
35229+ trampoline_header->boot_cs = __BOOT_CS;
35230 trampoline_header->gdt_limit = __BOOT_DS + 7;
35231 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35232 #else
35233@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35234 *trampoline_cr4_features = __read_cr4();
35235
35236 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35237- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35238+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35239 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35240 #endif
35241 }
35242diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35243index 2730d77..2e4cd19 100644
35244--- a/arch/x86/realmode/rm/Makefile
35245+++ b/arch/x86/realmode/rm/Makefile
35246@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35247
35248 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35249 -I$(srctree)/arch/x86/boot
35250+ifdef CONSTIFY_PLUGIN
35251+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35252+endif
35253 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35254 GCOV_PROFILE := n
35255diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35256index a28221d..93c40f1 100644
35257--- a/arch/x86/realmode/rm/header.S
35258+++ b/arch/x86/realmode/rm/header.S
35259@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35260 #endif
35261 /* APM/BIOS reboot */
35262 .long pa_machine_real_restart_asm
35263-#ifdef CONFIG_X86_64
35264+#ifdef CONFIG_X86_32
35265+ .long __KERNEL_CS
35266+#else
35267 .long __KERNEL32_CS
35268 #endif
35269 END(real_mode_header)
35270diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35271index d66c607..3def845 100644
35272--- a/arch/x86/realmode/rm/reboot.S
35273+++ b/arch/x86/realmode/rm/reboot.S
35274@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35275 lgdtl pa_tr_gdt
35276
35277 /* Disable paging to drop us out of long mode */
35278+ movl %cr4, %eax
35279+ andl $~X86_CR4_PCIDE, %eax
35280+ movl %eax, %cr4
35281+
35282 movl %cr0, %eax
35283 andl $~X86_CR0_PG, %eax
35284 movl %eax, %cr0
35285diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35286index 48ddd76..c26749f 100644
35287--- a/arch/x86/realmode/rm/trampoline_32.S
35288+++ b/arch/x86/realmode/rm/trampoline_32.S
35289@@ -24,6 +24,12 @@
35290 #include <asm/page_types.h>
35291 #include "realmode.h"
35292
35293+#ifdef CONFIG_PAX_KERNEXEC
35294+#define ta(X) (X)
35295+#else
35296+#define ta(X) (pa_ ## X)
35297+#endif
35298+
35299 .text
35300 .code16
35301
35302@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35303
35304 cli # We should be safe anyway
35305
35306- movl tr_start, %eax # where we need to go
35307-
35308 movl $0xA5A5A5A5, trampoline_status
35309 # write marker for master knows we're running
35310
35311@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35312 movw $1, %dx # protected mode (PE) bit
35313 lmsw %dx # into protected mode
35314
35315- ljmpl $__BOOT_CS, $pa_startup_32
35316+ ljmpl *(trampoline_header)
35317
35318 .section ".text32","ax"
35319 .code32
35320@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35321 .balign 8
35322 GLOBAL(trampoline_header)
35323 tr_start: .space 4
35324- tr_gdt_pad: .space 2
35325+ tr_boot_cs: .space 2
35326 tr_gdt: .space 6
35327 END(trampoline_header)
35328
35329diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35330index dac7b20..72dbaca 100644
35331--- a/arch/x86/realmode/rm/trampoline_64.S
35332+++ b/arch/x86/realmode/rm/trampoline_64.S
35333@@ -93,6 +93,7 @@ ENTRY(startup_32)
35334 movl %edx, %gs
35335
35336 movl pa_tr_cr4, %eax
35337+ andl $~X86_CR4_PCIDE, %eax
35338 movl %eax, %cr4 # Enable PAE mode
35339
35340 # Setup trampoline 4 level pagetables
35341@@ -106,7 +107,7 @@ ENTRY(startup_32)
35342 wrmsr
35343
35344 # Enable paging and in turn activate Long Mode
35345- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35346+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35347 movl %eax, %cr0
35348
35349 /*
35350diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35351index 9e7e147..25a4158 100644
35352--- a/arch/x86/realmode/rm/wakeup_asm.S
35353+++ b/arch/x86/realmode/rm/wakeup_asm.S
35354@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35355 lgdtl pmode_gdt
35356
35357 /* This really couldn't... */
35358- movl pmode_entry, %eax
35359 movl pmode_cr0, %ecx
35360 movl %ecx, %cr0
35361- ljmpl $__KERNEL_CS, $pa_startup_32
35362- /* -> jmp *%eax in trampoline_32.S */
35363+
35364+ ljmpl *pmode_entry
35365 #else
35366 jmp trampoline_start
35367 #endif
35368diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35369index 604a37e..e49702a 100644
35370--- a/arch/x86/tools/Makefile
35371+++ b/arch/x86/tools/Makefile
35372@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35373
35374 $(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
35375
35376-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35377+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35378 hostprogs-y += relocs
35379 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35380 PHONY += relocs
35381diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35382index 0c2fae8..88036b7 100644
35383--- a/arch/x86/tools/relocs.c
35384+++ b/arch/x86/tools/relocs.c
35385@@ -1,5 +1,7 @@
35386 /* This is included from relocs_32/64.c */
35387
35388+#include "../../../include/generated/autoconf.h"
35389+
35390 #define ElfW(type) _ElfW(ELF_BITS, type)
35391 #define _ElfW(bits, type) __ElfW(bits, type)
35392 #define __ElfW(bits, type) Elf##bits##_##type
35393@@ -11,6 +13,7 @@
35394 #define Elf_Sym ElfW(Sym)
35395
35396 static Elf_Ehdr ehdr;
35397+static Elf_Phdr *phdr;
35398
35399 struct relocs {
35400 uint32_t *offset;
35401@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35402 }
35403 }
35404
35405+static void read_phdrs(FILE *fp)
35406+{
35407+ unsigned int i;
35408+
35409+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35410+ if (!phdr) {
35411+ die("Unable to allocate %d program headers\n",
35412+ ehdr.e_phnum);
35413+ }
35414+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35415+ die("Seek to %d failed: %s\n",
35416+ ehdr.e_phoff, strerror(errno));
35417+ }
35418+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35419+ die("Cannot read ELF program headers: %s\n",
35420+ strerror(errno));
35421+ }
35422+ for(i = 0; i < ehdr.e_phnum; i++) {
35423+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35424+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35425+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35426+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35427+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35428+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35429+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35430+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35431+ }
35432+
35433+}
35434+
35435 static void read_shdrs(FILE *fp)
35436 {
35437- int i;
35438+ unsigned int i;
35439 Elf_Shdr shdr;
35440
35441 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35442@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35443
35444 static void read_strtabs(FILE *fp)
35445 {
35446- int i;
35447+ unsigned int i;
35448 for (i = 0; i < ehdr.e_shnum; i++) {
35449 struct section *sec = &secs[i];
35450 if (sec->shdr.sh_type != SHT_STRTAB) {
35451@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35452
35453 static void read_symtabs(FILE *fp)
35454 {
35455- int i,j;
35456+ unsigned int i,j;
35457 for (i = 0; i < ehdr.e_shnum; i++) {
35458 struct section *sec = &secs[i];
35459 if (sec->shdr.sh_type != SHT_SYMTAB) {
35460@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35461 }
35462
35463
35464-static void read_relocs(FILE *fp)
35465+static void read_relocs(FILE *fp, int use_real_mode)
35466 {
35467- int i,j;
35468+ unsigned int i,j;
35469+ uint32_t base;
35470+
35471 for (i = 0; i < ehdr.e_shnum; i++) {
35472 struct section *sec = &secs[i];
35473 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35474@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35475 die("Cannot read symbol table: %s\n",
35476 strerror(errno));
35477 }
35478+ base = 0;
35479+
35480+#ifdef CONFIG_X86_32
35481+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35482+ if (phdr[j].p_type != PT_LOAD )
35483+ continue;
35484+ 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)
35485+ continue;
35486+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35487+ break;
35488+ }
35489+#endif
35490+
35491 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35492 Elf_Rel *rel = &sec->reltab[j];
35493- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35494+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35495 rel->r_info = elf_xword_to_cpu(rel->r_info);
35496 #if (SHT_REL_TYPE == SHT_RELA)
35497 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35498@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35499
35500 static void print_absolute_symbols(void)
35501 {
35502- int i;
35503+ unsigned int i;
35504 const char *format;
35505
35506 if (ELF_BITS == 64)
35507@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35508 for (i = 0; i < ehdr.e_shnum; i++) {
35509 struct section *sec = &secs[i];
35510 char *sym_strtab;
35511- int j;
35512+ unsigned int j;
35513
35514 if (sec->shdr.sh_type != SHT_SYMTAB) {
35515 continue;
35516@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35517
35518 static void print_absolute_relocs(void)
35519 {
35520- int i, printed = 0;
35521+ unsigned int i, printed = 0;
35522 const char *format;
35523
35524 if (ELF_BITS == 64)
35525@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35526 struct section *sec_applies, *sec_symtab;
35527 char *sym_strtab;
35528 Elf_Sym *sh_symtab;
35529- int j;
35530+ unsigned int j;
35531 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35532 continue;
35533 }
35534@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35535 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35536 Elf_Sym *sym, const char *symname))
35537 {
35538- int i;
35539+ unsigned int i;
35540 /* Walk through the relocations */
35541 for (i = 0; i < ehdr.e_shnum; i++) {
35542 char *sym_strtab;
35543 Elf_Sym *sh_symtab;
35544 struct section *sec_applies, *sec_symtab;
35545- int j;
35546+ unsigned int j;
35547 struct section *sec = &secs[i];
35548
35549 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35550@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35551 {
35552 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35553 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35554+ char *sym_strtab = sec->link->link->strtab;
35555+
35556+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35557+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35558+ return 0;
35559+
35560+#ifdef CONFIG_PAX_KERNEXEC
35561+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35562+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35563+ return 0;
35564+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35565+ return 0;
35566+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35567+ return 0;
35568+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35569+ return 0;
35570+#endif
35571
35572 switch (r_type) {
35573 case R_386_NONE:
35574@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35575
35576 static void emit_relocs(int as_text, int use_real_mode)
35577 {
35578- int i;
35579+ unsigned int i;
35580 int (*write_reloc)(uint32_t, FILE *) = write32;
35581 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35582 const char *symname);
35583@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35584 {
35585 regex_init(use_real_mode);
35586 read_ehdr(fp);
35587+ read_phdrs(fp);
35588 read_shdrs(fp);
35589 read_strtabs(fp);
35590 read_symtabs(fp);
35591- read_relocs(fp);
35592+ read_relocs(fp, use_real_mode);
35593 if (ELF_BITS == 64)
35594 percpu_init();
35595 if (show_absolute_syms) {
35596diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35597index f40281e..92728c9 100644
35598--- a/arch/x86/um/mem_32.c
35599+++ b/arch/x86/um/mem_32.c
35600@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35601 gate_vma.vm_start = FIXADDR_USER_START;
35602 gate_vma.vm_end = FIXADDR_USER_END;
35603 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35604- gate_vma.vm_page_prot = __P101;
35605+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35606
35607 return 0;
35608 }
35609diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35610index 80ffa5b..a33bd15 100644
35611--- a/arch/x86/um/tls_32.c
35612+++ b/arch/x86/um/tls_32.c
35613@@ -260,7 +260,7 @@ out:
35614 if (unlikely(task == current &&
35615 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35616 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35617- "without flushed TLS.", current->pid);
35618+ "without flushed TLS.", task_pid_nr(current));
35619 }
35620
35621 return 0;
35622diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35623index 7b9be98..39bb57f 100644
35624--- a/arch/x86/vdso/Makefile
35625+++ b/arch/x86/vdso/Makefile
35626@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35627 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35628 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35629
35630-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35631+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35632 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35633 GCOV_PROFILE := n
35634
35635diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35636index 0224987..c7d65a5 100644
35637--- a/arch/x86/vdso/vdso2c.h
35638+++ b/arch/x86/vdso/vdso2c.h
35639@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35640 unsigned long load_size = -1; /* Work around bogus warning */
35641 unsigned long mapping_size;
35642 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35643- int i;
35644+ unsigned int i;
35645 unsigned long j;
35646 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35647 *alt_sec = NULL;
35648diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35649index e904c27..b9eaa03 100644
35650--- a/arch/x86/vdso/vdso32-setup.c
35651+++ b/arch/x86/vdso/vdso32-setup.c
35652@@ -14,6 +14,7 @@
35653 #include <asm/cpufeature.h>
35654 #include <asm/processor.h>
35655 #include <asm/vdso.h>
35656+#include <asm/mman.h>
35657
35658 #ifdef CONFIG_COMPAT_VDSO
35659 #define VDSO_DEFAULT 0
35660diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35661index 1c9f750..cfddb1a 100644
35662--- a/arch/x86/vdso/vma.c
35663+++ b/arch/x86/vdso/vma.c
35664@@ -19,10 +19,7 @@
35665 #include <asm/page.h>
35666 #include <asm/hpet.h>
35667 #include <asm/desc.h>
35668-
35669-#if defined(CONFIG_X86_64)
35670-unsigned int __read_mostly vdso64_enabled = 1;
35671-#endif
35672+#include <asm/mman.h>
35673
35674 void __init init_vdso_image(const struct vdso_image *image)
35675 {
35676@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35677 .pages = no_pages,
35678 };
35679
35680+#ifdef CONFIG_PAX_RANDMMAP
35681+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35682+ calculate_addr = false;
35683+#endif
35684+
35685 if (calculate_addr) {
35686 addr = vdso_addr(current->mm->start_stack,
35687 image->size - image->sym_vvar_start);
35688@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35689 down_write(&mm->mmap_sem);
35690
35691 addr = get_unmapped_area(NULL, addr,
35692- image->size - image->sym_vvar_start, 0, 0);
35693+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35694 if (IS_ERR_VALUE(addr)) {
35695 ret = addr;
35696 goto up_fail;
35697 }
35698
35699 text_start = addr - image->sym_vvar_start;
35700- current->mm->context.vdso = (void __user *)text_start;
35701+ mm->context.vdso = text_start;
35702
35703 /*
35704 * MAYWRITE to allow gdb to COW and set breakpoints
35705@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35706 hpet_address >> PAGE_SHIFT,
35707 PAGE_SIZE,
35708 pgprot_noncached(PAGE_READONLY));
35709-
35710- if (ret)
35711- goto up_fail;
35712 }
35713 #endif
35714
35715 up_fail:
35716 if (ret)
35717- current->mm->context.vdso = NULL;
35718+ current->mm->context.vdso = 0;
35719
35720 up_write(&mm->mmap_sem);
35721 return ret;
35722@@ -191,8 +190,8 @@ static int load_vdso32(void)
35723
35724 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35725 current_thread_info()->sysenter_return =
35726- current->mm->context.vdso +
35727- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35728+ (void __force_user *)(current->mm->context.vdso +
35729+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35730
35731 return 0;
35732 }
35733@@ -201,9 +200,6 @@ static int load_vdso32(void)
35734 #ifdef CONFIG_X86_64
35735 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35736 {
35737- if (!vdso64_enabled)
35738- return 0;
35739-
35740 return map_vdso(&vdso_image_64, true);
35741 }
35742
35743@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35744 int uses_interp)
35745 {
35746 #ifdef CONFIG_X86_X32_ABI
35747- if (test_thread_flag(TIF_X32)) {
35748- if (!vdso64_enabled)
35749- return 0;
35750-
35751+ if (test_thread_flag(TIF_X32))
35752 return map_vdso(&vdso_image_x32, true);
35753- }
35754 #endif
35755
35756 return load_vdso32();
35757@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35758 #endif
35759
35760 #ifdef CONFIG_X86_64
35761-static __init int vdso_setup(char *s)
35762-{
35763- vdso64_enabled = simple_strtoul(s, NULL, 0);
35764- return 0;
35765-}
35766-__setup("vdso=", vdso_setup);
35767-#endif
35768-
35769-#ifdef CONFIG_X86_64
35770 static void vgetcpu_cpu_init(void *arg)
35771 {
35772 int cpu = smp_processor_id();
35773diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35774index e88fda8..76ce7ce 100644
35775--- a/arch/x86/xen/Kconfig
35776+++ b/arch/x86/xen/Kconfig
35777@@ -9,6 +9,7 @@ config XEN
35778 select XEN_HAVE_PVMMU
35779 depends on X86_64 || (X86_32 && X86_PAE)
35780 depends on X86_TSC
35781+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35782 help
35783 This is the Linux Xen port. Enabling this will allow the
35784 kernel to boot in a paravirtualized environment under the
35785diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35786index 5240f56..0c12163 100644
35787--- a/arch/x86/xen/enlighten.c
35788+++ b/arch/x86/xen/enlighten.c
35789@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35790
35791 struct shared_info xen_dummy_shared_info;
35792
35793-void *xen_initial_gdt;
35794-
35795 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35796 __read_mostly int xen_have_vector_callback;
35797 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35798@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35799 {
35800 unsigned long va = dtr->address;
35801 unsigned int size = dtr->size + 1;
35802- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35803- unsigned long frames[pages];
35804+ unsigned long frames[65536 / PAGE_SIZE];
35805 int f;
35806
35807 /*
35808@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35809 {
35810 unsigned long va = dtr->address;
35811 unsigned int size = dtr->size + 1;
35812- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35813- unsigned long frames[pages];
35814+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35815 int f;
35816
35817 /*
35818@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35819 * 8-byte entries, or 16 4k pages..
35820 */
35821
35822- BUG_ON(size > 65536);
35823+ BUG_ON(size > GDT_SIZE);
35824 BUG_ON(va & ~PAGE_MASK);
35825
35826 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35827@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35828 return 0;
35829 }
35830
35831-static void set_xen_basic_apic_ops(void)
35832+static void __init set_xen_basic_apic_ops(void)
35833 {
35834 apic->read = xen_apic_read;
35835 apic->write = xen_apic_write;
35836@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35837 #endif
35838 };
35839
35840-static void xen_reboot(int reason)
35841+static __noreturn void xen_reboot(int reason)
35842 {
35843 struct sched_shutdown r = { .reason = reason };
35844
35845- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35846- BUG();
35847+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35848+ BUG();
35849 }
35850
35851-static void xen_restart(char *msg)
35852+static __noreturn void xen_restart(char *msg)
35853 {
35854 xen_reboot(SHUTDOWN_reboot);
35855 }
35856
35857-static void xen_emergency_restart(void)
35858+static __noreturn void xen_emergency_restart(void)
35859 {
35860 xen_reboot(SHUTDOWN_reboot);
35861 }
35862
35863-static void xen_machine_halt(void)
35864+static __noreturn void xen_machine_halt(void)
35865 {
35866 xen_reboot(SHUTDOWN_poweroff);
35867 }
35868
35869-static void xen_machine_power_off(void)
35870+static __noreturn void xen_machine_power_off(void)
35871 {
35872 if (pm_power_off)
35873 pm_power_off();
35874@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
35875 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35876 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35877
35878- setup_stack_canary_segment(0);
35879- switch_to_new_gdt(0);
35880+ setup_stack_canary_segment(cpu);
35881+#ifdef CONFIG_X86_64
35882+ load_percpu_segment(cpu);
35883+#endif
35884+ switch_to_new_gdt(cpu);
35885
35886 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35887 pv_cpu_ops.load_gdt = xen_load_gdt;
35888@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35889 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35890
35891 /* Work out if we support NX */
35892- x86_configure_nx();
35893+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35894+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35895+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35896+ unsigned l, h;
35897+
35898+ __supported_pte_mask |= _PAGE_NX;
35899+ rdmsr(MSR_EFER, l, h);
35900+ l |= EFER_NX;
35901+ wrmsr(MSR_EFER, l, h);
35902+ }
35903+#endif
35904
35905 /* Get mfn list */
35906 xen_build_dynamic_phys_to_machine();
35907@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35908
35909 machine_ops = xen_machine_ops;
35910
35911- /*
35912- * The only reliable way to retain the initial address of the
35913- * percpu gdt_page is to remember it here, so we can go and
35914- * mark it RW later, when the initial percpu area is freed.
35915- */
35916- xen_initial_gdt = &per_cpu(gdt_page, 0);
35917-
35918 xen_smp_init();
35919
35920 #ifdef CONFIG_ACPI_NUMA
35921diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35922index adca9e2..cdba9d1 100644
35923--- a/arch/x86/xen/mmu.c
35924+++ b/arch/x86/xen/mmu.c
35925@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35926 return val;
35927 }
35928
35929-static pteval_t pte_pfn_to_mfn(pteval_t val)
35930+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35931 {
35932 if (val & _PAGE_PRESENT) {
35933 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35934@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35935 * L3_k[511] -> level2_fixmap_pgt */
35936 convert_pfn_mfn(level3_kernel_pgt);
35937
35938+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35939+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35940+ convert_pfn_mfn(level3_vmemmap_pgt);
35941 /* L3_k[511][506] -> level1_fixmap_pgt */
35942+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35943 convert_pfn_mfn(level2_fixmap_pgt);
35944 }
35945 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35946@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35947 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35948 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35949 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35950+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35951+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35952+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35953 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35954 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35955+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35956 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35957 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35958- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35959+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
35960+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
35961+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
35962+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35963
35964 /* Pin down new L4 */
35965 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35966@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
35967 pv_mmu_ops.set_pud = xen_set_pud;
35968 #if PAGETABLE_LEVELS == 4
35969 pv_mmu_ops.set_pgd = xen_set_pgd;
35970+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35971 #endif
35972
35973 /* This will work as long as patching hasn't happened yet
35974@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35975 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35976 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35977 .set_pgd = xen_set_pgd_hyper,
35978+ .set_pgd_batched = xen_set_pgd_hyper,
35979
35980 .alloc_pud = xen_alloc_pmd_init,
35981 .release_pud = xen_release_pmd_init,
35982diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35983index 08e8489..b1e182f 100644
35984--- a/arch/x86/xen/smp.c
35985+++ b/arch/x86/xen/smp.c
35986@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35987
35988 if (xen_pv_domain()) {
35989 if (!xen_feature(XENFEAT_writable_page_tables))
35990- /* We've switched to the "real" per-cpu gdt, so make
35991- * sure the old memory can be recycled. */
35992- make_lowmem_page_readwrite(xen_initial_gdt);
35993-
35994 #ifdef CONFIG_X86_32
35995 /*
35996 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35997 * expects __USER_DS
35998 */
35999- loadsegment(ds, __USER_DS);
36000- loadsegment(es, __USER_DS);
36001+ loadsegment(ds, __KERNEL_DS);
36002+ loadsegment(es, __KERNEL_DS);
36003 #endif
36004
36005 xen_filter_cpu_maps();
36006@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36007 #ifdef CONFIG_X86_32
36008 /* Note: PVH is not yet supported on x86_32. */
36009 ctxt->user_regs.fs = __KERNEL_PERCPU;
36010- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36011+ savesegment(gs, ctxt->user_regs.gs);
36012 #endif
36013 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36014
36015@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36016 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36017 ctxt->flags = VGCF_IN_KERNEL;
36018 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36019- ctxt->user_regs.ds = __USER_DS;
36020- ctxt->user_regs.es = __USER_DS;
36021+ ctxt->user_regs.ds = __KERNEL_DS;
36022+ ctxt->user_regs.es = __KERNEL_DS;
36023 ctxt->user_regs.ss = __KERNEL_DS;
36024
36025 xen_copy_trap_info(ctxt->trap_ctxt);
36026@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
36027 int rc;
36028
36029 per_cpu(current_task, cpu) = idle;
36030+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
36031 #ifdef CONFIG_X86_32
36032 irq_ctx_init(cpu);
36033 #else
36034 clear_tsk_thread_flag(idle, TIF_FORK);
36035 #endif
36036- per_cpu(kernel_stack, cpu) =
36037- (unsigned long)task_stack_page(idle) -
36038- KERNEL_STACK_OFFSET + THREAD_SIZE;
36039+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
36040
36041 xen_setup_runstate_info(cpu);
36042 xen_setup_timer(cpu);
36043@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36044
36045 void __init xen_smp_init(void)
36046 {
36047- smp_ops = xen_smp_ops;
36048+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36049 xen_fill_possible_map();
36050 }
36051
36052diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36053index fd92a64..1f72641 100644
36054--- a/arch/x86/xen/xen-asm_32.S
36055+++ b/arch/x86/xen/xen-asm_32.S
36056@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36057 pushw %fs
36058 movl $(__KERNEL_PERCPU), %eax
36059 movl %eax, %fs
36060- movl %fs:xen_vcpu, %eax
36061+ mov PER_CPU_VAR(xen_vcpu), %eax
36062 POP_FS
36063 #else
36064 movl %ss:xen_vcpu, %eax
36065diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36066index 674b2225..f1f5dc1 100644
36067--- a/arch/x86/xen/xen-head.S
36068+++ b/arch/x86/xen/xen-head.S
36069@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36070 #ifdef CONFIG_X86_32
36071 mov %esi,xen_start_info
36072 mov $init_thread_union+THREAD_SIZE,%esp
36073+#ifdef CONFIG_SMP
36074+ movl $cpu_gdt_table,%edi
36075+ movl $__per_cpu_load,%eax
36076+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36077+ rorl $16,%eax
36078+ movb %al,__KERNEL_PERCPU + 4(%edi)
36079+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36080+ movl $__per_cpu_end - 1,%eax
36081+ subl $__per_cpu_start,%eax
36082+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36083+#endif
36084 #else
36085 mov %rsi,xen_start_info
36086 mov $init_thread_union+THREAD_SIZE,%rsp
36087diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36088index 9e195c6..523ed36 100644
36089--- a/arch/x86/xen/xen-ops.h
36090+++ b/arch/x86/xen/xen-ops.h
36091@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36092 void xen_syscall32_target(void);
36093 #endif
36094
36095-extern void *xen_initial_gdt;
36096-
36097 struct trap_info;
36098 void xen_copy_trap_info(struct trap_info *traps);
36099
36100diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36101index 525bd3d..ef888b1 100644
36102--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36103+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36104@@ -119,9 +119,9 @@
36105 ----------------------------------------------------------------------*/
36106
36107 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36108-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36109 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36110 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36111+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36112
36113 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36114 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36115diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36116index 2f33760..835e50a 100644
36117--- a/arch/xtensa/variants/fsf/include/variant/core.h
36118+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36119@@ -11,6 +11,7 @@
36120 #ifndef _XTENSA_CORE_H
36121 #define _XTENSA_CORE_H
36122
36123+#include <linux/const.h>
36124
36125 /****************************************************************************
36126 Parameters Useful for Any Code, USER or PRIVILEGED
36127@@ -112,9 +113,9 @@
36128 ----------------------------------------------------------------------*/
36129
36130 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36131-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36132 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36133 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36134+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36135
36136 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36137 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36138diff --git a/block/bio.c b/block/bio.c
36139index f66a4ea..73ddf55 100644
36140--- a/block/bio.c
36141+++ b/block/bio.c
36142@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36143 /*
36144 * Overflow, abort
36145 */
36146- if (end < start)
36147+ if (end < start || end - start > INT_MAX - nr_pages)
36148 return ERR_PTR(-EINVAL);
36149
36150 nr_pages += end - start;
36151@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36152 /*
36153 * Overflow, abort
36154 */
36155- if (end < start)
36156+ if (end < start || end - start > INT_MAX - nr_pages)
36157 return ERR_PTR(-EINVAL);
36158
36159 nr_pages += end - start;
36160diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36161index 0736729..2ec3b48 100644
36162--- a/block/blk-iopoll.c
36163+++ b/block/blk-iopoll.c
36164@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36165 }
36166 EXPORT_SYMBOL(blk_iopoll_complete);
36167
36168-static void blk_iopoll_softirq(struct softirq_action *h)
36169+static __latent_entropy void blk_iopoll_softirq(void)
36170 {
36171 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36172 int rearm = 0, budget = blk_iopoll_budget;
36173diff --git a/block/blk-map.c b/block/blk-map.c
36174index b8d2725..08c52b0 100644
36175--- a/block/blk-map.c
36176+++ b/block/blk-map.c
36177@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36178 if (!len || !kbuf)
36179 return -EINVAL;
36180
36181- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36182+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36183 if (do_copy)
36184 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36185 else
36186diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36187index 53b1737..08177d2e 100644
36188--- a/block/blk-softirq.c
36189+++ b/block/blk-softirq.c
36190@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36191 * Softirq action handler - move entries to local list and loop over them
36192 * while passing them to the queue registered handler.
36193 */
36194-static void blk_done_softirq(struct softirq_action *h)
36195+static __latent_entropy void blk_done_softirq(void)
36196 {
36197 struct list_head *cpu_list, local_list;
36198
36199diff --git a/block/bsg.c b/block/bsg.c
36200index d214e92..9649863 100644
36201--- a/block/bsg.c
36202+++ b/block/bsg.c
36203@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36204 struct sg_io_v4 *hdr, struct bsg_device *bd,
36205 fmode_t has_write_perm)
36206 {
36207+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36208+ unsigned char *cmdptr;
36209+
36210 if (hdr->request_len > BLK_MAX_CDB) {
36211 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36212 if (!rq->cmd)
36213 return -ENOMEM;
36214- }
36215+ cmdptr = rq->cmd;
36216+ } else
36217+ cmdptr = tmpcmd;
36218
36219- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36220+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36221 hdr->request_len))
36222 return -EFAULT;
36223
36224+ if (cmdptr != rq->cmd)
36225+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36226+
36227 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36228 if (blk_verify_command(rq->cmd, has_write_perm))
36229 return -EPERM;
36230diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36231index f678c73..f35aa18 100644
36232--- a/block/compat_ioctl.c
36233+++ b/block/compat_ioctl.c
36234@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36235 cgc = compat_alloc_user_space(sizeof(*cgc));
36236 cgc32 = compat_ptr(arg);
36237
36238- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36239+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36240 get_user(data, &cgc32->buffer) ||
36241 put_user(compat_ptr(data), &cgc->buffer) ||
36242 copy_in_user(&cgc->buflen, &cgc32->buflen,
36243@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36244 err |= __get_user(f->spec1, &uf->spec1);
36245 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36246 err |= __get_user(name, &uf->name);
36247- f->name = compat_ptr(name);
36248+ f->name = (void __force_kernel *)compat_ptr(name);
36249 if (err) {
36250 err = -EFAULT;
36251 goto out;
36252diff --git a/block/genhd.c b/block/genhd.c
36253index 0a536dc..b8f7aca 100644
36254--- a/block/genhd.c
36255+++ b/block/genhd.c
36256@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36257
36258 /*
36259 * Register device numbers dev..(dev+range-1)
36260- * range must be nonzero
36261+ * Noop if @range is zero.
36262 * The hash chain is sorted on range, so that subranges can override.
36263 */
36264 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36265 struct kobject *(*probe)(dev_t, int *, void *),
36266 int (*lock)(dev_t, void *), void *data)
36267 {
36268- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36269+ if (range)
36270+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36271 }
36272
36273 EXPORT_SYMBOL(blk_register_region);
36274
36275+/* undo blk_register_region(), noop if @range is zero */
36276 void blk_unregister_region(dev_t devt, unsigned long range)
36277 {
36278- kobj_unmap(bdev_map, devt, range);
36279+ if (range)
36280+ kobj_unmap(bdev_map, devt, range);
36281 }
36282
36283 EXPORT_SYMBOL(blk_unregister_region);
36284diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36285index 26cb624..a49c3a5 100644
36286--- a/block/partitions/efi.c
36287+++ b/block/partitions/efi.c
36288@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36289 if (!gpt)
36290 return NULL;
36291
36292+ if (!le32_to_cpu(gpt->num_partition_entries))
36293+ return NULL;
36294+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36295+ if (!pte)
36296+ return NULL;
36297+
36298 count = le32_to_cpu(gpt->num_partition_entries) *
36299 le32_to_cpu(gpt->sizeof_partition_entry);
36300- if (!count)
36301- return NULL;
36302- pte = kmalloc(count, GFP_KERNEL);
36303- if (!pte)
36304- return NULL;
36305-
36306 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36307 (u8 *) pte, count) < count) {
36308 kfree(pte);
36309diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36310index e1f71c3..02d295a 100644
36311--- a/block/scsi_ioctl.c
36312+++ b/block/scsi_ioctl.c
36313@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36314 return put_user(0, p);
36315 }
36316
36317-static int sg_get_timeout(struct request_queue *q)
36318+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36319 {
36320 return jiffies_to_clock_t(q->sg_timeout);
36321 }
36322@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36323 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36324 struct sg_io_hdr *hdr, fmode_t mode)
36325 {
36326- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36327+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36328+ unsigned char *cmdptr;
36329+
36330+ if (rq->cmd != rq->__cmd)
36331+ cmdptr = rq->cmd;
36332+ else
36333+ cmdptr = tmpcmd;
36334+
36335+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36336 return -EFAULT;
36337+
36338+ if (cmdptr != rq->cmd)
36339+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36340+
36341 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36342 return -EPERM;
36343
36344@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36345 int err;
36346 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36347 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36348+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36349+ unsigned char *cmdptr;
36350
36351 if (!sic)
36352 return -EINVAL;
36353@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36354 */
36355 err = -EFAULT;
36356 rq->cmd_len = cmdlen;
36357- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36358+
36359+ if (rq->cmd != rq->__cmd)
36360+ cmdptr = rq->cmd;
36361+ else
36362+ cmdptr = tmpcmd;
36363+
36364+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36365 goto error;
36366
36367+ if (rq->cmd != cmdptr)
36368+ memcpy(rq->cmd, cmdptr, cmdlen);
36369+
36370 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36371 goto error;
36372
36373diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36374index 650afac1..f3307de 100644
36375--- a/crypto/cryptd.c
36376+++ b/crypto/cryptd.c
36377@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36378
36379 struct cryptd_blkcipher_request_ctx {
36380 crypto_completion_t complete;
36381-};
36382+} __no_const;
36383
36384 struct cryptd_hash_ctx {
36385 struct crypto_shash *child;
36386@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36387
36388 struct cryptd_aead_request_ctx {
36389 crypto_completion_t complete;
36390-};
36391+} __no_const;
36392
36393 static void cryptd_queue_worker(struct work_struct *work);
36394
36395diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36396index c305d41..a96de79 100644
36397--- a/crypto/pcrypt.c
36398+++ b/crypto/pcrypt.c
36399@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36400 int ret;
36401
36402 pinst->kobj.kset = pcrypt_kset;
36403- ret = kobject_add(&pinst->kobj, NULL, name);
36404+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36405 if (!ret)
36406 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36407
36408diff --git a/crypto/zlib.c b/crypto/zlib.c
36409index 0eefa9d..0fa3d29 100644
36410--- a/crypto/zlib.c
36411+++ b/crypto/zlib.c
36412@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36413 zlib_comp_exit(ctx);
36414
36415 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36416- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36417+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36418 : MAX_WBITS;
36419 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36420- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36421+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36422 : DEF_MEM_LEVEL;
36423
36424 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36425diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36426index 3b37676..898edfa 100644
36427--- a/drivers/acpi/acpica/hwxfsleep.c
36428+++ b/drivers/acpi/acpica/hwxfsleep.c
36429@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36430 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36431
36432 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36433- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36434- acpi_hw_extended_sleep},
36435- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36436- acpi_hw_extended_wake_prep},
36437- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36438+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36439+ .extended_function = acpi_hw_extended_sleep},
36440+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36441+ .extended_function = acpi_hw_extended_wake_prep},
36442+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36443+ .extended_function = acpi_hw_extended_wake}
36444 };
36445
36446 /*
36447diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36448index 16129c7..8b675cd 100644
36449--- a/drivers/acpi/apei/apei-internal.h
36450+++ b/drivers/acpi/apei/apei-internal.h
36451@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36452 struct apei_exec_ins_type {
36453 u32 flags;
36454 apei_exec_ins_func_t run;
36455-};
36456+} __do_const;
36457
36458 struct apei_exec_context {
36459 u32 ip;
36460diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36461index e82d097..0c855c1 100644
36462--- a/drivers/acpi/apei/ghes.c
36463+++ b/drivers/acpi/apei/ghes.c
36464@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36465 const struct acpi_hest_generic *generic,
36466 const struct acpi_hest_generic_status *estatus)
36467 {
36468- static atomic_t seqno;
36469+ static atomic_unchecked_t seqno;
36470 unsigned int curr_seqno;
36471 char pfx_seq[64];
36472
36473@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36474 else
36475 pfx = KERN_ERR;
36476 }
36477- curr_seqno = atomic_inc_return(&seqno);
36478+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36479 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36480 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36481 pfx_seq, generic->header.source_id);
36482diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36483index a83e3c6..c3d617f 100644
36484--- a/drivers/acpi/bgrt.c
36485+++ b/drivers/acpi/bgrt.c
36486@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36487 if (!bgrt_image)
36488 return -ENODEV;
36489
36490- bin_attr_image.private = bgrt_image;
36491- bin_attr_image.size = bgrt_image_size;
36492+ pax_open_kernel();
36493+ *(void **)&bin_attr_image.private = bgrt_image;
36494+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36495+ pax_close_kernel();
36496
36497 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36498 if (!bgrt_kobj)
36499diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36500index 9b693d5..8953d54 100644
36501--- a/drivers/acpi/blacklist.c
36502+++ b/drivers/acpi/blacklist.c
36503@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36504 u32 is_critical_error;
36505 };
36506
36507-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36508+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36509
36510 /*
36511 * POLICY: If *anything* doesn't work, put it on the blacklist.
36512@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36513 return 0;
36514 }
36515
36516-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36517+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36518 {
36519 .callback = dmi_disable_osi_vista,
36520 .ident = "Fujitsu Siemens",
36521diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36522index 8b67bd0..b59593e 100644
36523--- a/drivers/acpi/bus.c
36524+++ b/drivers/acpi/bus.c
36525@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36526 }
36527 #endif
36528
36529-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36530+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36531 /*
36532 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36533 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36534@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36535 {}
36536 };
36537 #else
36538-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36539+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36540 {}
36541 };
36542 #endif
36543diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36544index c68e724..e863008 100644
36545--- a/drivers/acpi/custom_method.c
36546+++ b/drivers/acpi/custom_method.c
36547@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36548 struct acpi_table_header table;
36549 acpi_status status;
36550
36551+#ifdef CONFIG_GRKERNSEC_KMEM
36552+ return -EPERM;
36553+#endif
36554+
36555 if (!(*ppos)) {
36556 /* parse the table header to get the table length */
36557 if (count <= sizeof(struct acpi_table_header))
36558diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36559index 735db11..91e07ff 100644
36560--- a/drivers/acpi/device_pm.c
36561+++ b/drivers/acpi/device_pm.c
36562@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36563
36564 #endif /* CONFIG_PM_SLEEP */
36565
36566+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36567+
36568 static struct dev_pm_domain acpi_general_pm_domain = {
36569 .ops = {
36570 .runtime_suspend = acpi_subsys_runtime_suspend,
36571@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36572 .restore_early = acpi_subsys_resume_early,
36573 #endif
36574 },
36575+ .detach = acpi_dev_pm_detach
36576 };
36577
36578 /**
36579@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36580 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36581 }
36582
36583- dev->pm_domain->detach = acpi_dev_pm_detach;
36584 return 0;
36585 }
36586 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36587diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36588index a8dd2f7..e15950e 100644
36589--- a/drivers/acpi/ec.c
36590+++ b/drivers/acpi/ec.c
36591@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36592 return 0;
36593 }
36594
36595-static struct dmi_system_id ec_dmi_table[] __initdata = {
36596+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36597 {
36598 ec_skip_dsdt_scan, "Compal JFL92", {
36599 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36600diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36601index 139d9e4..9a9d799 100644
36602--- a/drivers/acpi/pci_slot.c
36603+++ b/drivers/acpi/pci_slot.c
36604@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36605 return 0;
36606 }
36607
36608-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36609+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36610 /*
36611 * Fujitsu Primequest machines will return 1023 to indicate an
36612 * error if the _SUN method is evaluated on SxFy objects that
36613diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36614index d9f7158..168e742 100644
36615--- a/drivers/acpi/processor_driver.c
36616+++ b/drivers/acpi/processor_driver.c
36617@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36618 return NOTIFY_OK;
36619 }
36620
36621-static struct notifier_block __refdata acpi_cpu_notifier = {
36622+static struct notifier_block __refconst acpi_cpu_notifier = {
36623 .notifier_call = acpi_cpu_soft_notify,
36624 };
36625
36626diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36627index f98db0b..8309c83 100644
36628--- a/drivers/acpi/processor_idle.c
36629+++ b/drivers/acpi/processor_idle.c
36630@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36631 {
36632 int i, count = CPUIDLE_DRIVER_STATE_START;
36633 struct acpi_processor_cx *cx;
36634- struct cpuidle_state *state;
36635+ cpuidle_state_no_const *state;
36636 struct cpuidle_driver *drv = &acpi_idle_driver;
36637
36638 if (!pr->flags.power_setup_done)
36639diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36640index e5dd808..1eceed1 100644
36641--- a/drivers/acpi/processor_pdc.c
36642+++ b/drivers/acpi/processor_pdc.c
36643@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36644 return 0;
36645 }
36646
36647-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36648+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36649 {
36650 set_no_mwait, "Extensa 5220", {
36651 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36652diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36653index 7f251dd..47b262c 100644
36654--- a/drivers/acpi/sleep.c
36655+++ b/drivers/acpi/sleep.c
36656@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36657 return 0;
36658 }
36659
36660-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36661+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36662 {
36663 .callback = init_old_suspend_ordering,
36664 .ident = "Abit KN9 (nForce4 variant)",
36665diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36666index 13e577c..cef11ee 100644
36667--- a/drivers/acpi/sysfs.c
36668+++ b/drivers/acpi/sysfs.c
36669@@ -423,11 +423,11 @@ static u32 num_counters;
36670 static struct attribute **all_attrs;
36671 static u32 acpi_gpe_count;
36672
36673-static struct attribute_group interrupt_stats_attr_group = {
36674+static attribute_group_no_const interrupt_stats_attr_group = {
36675 .name = "interrupts",
36676 };
36677
36678-static struct kobj_attribute *counter_attrs;
36679+static kobj_attribute_no_const *counter_attrs;
36680
36681 static void delete_gpe_attr_array(void)
36682 {
36683diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36684index d24fa19..782f1e6 100644
36685--- a/drivers/acpi/thermal.c
36686+++ b/drivers/acpi/thermal.c
36687@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36688 return 0;
36689 }
36690
36691-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36692+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36693 /*
36694 * Award BIOS on this AOpen makes thermal control almost worthless.
36695 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36696diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36697index 26eb70c..4d66ddf 100644
36698--- a/drivers/acpi/video.c
36699+++ b/drivers/acpi/video.c
36700@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36701 return 0;
36702 }
36703
36704-static struct dmi_system_id video_dmi_table[] __initdata = {
36705+static const struct dmi_system_id video_dmi_table[] __initconst = {
36706 /*
36707 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36708 */
36709diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36710index 287c4ba..6a600bc 100644
36711--- a/drivers/ata/libahci.c
36712+++ b/drivers/ata/libahci.c
36713@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36714 }
36715 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36716
36717-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36718+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36719 struct ata_taskfile *tf, int is_cmd, u16 flags,
36720 unsigned long timeout_msec)
36721 {
36722diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36723index 87b4b7f..d876fbd 100644
36724--- a/drivers/ata/libata-core.c
36725+++ b/drivers/ata/libata-core.c
36726@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36727 static void ata_dev_xfermask(struct ata_device *dev);
36728 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36729
36730-atomic_t ata_print_id = ATOMIC_INIT(0);
36731+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36732
36733 struct ata_force_param {
36734 const char *name;
36735@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36736 struct ata_port *ap;
36737 unsigned int tag;
36738
36739- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36740+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36741 ap = qc->ap;
36742
36743 qc->flags = 0;
36744@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36745 struct ata_port *ap;
36746 struct ata_link *link;
36747
36748- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36749+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36750 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36751 ap = qc->ap;
36752 link = qc->dev->link;
36753@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36754 return;
36755
36756 spin_lock(&lock);
36757+ pax_open_kernel();
36758
36759 for (cur = ops->inherits; cur; cur = cur->inherits) {
36760 void **inherit = (void **)cur;
36761@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36762 if (IS_ERR(*pp))
36763 *pp = NULL;
36764
36765- ops->inherits = NULL;
36766+ *(struct ata_port_operations **)&ops->inherits = NULL;
36767
36768+ pax_close_kernel();
36769 spin_unlock(&lock);
36770 }
36771
36772@@ -6111,7 +6113,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36773
36774 /* give ports names and add SCSI hosts */
36775 for (i = 0; i < host->n_ports; i++) {
36776- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36777+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36778 host->ports[i]->local_port_no = i + 1;
36779 }
36780
36781diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36782index b061ba2..fdcd85f 100644
36783--- a/drivers/ata/libata-scsi.c
36784+++ b/drivers/ata/libata-scsi.c
36785@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
36786
36787 if (rc)
36788 return rc;
36789- ap->print_id = atomic_inc_return(&ata_print_id);
36790+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36791 return 0;
36792 }
36793 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36794diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36795index f840ca1..edd6ef3 100644
36796--- a/drivers/ata/libata.h
36797+++ b/drivers/ata/libata.h
36798@@ -53,7 +53,7 @@ enum {
36799 ATA_DNXFER_QUIET = (1 << 31),
36800 };
36801
36802-extern atomic_t ata_print_id;
36803+extern atomic_unchecked_t ata_print_id;
36804 extern int atapi_passthru16;
36805 extern int libata_fua;
36806 extern int libata_noacpi;
36807diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36808index a9b0c82..207d97d 100644
36809--- a/drivers/ata/pata_arasan_cf.c
36810+++ b/drivers/ata/pata_arasan_cf.c
36811@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36812 /* Handle platform specific quirks */
36813 if (quirk) {
36814 if (quirk & CF_BROKEN_PIO) {
36815- ap->ops->set_piomode = NULL;
36816+ pax_open_kernel();
36817+ *(void **)&ap->ops->set_piomode = NULL;
36818+ pax_close_kernel();
36819 ap->pio_mask = 0;
36820 }
36821 if (quirk & CF_BROKEN_MWDMA)
36822diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36823index f9b983a..887b9d8 100644
36824--- a/drivers/atm/adummy.c
36825+++ b/drivers/atm/adummy.c
36826@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36827 vcc->pop(vcc, skb);
36828 else
36829 dev_kfree_skb_any(skb);
36830- atomic_inc(&vcc->stats->tx);
36831+ atomic_inc_unchecked(&vcc->stats->tx);
36832
36833 return 0;
36834 }
36835diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36836index f1a9198..f466a4a 100644
36837--- a/drivers/atm/ambassador.c
36838+++ b/drivers/atm/ambassador.c
36839@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36840 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36841
36842 // VC layer stats
36843- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36844+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36845
36846 // free the descriptor
36847 kfree (tx_descr);
36848@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36849 dump_skb ("<<<", vc, skb);
36850
36851 // VC layer stats
36852- atomic_inc(&atm_vcc->stats->rx);
36853+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36854 __net_timestamp(skb);
36855 // end of our responsibility
36856 atm_vcc->push (atm_vcc, skb);
36857@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36858 } else {
36859 PRINTK (KERN_INFO, "dropped over-size frame");
36860 // should we count this?
36861- atomic_inc(&atm_vcc->stats->rx_drop);
36862+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36863 }
36864
36865 } else {
36866@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36867 }
36868
36869 if (check_area (skb->data, skb->len)) {
36870- atomic_inc(&atm_vcc->stats->tx_err);
36871+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36872 return -ENOMEM; // ?
36873 }
36874
36875diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36876index 480fa6f..947067c 100644
36877--- a/drivers/atm/atmtcp.c
36878+++ b/drivers/atm/atmtcp.c
36879@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36880 if (vcc->pop) vcc->pop(vcc,skb);
36881 else dev_kfree_skb(skb);
36882 if (dev_data) return 0;
36883- atomic_inc(&vcc->stats->tx_err);
36884+ atomic_inc_unchecked(&vcc->stats->tx_err);
36885 return -ENOLINK;
36886 }
36887 size = skb->len+sizeof(struct atmtcp_hdr);
36888@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36889 if (!new_skb) {
36890 if (vcc->pop) vcc->pop(vcc,skb);
36891 else dev_kfree_skb(skb);
36892- atomic_inc(&vcc->stats->tx_err);
36893+ atomic_inc_unchecked(&vcc->stats->tx_err);
36894 return -ENOBUFS;
36895 }
36896 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36897@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36898 if (vcc->pop) vcc->pop(vcc,skb);
36899 else dev_kfree_skb(skb);
36900 out_vcc->push(out_vcc,new_skb);
36901- atomic_inc(&vcc->stats->tx);
36902- atomic_inc(&out_vcc->stats->rx);
36903+ atomic_inc_unchecked(&vcc->stats->tx);
36904+ atomic_inc_unchecked(&out_vcc->stats->rx);
36905 return 0;
36906 }
36907
36908@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36909 read_unlock(&vcc_sklist_lock);
36910 if (!out_vcc) {
36911 result = -EUNATCH;
36912- atomic_inc(&vcc->stats->tx_err);
36913+ atomic_inc_unchecked(&vcc->stats->tx_err);
36914 goto done;
36915 }
36916 skb_pull(skb,sizeof(struct atmtcp_hdr));
36917@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36918 __net_timestamp(new_skb);
36919 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36920 out_vcc->push(out_vcc,new_skb);
36921- atomic_inc(&vcc->stats->tx);
36922- atomic_inc(&out_vcc->stats->rx);
36923+ atomic_inc_unchecked(&vcc->stats->tx);
36924+ atomic_inc_unchecked(&out_vcc->stats->rx);
36925 done:
36926 if (vcc->pop) vcc->pop(vcc,skb);
36927 else dev_kfree_skb(skb);
36928diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36929index 6339efd..2b441d5 100644
36930--- a/drivers/atm/eni.c
36931+++ b/drivers/atm/eni.c
36932@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36933 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36934 vcc->dev->number);
36935 length = 0;
36936- atomic_inc(&vcc->stats->rx_err);
36937+ atomic_inc_unchecked(&vcc->stats->rx_err);
36938 }
36939 else {
36940 length = ATM_CELL_SIZE-1; /* no HEC */
36941@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36942 size);
36943 }
36944 eff = length = 0;
36945- atomic_inc(&vcc->stats->rx_err);
36946+ atomic_inc_unchecked(&vcc->stats->rx_err);
36947 }
36948 else {
36949 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36950@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36951 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36952 vcc->dev->number,vcc->vci,length,size << 2,descr);
36953 length = eff = 0;
36954- atomic_inc(&vcc->stats->rx_err);
36955+ atomic_inc_unchecked(&vcc->stats->rx_err);
36956 }
36957 }
36958 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36959@@ -770,7 +770,7 @@ rx_dequeued++;
36960 vcc->push(vcc,skb);
36961 pushed++;
36962 }
36963- atomic_inc(&vcc->stats->rx);
36964+ atomic_inc_unchecked(&vcc->stats->rx);
36965 }
36966 wake_up(&eni_dev->rx_wait);
36967 }
36968@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36969 DMA_TO_DEVICE);
36970 if (vcc->pop) vcc->pop(vcc,skb);
36971 else dev_kfree_skb_irq(skb);
36972- atomic_inc(&vcc->stats->tx);
36973+ atomic_inc_unchecked(&vcc->stats->tx);
36974 wake_up(&eni_dev->tx_wait);
36975 dma_complete++;
36976 }
36977diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36978index 82f2ae0..f205c02 100644
36979--- a/drivers/atm/firestream.c
36980+++ b/drivers/atm/firestream.c
36981@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36982 }
36983 }
36984
36985- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36986+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36987
36988 fs_dprintk (FS_DEBUG_TXMEM, "i");
36989 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36990@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36991 #endif
36992 skb_put (skb, qe->p1 & 0xffff);
36993 ATM_SKB(skb)->vcc = atm_vcc;
36994- atomic_inc(&atm_vcc->stats->rx);
36995+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36996 __net_timestamp(skb);
36997 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36998 atm_vcc->push (atm_vcc, skb);
36999@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37000 kfree (pe);
37001 }
37002 if (atm_vcc)
37003- atomic_inc(&atm_vcc->stats->rx_drop);
37004+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37005 break;
37006 case 0x1f: /* Reassembly abort: no buffers. */
37007 /* Silently increment error counter. */
37008 if (atm_vcc)
37009- atomic_inc(&atm_vcc->stats->rx_drop);
37010+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37011 break;
37012 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37013 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37014diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37015index 75dde90..4309ead 100644
37016--- a/drivers/atm/fore200e.c
37017+++ b/drivers/atm/fore200e.c
37018@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37019 #endif
37020 /* check error condition */
37021 if (*entry->status & STATUS_ERROR)
37022- atomic_inc(&vcc->stats->tx_err);
37023+ atomic_inc_unchecked(&vcc->stats->tx_err);
37024 else
37025- atomic_inc(&vcc->stats->tx);
37026+ atomic_inc_unchecked(&vcc->stats->tx);
37027 }
37028 }
37029
37030@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37031 if (skb == NULL) {
37032 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37033
37034- atomic_inc(&vcc->stats->rx_drop);
37035+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37036 return -ENOMEM;
37037 }
37038
37039@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37040
37041 dev_kfree_skb_any(skb);
37042
37043- atomic_inc(&vcc->stats->rx_drop);
37044+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37045 return -ENOMEM;
37046 }
37047
37048 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37049
37050 vcc->push(vcc, skb);
37051- atomic_inc(&vcc->stats->rx);
37052+ atomic_inc_unchecked(&vcc->stats->rx);
37053
37054 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37055
37056@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37057 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37058 fore200e->atm_dev->number,
37059 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37060- atomic_inc(&vcc->stats->rx_err);
37061+ atomic_inc_unchecked(&vcc->stats->rx_err);
37062 }
37063 }
37064
37065@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37066 goto retry_here;
37067 }
37068
37069- atomic_inc(&vcc->stats->tx_err);
37070+ atomic_inc_unchecked(&vcc->stats->tx_err);
37071
37072 fore200e->tx_sat++;
37073 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37074diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37075index 93dca2e..c5daa69 100644
37076--- a/drivers/atm/he.c
37077+++ b/drivers/atm/he.c
37078@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37079
37080 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37081 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37082- atomic_inc(&vcc->stats->rx_drop);
37083+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37084 goto return_host_buffers;
37085 }
37086
37087@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37088 RBRQ_LEN_ERR(he_dev->rbrq_head)
37089 ? "LEN_ERR" : "",
37090 vcc->vpi, vcc->vci);
37091- atomic_inc(&vcc->stats->rx_err);
37092+ atomic_inc_unchecked(&vcc->stats->rx_err);
37093 goto return_host_buffers;
37094 }
37095
37096@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37097 vcc->push(vcc, skb);
37098 spin_lock(&he_dev->global_lock);
37099
37100- atomic_inc(&vcc->stats->rx);
37101+ atomic_inc_unchecked(&vcc->stats->rx);
37102
37103 return_host_buffers:
37104 ++pdus_assembled;
37105@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37106 tpd->vcc->pop(tpd->vcc, tpd->skb);
37107 else
37108 dev_kfree_skb_any(tpd->skb);
37109- atomic_inc(&tpd->vcc->stats->tx_err);
37110+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37111 }
37112 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37113 return;
37114@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37115 vcc->pop(vcc, skb);
37116 else
37117 dev_kfree_skb_any(skb);
37118- atomic_inc(&vcc->stats->tx_err);
37119+ atomic_inc_unchecked(&vcc->stats->tx_err);
37120 return -EINVAL;
37121 }
37122
37123@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37124 vcc->pop(vcc, skb);
37125 else
37126 dev_kfree_skb_any(skb);
37127- atomic_inc(&vcc->stats->tx_err);
37128+ atomic_inc_unchecked(&vcc->stats->tx_err);
37129 return -EINVAL;
37130 }
37131 #endif
37132@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37133 vcc->pop(vcc, skb);
37134 else
37135 dev_kfree_skb_any(skb);
37136- atomic_inc(&vcc->stats->tx_err);
37137+ atomic_inc_unchecked(&vcc->stats->tx_err);
37138 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37139 return -ENOMEM;
37140 }
37141@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37142 vcc->pop(vcc, skb);
37143 else
37144 dev_kfree_skb_any(skb);
37145- atomic_inc(&vcc->stats->tx_err);
37146+ atomic_inc_unchecked(&vcc->stats->tx_err);
37147 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37148 return -ENOMEM;
37149 }
37150@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37151 __enqueue_tpd(he_dev, tpd, cid);
37152 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37153
37154- atomic_inc(&vcc->stats->tx);
37155+ atomic_inc_unchecked(&vcc->stats->tx);
37156
37157 return 0;
37158 }
37159diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37160index 527bbd5..96570c8 100644
37161--- a/drivers/atm/horizon.c
37162+++ b/drivers/atm/horizon.c
37163@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37164 {
37165 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37166 // VC layer stats
37167- atomic_inc(&vcc->stats->rx);
37168+ atomic_inc_unchecked(&vcc->stats->rx);
37169 __net_timestamp(skb);
37170 // end of our responsibility
37171 vcc->push (vcc, skb);
37172@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37173 dev->tx_iovec = NULL;
37174
37175 // VC layer stats
37176- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37177+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37178
37179 // free the skb
37180 hrz_kfree_skb (skb);
37181diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37182index 074616b..d6b3d5f 100644
37183--- a/drivers/atm/idt77252.c
37184+++ b/drivers/atm/idt77252.c
37185@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37186 else
37187 dev_kfree_skb(skb);
37188
37189- atomic_inc(&vcc->stats->tx);
37190+ atomic_inc_unchecked(&vcc->stats->tx);
37191 }
37192
37193 atomic_dec(&scq->used);
37194@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37195 if ((sb = dev_alloc_skb(64)) == NULL) {
37196 printk("%s: Can't allocate buffers for aal0.\n",
37197 card->name);
37198- atomic_add(i, &vcc->stats->rx_drop);
37199+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37200 break;
37201 }
37202 if (!atm_charge(vcc, sb->truesize)) {
37203 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37204 card->name);
37205- atomic_add(i - 1, &vcc->stats->rx_drop);
37206+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37207 dev_kfree_skb(sb);
37208 break;
37209 }
37210@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37211 ATM_SKB(sb)->vcc = vcc;
37212 __net_timestamp(sb);
37213 vcc->push(vcc, sb);
37214- atomic_inc(&vcc->stats->rx);
37215+ atomic_inc_unchecked(&vcc->stats->rx);
37216
37217 cell += ATM_CELL_PAYLOAD;
37218 }
37219@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37220 "(CDC: %08x)\n",
37221 card->name, len, rpp->len, readl(SAR_REG_CDC));
37222 recycle_rx_pool_skb(card, rpp);
37223- atomic_inc(&vcc->stats->rx_err);
37224+ atomic_inc_unchecked(&vcc->stats->rx_err);
37225 return;
37226 }
37227 if (stat & SAR_RSQE_CRC) {
37228 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37229 recycle_rx_pool_skb(card, rpp);
37230- atomic_inc(&vcc->stats->rx_err);
37231+ atomic_inc_unchecked(&vcc->stats->rx_err);
37232 return;
37233 }
37234 if (skb_queue_len(&rpp->queue) > 1) {
37235@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37236 RXPRINTK("%s: Can't alloc RX skb.\n",
37237 card->name);
37238 recycle_rx_pool_skb(card, rpp);
37239- atomic_inc(&vcc->stats->rx_err);
37240+ atomic_inc_unchecked(&vcc->stats->rx_err);
37241 return;
37242 }
37243 if (!atm_charge(vcc, skb->truesize)) {
37244@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37245 __net_timestamp(skb);
37246
37247 vcc->push(vcc, skb);
37248- atomic_inc(&vcc->stats->rx);
37249+ atomic_inc_unchecked(&vcc->stats->rx);
37250
37251 return;
37252 }
37253@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37254 __net_timestamp(skb);
37255
37256 vcc->push(vcc, skb);
37257- atomic_inc(&vcc->stats->rx);
37258+ atomic_inc_unchecked(&vcc->stats->rx);
37259
37260 if (skb->truesize > SAR_FB_SIZE_3)
37261 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37262@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37263 if (vcc->qos.aal != ATM_AAL0) {
37264 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37265 card->name, vpi, vci);
37266- atomic_inc(&vcc->stats->rx_drop);
37267+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37268 goto drop;
37269 }
37270
37271 if ((sb = dev_alloc_skb(64)) == NULL) {
37272 printk("%s: Can't allocate buffers for AAL0.\n",
37273 card->name);
37274- atomic_inc(&vcc->stats->rx_err);
37275+ atomic_inc_unchecked(&vcc->stats->rx_err);
37276 goto drop;
37277 }
37278
37279@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37280 ATM_SKB(sb)->vcc = vcc;
37281 __net_timestamp(sb);
37282 vcc->push(vcc, sb);
37283- atomic_inc(&vcc->stats->rx);
37284+ atomic_inc_unchecked(&vcc->stats->rx);
37285
37286 drop:
37287 skb_pull(queue, 64);
37288@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37289
37290 if (vc == NULL) {
37291 printk("%s: NULL connection in send().\n", card->name);
37292- atomic_inc(&vcc->stats->tx_err);
37293+ atomic_inc_unchecked(&vcc->stats->tx_err);
37294 dev_kfree_skb(skb);
37295 return -EINVAL;
37296 }
37297 if (!test_bit(VCF_TX, &vc->flags)) {
37298 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37299- atomic_inc(&vcc->stats->tx_err);
37300+ atomic_inc_unchecked(&vcc->stats->tx_err);
37301 dev_kfree_skb(skb);
37302 return -EINVAL;
37303 }
37304@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37305 break;
37306 default:
37307 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37308- atomic_inc(&vcc->stats->tx_err);
37309+ atomic_inc_unchecked(&vcc->stats->tx_err);
37310 dev_kfree_skb(skb);
37311 return -EINVAL;
37312 }
37313
37314 if (skb_shinfo(skb)->nr_frags != 0) {
37315 printk("%s: No scatter-gather yet.\n", card->name);
37316- atomic_inc(&vcc->stats->tx_err);
37317+ atomic_inc_unchecked(&vcc->stats->tx_err);
37318 dev_kfree_skb(skb);
37319 return -EINVAL;
37320 }
37321@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37322
37323 err = queue_skb(card, vc, skb, oam);
37324 if (err) {
37325- atomic_inc(&vcc->stats->tx_err);
37326+ atomic_inc_unchecked(&vcc->stats->tx_err);
37327 dev_kfree_skb(skb);
37328 return err;
37329 }
37330@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37331 skb = dev_alloc_skb(64);
37332 if (!skb) {
37333 printk("%s: Out of memory in send_oam().\n", card->name);
37334- atomic_inc(&vcc->stats->tx_err);
37335+ atomic_inc_unchecked(&vcc->stats->tx_err);
37336 return -ENOMEM;
37337 }
37338 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37339diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37340index 924f8e2..3375a3e 100644
37341--- a/drivers/atm/iphase.c
37342+++ b/drivers/atm/iphase.c
37343@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37344 status = (u_short) (buf_desc_ptr->desc_mode);
37345 if (status & (RX_CER | RX_PTE | RX_OFL))
37346 {
37347- atomic_inc(&vcc->stats->rx_err);
37348+ atomic_inc_unchecked(&vcc->stats->rx_err);
37349 IF_ERR(printk("IA: bad packet, dropping it");)
37350 if (status & RX_CER) {
37351 IF_ERR(printk(" cause: packet CRC error\n");)
37352@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37353 len = dma_addr - buf_addr;
37354 if (len > iadev->rx_buf_sz) {
37355 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37356- atomic_inc(&vcc->stats->rx_err);
37357+ atomic_inc_unchecked(&vcc->stats->rx_err);
37358 goto out_free_desc;
37359 }
37360
37361@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37362 ia_vcc = INPH_IA_VCC(vcc);
37363 if (ia_vcc == NULL)
37364 {
37365- atomic_inc(&vcc->stats->rx_err);
37366+ atomic_inc_unchecked(&vcc->stats->rx_err);
37367 atm_return(vcc, skb->truesize);
37368 dev_kfree_skb_any(skb);
37369 goto INCR_DLE;
37370@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37371 if ((length > iadev->rx_buf_sz) || (length >
37372 (skb->len - sizeof(struct cpcs_trailer))))
37373 {
37374- atomic_inc(&vcc->stats->rx_err);
37375+ atomic_inc_unchecked(&vcc->stats->rx_err);
37376 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37377 length, skb->len);)
37378 atm_return(vcc, skb->truesize);
37379@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37380
37381 IF_RX(printk("rx_dle_intr: skb push");)
37382 vcc->push(vcc,skb);
37383- atomic_inc(&vcc->stats->rx);
37384+ atomic_inc_unchecked(&vcc->stats->rx);
37385 iadev->rx_pkt_cnt++;
37386 }
37387 INCR_DLE:
37388@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37389 {
37390 struct k_sonet_stats *stats;
37391 stats = &PRIV(_ia_dev[board])->sonet_stats;
37392- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37393- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37394- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37395- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37396- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37397- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37398- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37399- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37400- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37401+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37402+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37403+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37404+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37405+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37406+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37407+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37408+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37409+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37410 }
37411 ia_cmds.status = 0;
37412 break;
37413@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37414 if ((desc == 0) || (desc > iadev->num_tx_desc))
37415 {
37416 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37417- atomic_inc(&vcc->stats->tx);
37418+ atomic_inc_unchecked(&vcc->stats->tx);
37419 if (vcc->pop)
37420 vcc->pop(vcc, skb);
37421 else
37422@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37423 ATM_DESC(skb) = vcc->vci;
37424 skb_queue_tail(&iadev->tx_dma_q, skb);
37425
37426- atomic_inc(&vcc->stats->tx);
37427+ atomic_inc_unchecked(&vcc->stats->tx);
37428 iadev->tx_pkt_cnt++;
37429 /* Increment transaction counter */
37430 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37431
37432 #if 0
37433 /* add flow control logic */
37434- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37435+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37436 if (iavcc->vc_desc_cnt > 10) {
37437 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37438 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37439diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37440index ce43ae3..969de38 100644
37441--- a/drivers/atm/lanai.c
37442+++ b/drivers/atm/lanai.c
37443@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37444 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37445 lanai_endtx(lanai, lvcc);
37446 lanai_free_skb(lvcc->tx.atmvcc, skb);
37447- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37448+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37449 }
37450
37451 /* Try to fill the buffer - don't call unless there is backlog */
37452@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37453 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37454 __net_timestamp(skb);
37455 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37456- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37457+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37458 out:
37459 lvcc->rx.buf.ptr = end;
37460 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37461@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37462 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37463 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37464 lanai->stats.service_rxnotaal5++;
37465- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37466+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37467 return 0;
37468 }
37469 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37470@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37471 int bytes;
37472 read_unlock(&vcc_sklist_lock);
37473 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37474- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37475+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37476 lvcc->stats.x.aal5.service_trash++;
37477 bytes = (SERVICE_GET_END(s) * 16) -
37478 (((unsigned long) lvcc->rx.buf.ptr) -
37479@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37480 }
37481 if (s & SERVICE_STREAM) {
37482 read_unlock(&vcc_sklist_lock);
37483- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37484+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37485 lvcc->stats.x.aal5.service_stream++;
37486 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37487 "PDU on VCI %d!\n", lanai->number, vci);
37488@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37489 return 0;
37490 }
37491 DPRINTK("got rx crc error on vci %d\n", vci);
37492- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37493+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37494 lvcc->stats.x.aal5.service_rxcrc++;
37495 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37496 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37497diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37498index b7e1cc0..eb336bfe 100644
37499--- a/drivers/atm/nicstar.c
37500+++ b/drivers/atm/nicstar.c
37501@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37502 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37503 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37504 card->index);
37505- atomic_inc(&vcc->stats->tx_err);
37506+ atomic_inc_unchecked(&vcc->stats->tx_err);
37507 dev_kfree_skb_any(skb);
37508 return -EINVAL;
37509 }
37510@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37511 if (!vc->tx) {
37512 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37513 card->index);
37514- atomic_inc(&vcc->stats->tx_err);
37515+ atomic_inc_unchecked(&vcc->stats->tx_err);
37516 dev_kfree_skb_any(skb);
37517 return -EINVAL;
37518 }
37519@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37520 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37521 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37522 card->index);
37523- atomic_inc(&vcc->stats->tx_err);
37524+ atomic_inc_unchecked(&vcc->stats->tx_err);
37525 dev_kfree_skb_any(skb);
37526 return -EINVAL;
37527 }
37528
37529 if (skb_shinfo(skb)->nr_frags != 0) {
37530 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37531- atomic_inc(&vcc->stats->tx_err);
37532+ atomic_inc_unchecked(&vcc->stats->tx_err);
37533 dev_kfree_skb_any(skb);
37534 return -EINVAL;
37535 }
37536@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37537 }
37538
37539 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37540- atomic_inc(&vcc->stats->tx_err);
37541+ atomic_inc_unchecked(&vcc->stats->tx_err);
37542 dev_kfree_skb_any(skb);
37543 return -EIO;
37544 }
37545- atomic_inc(&vcc->stats->tx);
37546+ atomic_inc_unchecked(&vcc->stats->tx);
37547
37548 return 0;
37549 }
37550@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37551 printk
37552 ("nicstar%d: Can't allocate buffers for aal0.\n",
37553 card->index);
37554- atomic_add(i, &vcc->stats->rx_drop);
37555+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37556 break;
37557 }
37558 if (!atm_charge(vcc, sb->truesize)) {
37559 RXPRINTK
37560 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37561 card->index);
37562- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37563+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37564 dev_kfree_skb_any(sb);
37565 break;
37566 }
37567@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37568 ATM_SKB(sb)->vcc = vcc;
37569 __net_timestamp(sb);
37570 vcc->push(vcc, sb);
37571- atomic_inc(&vcc->stats->rx);
37572+ atomic_inc_unchecked(&vcc->stats->rx);
37573 cell += ATM_CELL_PAYLOAD;
37574 }
37575
37576@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37577 if (iovb == NULL) {
37578 printk("nicstar%d: Out of iovec buffers.\n",
37579 card->index);
37580- atomic_inc(&vcc->stats->rx_drop);
37581+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37582 recycle_rx_buf(card, skb);
37583 return;
37584 }
37585@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37586 small or large buffer itself. */
37587 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37588 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37589- atomic_inc(&vcc->stats->rx_err);
37590+ atomic_inc_unchecked(&vcc->stats->rx_err);
37591 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37592 NS_MAX_IOVECS);
37593 NS_PRV_IOVCNT(iovb) = 0;
37594@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37595 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37596 card->index);
37597 which_list(card, skb);
37598- atomic_inc(&vcc->stats->rx_err);
37599+ atomic_inc_unchecked(&vcc->stats->rx_err);
37600 recycle_rx_buf(card, skb);
37601 vc->rx_iov = NULL;
37602 recycle_iov_buf(card, iovb);
37603@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37604 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37605 card->index);
37606 which_list(card, skb);
37607- atomic_inc(&vcc->stats->rx_err);
37608+ atomic_inc_unchecked(&vcc->stats->rx_err);
37609 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37610 NS_PRV_IOVCNT(iovb));
37611 vc->rx_iov = NULL;
37612@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37613 printk(" - PDU size mismatch.\n");
37614 else
37615 printk(".\n");
37616- atomic_inc(&vcc->stats->rx_err);
37617+ atomic_inc_unchecked(&vcc->stats->rx_err);
37618 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37619 NS_PRV_IOVCNT(iovb));
37620 vc->rx_iov = NULL;
37621@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37622 /* skb points to a small buffer */
37623 if (!atm_charge(vcc, skb->truesize)) {
37624 push_rxbufs(card, skb);
37625- atomic_inc(&vcc->stats->rx_drop);
37626+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37627 } else {
37628 skb_put(skb, len);
37629 dequeue_sm_buf(card, skb);
37630@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37631 ATM_SKB(skb)->vcc = vcc;
37632 __net_timestamp(skb);
37633 vcc->push(vcc, skb);
37634- atomic_inc(&vcc->stats->rx);
37635+ atomic_inc_unchecked(&vcc->stats->rx);
37636 }
37637 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37638 struct sk_buff *sb;
37639@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37640 if (len <= NS_SMBUFSIZE) {
37641 if (!atm_charge(vcc, sb->truesize)) {
37642 push_rxbufs(card, sb);
37643- atomic_inc(&vcc->stats->rx_drop);
37644+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37645 } else {
37646 skb_put(sb, len);
37647 dequeue_sm_buf(card, sb);
37648@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37649 ATM_SKB(sb)->vcc = vcc;
37650 __net_timestamp(sb);
37651 vcc->push(vcc, sb);
37652- atomic_inc(&vcc->stats->rx);
37653+ atomic_inc_unchecked(&vcc->stats->rx);
37654 }
37655
37656 push_rxbufs(card, skb);
37657@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37658
37659 if (!atm_charge(vcc, skb->truesize)) {
37660 push_rxbufs(card, skb);
37661- atomic_inc(&vcc->stats->rx_drop);
37662+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37663 } else {
37664 dequeue_lg_buf(card, skb);
37665 #ifdef NS_USE_DESTRUCTORS
37666@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37667 ATM_SKB(skb)->vcc = vcc;
37668 __net_timestamp(skb);
37669 vcc->push(vcc, skb);
37670- atomic_inc(&vcc->stats->rx);
37671+ atomic_inc_unchecked(&vcc->stats->rx);
37672 }
37673
37674 push_rxbufs(card, sb);
37675@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37676 printk
37677 ("nicstar%d: Out of huge buffers.\n",
37678 card->index);
37679- atomic_inc(&vcc->stats->rx_drop);
37680+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37681 recycle_iovec_rx_bufs(card,
37682 (struct iovec *)
37683 iovb->data,
37684@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37685 card->hbpool.count++;
37686 } else
37687 dev_kfree_skb_any(hb);
37688- atomic_inc(&vcc->stats->rx_drop);
37689+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37690 } else {
37691 /* Copy the small buffer to the huge buffer */
37692 sb = (struct sk_buff *)iov->iov_base;
37693@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37694 #endif /* NS_USE_DESTRUCTORS */
37695 __net_timestamp(hb);
37696 vcc->push(vcc, hb);
37697- atomic_inc(&vcc->stats->rx);
37698+ atomic_inc_unchecked(&vcc->stats->rx);
37699 }
37700 }
37701
37702diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37703index 74e18b0..f16afa0 100644
37704--- a/drivers/atm/solos-pci.c
37705+++ b/drivers/atm/solos-pci.c
37706@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37707 }
37708 atm_charge(vcc, skb->truesize);
37709 vcc->push(vcc, skb);
37710- atomic_inc(&vcc->stats->rx);
37711+ atomic_inc_unchecked(&vcc->stats->rx);
37712 break;
37713
37714 case PKT_STATUS:
37715@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37716 vcc = SKB_CB(oldskb)->vcc;
37717
37718 if (vcc) {
37719- atomic_inc(&vcc->stats->tx);
37720+ atomic_inc_unchecked(&vcc->stats->tx);
37721 solos_pop(vcc, oldskb);
37722 } else {
37723 dev_kfree_skb_irq(oldskb);
37724diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37725index 0215934..ce9f5b1 100644
37726--- a/drivers/atm/suni.c
37727+++ b/drivers/atm/suni.c
37728@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37729
37730
37731 #define ADD_LIMITED(s,v) \
37732- atomic_add((v),&stats->s); \
37733- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37734+ atomic_add_unchecked((v),&stats->s); \
37735+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37736
37737
37738 static void suni_hz(unsigned long from_timer)
37739diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37740index 5120a96..e2572bd 100644
37741--- a/drivers/atm/uPD98402.c
37742+++ b/drivers/atm/uPD98402.c
37743@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37744 struct sonet_stats tmp;
37745 int error = 0;
37746
37747- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37748+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37749 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37750 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37751 if (zero && !error) {
37752@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37753
37754
37755 #define ADD_LIMITED(s,v) \
37756- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37757- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37758- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37759+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37760+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37761+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37762
37763
37764 static void stat_event(struct atm_dev *dev)
37765@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37766 if (reason & uPD98402_INT_PFM) stat_event(dev);
37767 if (reason & uPD98402_INT_PCO) {
37768 (void) GET(PCOCR); /* clear interrupt cause */
37769- atomic_add(GET(HECCT),
37770+ atomic_add_unchecked(GET(HECCT),
37771 &PRIV(dev)->sonet_stats.uncorr_hcs);
37772 }
37773 if ((reason & uPD98402_INT_RFO) &&
37774@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37775 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37776 uPD98402_INT_LOS),PIMR); /* enable them */
37777 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37778- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37779- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37780- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37781+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37782+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37783+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37784 return 0;
37785 }
37786
37787diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37788index cecfb94..87009ec 100644
37789--- a/drivers/atm/zatm.c
37790+++ b/drivers/atm/zatm.c
37791@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37792 }
37793 if (!size) {
37794 dev_kfree_skb_irq(skb);
37795- if (vcc) atomic_inc(&vcc->stats->rx_err);
37796+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37797 continue;
37798 }
37799 if (!atm_charge(vcc,skb->truesize)) {
37800@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37801 skb->len = size;
37802 ATM_SKB(skb)->vcc = vcc;
37803 vcc->push(vcc,skb);
37804- atomic_inc(&vcc->stats->rx);
37805+ atomic_inc_unchecked(&vcc->stats->rx);
37806 }
37807 zout(pos & 0xffff,MTA(mbx));
37808 #if 0 /* probably a stupid idea */
37809@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37810 skb_queue_head(&zatm_vcc->backlog,skb);
37811 break;
37812 }
37813- atomic_inc(&vcc->stats->tx);
37814+ atomic_inc_unchecked(&vcc->stats->tx);
37815 wake_up(&zatm_vcc->tx_wait);
37816 }
37817
37818diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37819index 79bc203..fa3945b 100644
37820--- a/drivers/base/bus.c
37821+++ b/drivers/base/bus.c
37822@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37823 return -EINVAL;
37824
37825 mutex_lock(&subsys->p->mutex);
37826- list_add_tail(&sif->node, &subsys->p->interfaces);
37827+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37828 if (sif->add_dev) {
37829 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37830 while ((dev = subsys_dev_iter_next(&iter)))
37831@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37832 subsys = sif->subsys;
37833
37834 mutex_lock(&subsys->p->mutex);
37835- list_del_init(&sif->node);
37836+ pax_list_del_init((struct list_head *)&sif->node);
37837 if (sif->remove_dev) {
37838 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37839 while ((dev = subsys_dev_iter_next(&iter)))
37840diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37841index 25798db..15f130e 100644
37842--- a/drivers/base/devtmpfs.c
37843+++ b/drivers/base/devtmpfs.c
37844@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37845 if (!thread)
37846 return 0;
37847
37848- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37849+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37850 if (err)
37851 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37852 else
37853@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37854 *err = sys_unshare(CLONE_NEWNS);
37855 if (*err)
37856 goto out;
37857- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37858+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37859 if (*err)
37860 goto out;
37861- sys_chdir("/.."); /* will traverse into overmounted root */
37862- sys_chroot(".");
37863+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37864+ sys_chroot((char __force_user *)".");
37865 complete(&setup_done);
37866 while (1) {
37867 spin_lock(&req_lock);
37868diff --git a/drivers/base/node.c b/drivers/base/node.c
37869index 36fabe43..8cfc112 100644
37870--- a/drivers/base/node.c
37871+++ b/drivers/base/node.c
37872@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37873 struct node_attr {
37874 struct device_attribute attr;
37875 enum node_states state;
37876-};
37877+} __do_const;
37878
37879 static ssize_t show_node_state(struct device *dev,
37880 struct device_attribute *attr, char *buf)
37881diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37882index 45937f8..b9a342e 100644
37883--- a/drivers/base/power/domain.c
37884+++ b/drivers/base/power/domain.c
37885@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37886 {
37887 struct cpuidle_driver *cpuidle_drv;
37888 struct gpd_cpuidle_data *cpuidle_data;
37889- struct cpuidle_state *idle_state;
37890+ cpuidle_state_no_const *idle_state;
37891 int ret = 0;
37892
37893 if (IS_ERR_OR_NULL(genpd) || state < 0)
37894@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37895 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37896 {
37897 struct gpd_cpuidle_data *cpuidle_data;
37898- struct cpuidle_state *idle_state;
37899+ cpuidle_state_no_const *idle_state;
37900 int ret = 0;
37901
37902 if (IS_ERR_OR_NULL(genpd))
37903@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
37904 return ret;
37905 }
37906
37907- dev->pm_domain->detach = genpd_dev_pm_detach;
37908+ pax_open_kernel();
37909+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37910+ pax_close_kernel();
37911+
37912 pm_genpd_poweron(pd);
37913
37914 return 0;
37915diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37916index d2be3f9..0a3167a 100644
37917--- a/drivers/base/power/sysfs.c
37918+++ b/drivers/base/power/sysfs.c
37919@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37920 return -EIO;
37921 }
37922 }
37923- return sprintf(buf, p);
37924+ return sprintf(buf, "%s", p);
37925 }
37926
37927 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37928diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37929index aab7158..b172db2 100644
37930--- a/drivers/base/power/wakeup.c
37931+++ b/drivers/base/power/wakeup.c
37932@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37933 * They need to be modified together atomically, so it's better to use one
37934 * atomic variable to hold them both.
37935 */
37936-static atomic_t combined_event_count = ATOMIC_INIT(0);
37937+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37938
37939 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37940 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37941
37942 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37943 {
37944- unsigned int comb = atomic_read(&combined_event_count);
37945+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37946
37947 *cnt = (comb >> IN_PROGRESS_BITS);
37948 *inpr = comb & MAX_IN_PROGRESS;
37949@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37950 ws->start_prevent_time = ws->last_time;
37951
37952 /* Increment the counter of events in progress. */
37953- cec = atomic_inc_return(&combined_event_count);
37954+ cec = atomic_inc_return_unchecked(&combined_event_count);
37955
37956 trace_wakeup_source_activate(ws->name, cec);
37957 }
37958@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37959 * Increment the counter of registered wakeup events and decrement the
37960 * couter of wakeup events in progress simultaneously.
37961 */
37962- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37963+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37964 trace_wakeup_source_deactivate(ws->name, cec);
37965
37966 split_counters(&cnt, &inpr);
37967diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37968index 8d98a32..61d3165 100644
37969--- a/drivers/base/syscore.c
37970+++ b/drivers/base/syscore.c
37971@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37972 void register_syscore_ops(struct syscore_ops *ops)
37973 {
37974 mutex_lock(&syscore_ops_lock);
37975- list_add_tail(&ops->node, &syscore_ops_list);
37976+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37977 mutex_unlock(&syscore_ops_lock);
37978 }
37979 EXPORT_SYMBOL_GPL(register_syscore_ops);
37980@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37981 void unregister_syscore_ops(struct syscore_ops *ops)
37982 {
37983 mutex_lock(&syscore_ops_lock);
37984- list_del(&ops->node);
37985+ pax_list_del((struct list_head *)&ops->node);
37986 mutex_unlock(&syscore_ops_lock);
37987 }
37988 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37989diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37990index ff20f19..018f1da 100644
37991--- a/drivers/block/cciss.c
37992+++ b/drivers/block/cciss.c
37993@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37994 while (!list_empty(&h->reqQ)) {
37995 c = list_entry(h->reqQ.next, CommandList_struct, list);
37996 /* can't do anything if fifo is full */
37997- if ((h->access.fifo_full(h))) {
37998+ if ((h->access->fifo_full(h))) {
37999 dev_warn(&h->pdev->dev, "fifo full\n");
38000 break;
38001 }
38002@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38003 h->Qdepth--;
38004
38005 /* Tell the controller execute command */
38006- h->access.submit_command(h, c);
38007+ h->access->submit_command(h, c);
38008
38009 /* Put job onto the completed Q */
38010 addQ(&h->cmpQ, c);
38011@@ -3444,17 +3444,17 @@ startio:
38012
38013 static inline unsigned long get_next_completion(ctlr_info_t *h)
38014 {
38015- return h->access.command_completed(h);
38016+ return h->access->command_completed(h);
38017 }
38018
38019 static inline int interrupt_pending(ctlr_info_t *h)
38020 {
38021- return h->access.intr_pending(h);
38022+ return h->access->intr_pending(h);
38023 }
38024
38025 static inline long interrupt_not_for_us(ctlr_info_t *h)
38026 {
38027- return ((h->access.intr_pending(h) == 0) ||
38028+ return ((h->access->intr_pending(h) == 0) ||
38029 (h->interrupts_enabled == 0));
38030 }
38031
38032@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38033 u32 a;
38034
38035 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38036- return h->access.command_completed(h);
38037+ return h->access->command_completed(h);
38038
38039 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38040 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38041@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38042 trans_support & CFGTBL_Trans_use_short_tags);
38043
38044 /* Change the access methods to the performant access methods */
38045- h->access = SA5_performant_access;
38046+ h->access = &SA5_performant_access;
38047 h->transMethod = CFGTBL_Trans_Performant;
38048
38049 return;
38050@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38051 if (prod_index < 0)
38052 return -ENODEV;
38053 h->product_name = products[prod_index].product_name;
38054- h->access = *(products[prod_index].access);
38055+ h->access = products[prod_index].access;
38056
38057 if (cciss_board_disabled(h)) {
38058 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38059@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38060 }
38061
38062 /* make sure the board interrupts are off */
38063- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38064+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38065 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38066 if (rc)
38067 goto clean2;
38068@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38069 * fake ones to scoop up any residual completions.
38070 */
38071 spin_lock_irqsave(&h->lock, flags);
38072- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38073+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38074 spin_unlock_irqrestore(&h->lock, flags);
38075 free_irq(h->intr[h->intr_mode], h);
38076 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38077@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38078 dev_info(&h->pdev->dev, "Board READY.\n");
38079 dev_info(&h->pdev->dev,
38080 "Waiting for stale completions to drain.\n");
38081- h->access.set_intr_mask(h, CCISS_INTR_ON);
38082+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38083 msleep(10000);
38084- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38085+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38086
38087 rc = controller_reset_failed(h->cfgtable);
38088 if (rc)
38089@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38090 cciss_scsi_setup(h);
38091
38092 /* Turn the interrupts on so we can service requests */
38093- h->access.set_intr_mask(h, CCISS_INTR_ON);
38094+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38095
38096 /* Get the firmware version */
38097 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38098@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38099 kfree(flush_buf);
38100 if (return_code != IO_OK)
38101 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38102- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38103+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38104 free_irq(h->intr[h->intr_mode], h);
38105 }
38106
38107diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38108index 7fda30e..2f27946 100644
38109--- a/drivers/block/cciss.h
38110+++ b/drivers/block/cciss.h
38111@@ -101,7 +101,7 @@ struct ctlr_info
38112 /* information about each logical volume */
38113 drive_info_struct *drv[CISS_MAX_LUN];
38114
38115- struct access_method access;
38116+ struct access_method *access;
38117
38118 /* queue and queue Info */
38119 struct list_head reqQ;
38120@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38121 }
38122
38123 static struct access_method SA5_access = {
38124- SA5_submit_command,
38125- SA5_intr_mask,
38126- SA5_fifo_full,
38127- SA5_intr_pending,
38128- SA5_completed,
38129+ .submit_command = SA5_submit_command,
38130+ .set_intr_mask = SA5_intr_mask,
38131+ .fifo_full = SA5_fifo_full,
38132+ .intr_pending = SA5_intr_pending,
38133+ .command_completed = SA5_completed,
38134 };
38135
38136 static struct access_method SA5B_access = {
38137- SA5_submit_command,
38138- SA5B_intr_mask,
38139- SA5_fifo_full,
38140- SA5B_intr_pending,
38141- SA5_completed,
38142+ .submit_command = SA5_submit_command,
38143+ .set_intr_mask = SA5B_intr_mask,
38144+ .fifo_full = SA5_fifo_full,
38145+ .intr_pending = SA5B_intr_pending,
38146+ .command_completed = SA5_completed,
38147 };
38148
38149 static struct access_method SA5_performant_access = {
38150- SA5_submit_command,
38151- SA5_performant_intr_mask,
38152- SA5_fifo_full,
38153- SA5_performant_intr_pending,
38154- SA5_performant_completed,
38155+ .submit_command = SA5_submit_command,
38156+ .set_intr_mask = SA5_performant_intr_mask,
38157+ .fifo_full = SA5_fifo_full,
38158+ .intr_pending = SA5_performant_intr_pending,
38159+ .command_completed = SA5_performant_completed,
38160 };
38161
38162 struct board_type {
38163diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38164index 2b94403..fd6ad1f 100644
38165--- a/drivers/block/cpqarray.c
38166+++ b/drivers/block/cpqarray.c
38167@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38168 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38169 goto Enomem4;
38170 }
38171- hba[i]->access.set_intr_mask(hba[i], 0);
38172+ hba[i]->access->set_intr_mask(hba[i], 0);
38173 if (request_irq(hba[i]->intr, do_ida_intr,
38174 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38175 {
38176@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38177 add_timer(&hba[i]->timer);
38178
38179 /* Enable IRQ now that spinlock and rate limit timer are set up */
38180- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38181+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38182
38183 for(j=0; j<NWD; j++) {
38184 struct gendisk *disk = ida_gendisk[i][j];
38185@@ -694,7 +694,7 @@ DBGINFO(
38186 for(i=0; i<NR_PRODUCTS; i++) {
38187 if (board_id == products[i].board_id) {
38188 c->product_name = products[i].product_name;
38189- c->access = *(products[i].access);
38190+ c->access = products[i].access;
38191 break;
38192 }
38193 }
38194@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38195 hba[ctlr]->intr = intr;
38196 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38197 hba[ctlr]->product_name = products[j].product_name;
38198- hba[ctlr]->access = *(products[j].access);
38199+ hba[ctlr]->access = products[j].access;
38200 hba[ctlr]->ctlr = ctlr;
38201 hba[ctlr]->board_id = board_id;
38202 hba[ctlr]->pci_dev = NULL; /* not PCI */
38203@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38204
38205 while((c = h->reqQ) != NULL) {
38206 /* Can't do anything if we're busy */
38207- if (h->access.fifo_full(h) == 0)
38208+ if (h->access->fifo_full(h) == 0)
38209 return;
38210
38211 /* Get the first entry from the request Q */
38212@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38213 h->Qdepth--;
38214
38215 /* Tell the controller to do our bidding */
38216- h->access.submit_command(h, c);
38217+ h->access->submit_command(h, c);
38218
38219 /* Get onto the completion Q */
38220 addQ(&h->cmpQ, c);
38221@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38222 unsigned long flags;
38223 __u32 a,a1;
38224
38225- istat = h->access.intr_pending(h);
38226+ istat = h->access->intr_pending(h);
38227 /* Is this interrupt for us? */
38228 if (istat == 0)
38229 return IRQ_NONE;
38230@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38231 */
38232 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38233 if (istat & FIFO_NOT_EMPTY) {
38234- while((a = h->access.command_completed(h))) {
38235+ while((a = h->access->command_completed(h))) {
38236 a1 = a; a &= ~3;
38237 if ((c = h->cmpQ) == NULL)
38238 {
38239@@ -1448,11 +1448,11 @@ static int sendcmd(
38240 /*
38241 * Disable interrupt
38242 */
38243- info_p->access.set_intr_mask(info_p, 0);
38244+ info_p->access->set_intr_mask(info_p, 0);
38245 /* Make sure there is room in the command FIFO */
38246 /* Actually it should be completely empty at this time. */
38247 for (i = 200000; i > 0; i--) {
38248- temp = info_p->access.fifo_full(info_p);
38249+ temp = info_p->access->fifo_full(info_p);
38250 if (temp != 0) {
38251 break;
38252 }
38253@@ -1465,7 +1465,7 @@ DBG(
38254 /*
38255 * Send the cmd
38256 */
38257- info_p->access.submit_command(info_p, c);
38258+ info_p->access->submit_command(info_p, c);
38259 complete = pollcomplete(ctlr);
38260
38261 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38262@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38263 * we check the new geometry. Then turn interrupts back on when
38264 * we're done.
38265 */
38266- host->access.set_intr_mask(host, 0);
38267+ host->access->set_intr_mask(host, 0);
38268 getgeometry(ctlr);
38269- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38270+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38271
38272 for(i=0; i<NWD; i++) {
38273 struct gendisk *disk = ida_gendisk[ctlr][i];
38274@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38275 /* Wait (up to 2 seconds) for a command to complete */
38276
38277 for (i = 200000; i > 0; i--) {
38278- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38279+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38280 if (done == 0) {
38281 udelay(10); /* a short fixed delay */
38282 } else
38283diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38284index be73e9d..7fbf140 100644
38285--- a/drivers/block/cpqarray.h
38286+++ b/drivers/block/cpqarray.h
38287@@ -99,7 +99,7 @@ struct ctlr_info {
38288 drv_info_t drv[NWD];
38289 struct proc_dir_entry *proc;
38290
38291- struct access_method access;
38292+ struct access_method *access;
38293
38294 cmdlist_t *reqQ;
38295 cmdlist_t *cmpQ;
38296diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38297index 434c77d..6d3219a 100644
38298--- a/drivers/block/drbd/drbd_bitmap.c
38299+++ b/drivers/block/drbd/drbd_bitmap.c
38300@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38301 submit_bio(rw, bio);
38302 /* this should not count as user activity and cause the
38303 * resync to throttle -- see drbd_rs_should_slow_down(). */
38304- atomic_add(len >> 9, &device->rs_sect_ev);
38305+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38306 }
38307 }
38308
38309diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38310index b905e98..0812ed8 100644
38311--- a/drivers/block/drbd/drbd_int.h
38312+++ b/drivers/block/drbd/drbd_int.h
38313@@ -385,7 +385,7 @@ struct drbd_epoch {
38314 struct drbd_connection *connection;
38315 struct list_head list;
38316 unsigned int barrier_nr;
38317- atomic_t epoch_size; /* increased on every request added. */
38318+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38319 atomic_t active; /* increased on every req. added, and dec on every finished. */
38320 unsigned long flags;
38321 };
38322@@ -946,7 +946,7 @@ struct drbd_device {
38323 unsigned int al_tr_number;
38324 int al_tr_cycle;
38325 wait_queue_head_t seq_wait;
38326- atomic_t packet_seq;
38327+ atomic_unchecked_t packet_seq;
38328 unsigned int peer_seq;
38329 spinlock_t peer_seq_lock;
38330 unsigned long comm_bm_set; /* communicated number of set bits. */
38331@@ -955,8 +955,8 @@ struct drbd_device {
38332 struct mutex own_state_mutex;
38333 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38334 char congestion_reason; /* Why we where congested... */
38335- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38336- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38337+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38338+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38339 int rs_last_sect_ev; /* counter to compare with */
38340 int rs_last_events; /* counter of read or write "events" (unit sectors)
38341 * on the lower level device when we last looked. */
38342diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38343index 1fc8342..7e7742b 100644
38344--- a/drivers/block/drbd/drbd_main.c
38345+++ b/drivers/block/drbd/drbd_main.c
38346@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38347 p->sector = sector;
38348 p->block_id = block_id;
38349 p->blksize = blksize;
38350- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38351+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38352 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38353 }
38354
38355@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38356 return -EIO;
38357 p->sector = cpu_to_be64(req->i.sector);
38358 p->block_id = (unsigned long)req;
38359- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38360+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38361 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38362 if (device->state.conn >= C_SYNC_SOURCE &&
38363 device->state.conn <= C_PAUSED_SYNC_T)
38364@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38365 atomic_set(&device->unacked_cnt, 0);
38366 atomic_set(&device->local_cnt, 0);
38367 atomic_set(&device->pp_in_use_by_net, 0);
38368- atomic_set(&device->rs_sect_in, 0);
38369- atomic_set(&device->rs_sect_ev, 0);
38370+ atomic_set_unchecked(&device->rs_sect_in, 0);
38371+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38372 atomic_set(&device->ap_in_flight, 0);
38373 atomic_set(&device->md_io.in_use, 0);
38374
38375@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38376 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38377 struct drbd_resource *resource = connection->resource;
38378
38379- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38380- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38381+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38382+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38383 kfree(connection->current_epoch);
38384
38385 idr_destroy(&connection->peer_devices);
38386diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38387index 74df8cf..e41fc24 100644
38388--- a/drivers/block/drbd/drbd_nl.c
38389+++ b/drivers/block/drbd/drbd_nl.c
38390@@ -3637,13 +3637,13 @@ finish:
38391
38392 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38393 {
38394- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38395+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38396 struct sk_buff *msg;
38397 struct drbd_genlmsghdr *d_out;
38398 unsigned seq;
38399 int err = -ENOMEM;
38400
38401- seq = atomic_inc_return(&drbd_genl_seq);
38402+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38403 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38404 if (!msg)
38405 goto failed;
38406diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38407index cee2035..22f66bd 100644
38408--- a/drivers/block/drbd/drbd_receiver.c
38409+++ b/drivers/block/drbd/drbd_receiver.c
38410@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38411 struct drbd_device *device = peer_device->device;
38412 int err;
38413
38414- atomic_set(&device->packet_seq, 0);
38415+ atomic_set_unchecked(&device->packet_seq, 0);
38416 device->peer_seq = 0;
38417
38418 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38419@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38420 do {
38421 next_epoch = NULL;
38422
38423- epoch_size = atomic_read(&epoch->epoch_size);
38424+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38425
38426 switch (ev & ~EV_CLEANUP) {
38427 case EV_PUT:
38428@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38429 rv = FE_DESTROYED;
38430 } else {
38431 epoch->flags = 0;
38432- atomic_set(&epoch->epoch_size, 0);
38433+ atomic_set_unchecked(&epoch->epoch_size, 0);
38434 /* atomic_set(&epoch->active, 0); is already zero */
38435 if (rv == FE_STILL_LIVE)
38436 rv = FE_RECYCLED;
38437@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38438 conn_wait_active_ee_empty(connection);
38439 drbd_flush(connection);
38440
38441- if (atomic_read(&connection->current_epoch->epoch_size)) {
38442+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38443 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38444 if (epoch)
38445 break;
38446@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38447 }
38448
38449 epoch->flags = 0;
38450- atomic_set(&epoch->epoch_size, 0);
38451+ atomic_set_unchecked(&epoch->epoch_size, 0);
38452 atomic_set(&epoch->active, 0);
38453
38454 spin_lock(&connection->epoch_lock);
38455- if (atomic_read(&connection->current_epoch->epoch_size)) {
38456+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38457 list_add(&epoch->list, &connection->current_epoch->list);
38458 connection->current_epoch = epoch;
38459 connection->epochs++;
38460@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38461 list_add_tail(&peer_req->w.list, &device->sync_ee);
38462 spin_unlock_irq(&device->resource->req_lock);
38463
38464- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38465+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38466 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38467 return 0;
38468
38469@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38470 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38471 }
38472
38473- atomic_add(pi->size >> 9, &device->rs_sect_in);
38474+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38475
38476 return err;
38477 }
38478@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38479
38480 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38481 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38482- atomic_inc(&connection->current_epoch->epoch_size);
38483+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38484 err2 = drbd_drain_block(peer_device, pi->size);
38485 if (!err)
38486 err = err2;
38487@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38488
38489 spin_lock(&connection->epoch_lock);
38490 peer_req->epoch = connection->current_epoch;
38491- atomic_inc(&peer_req->epoch->epoch_size);
38492+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38493 atomic_inc(&peer_req->epoch->active);
38494 spin_unlock(&connection->epoch_lock);
38495
38496@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38497
38498 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38499 (int)part_stat_read(&disk->part0, sectors[1]) -
38500- atomic_read(&device->rs_sect_ev);
38501+ atomic_read_unchecked(&device->rs_sect_ev);
38502
38503 if (atomic_read(&device->ap_actlog_cnt)
38504 || curr_events - device->rs_last_events > 64) {
38505@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38506 device->use_csums = true;
38507 } else if (pi->cmd == P_OV_REPLY) {
38508 /* track progress, we may need to throttle */
38509- atomic_add(size >> 9, &device->rs_sect_in);
38510+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38511 peer_req->w.cb = w_e_end_ov_reply;
38512 dec_rs_pending(device);
38513 /* drbd_rs_begin_io done when we sent this request,
38514@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38515 goto out_free_e;
38516
38517 submit_for_resync:
38518- atomic_add(size >> 9, &device->rs_sect_ev);
38519+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38520
38521 submit:
38522 update_receiver_timing_details(connection, drbd_submit_peer_request);
38523@@ -4564,7 +4564,7 @@ struct data_cmd {
38524 int expect_payload;
38525 size_t pkt_size;
38526 int (*fn)(struct drbd_connection *, struct packet_info *);
38527-};
38528+} __do_const;
38529
38530 static struct data_cmd drbd_cmd_handler[] = {
38531 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38532@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38533 if (!list_empty(&connection->current_epoch->list))
38534 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38535 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38536- atomic_set(&connection->current_epoch->epoch_size, 0);
38537+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38538 connection->send.seen_any_write_yet = false;
38539
38540 drbd_info(connection, "Connection closed\n");
38541@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38542 put_ldev(device);
38543 }
38544 dec_rs_pending(device);
38545- atomic_add(blksize >> 9, &device->rs_sect_in);
38546+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38547
38548 return 0;
38549 }
38550@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38551 struct asender_cmd {
38552 size_t pkt_size;
38553 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38554-};
38555+} __do_const;
38556
38557 static struct asender_cmd asender_tbl[] = {
38558 [P_PING] = { 0, got_Ping },
38559diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38560index d0fae55..4469096 100644
38561--- a/drivers/block/drbd/drbd_worker.c
38562+++ b/drivers/block/drbd/drbd_worker.c
38563@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38564 list_add_tail(&peer_req->w.list, &device->read_ee);
38565 spin_unlock_irq(&device->resource->req_lock);
38566
38567- atomic_add(size >> 9, &device->rs_sect_ev);
38568+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38569 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38570 return 0;
38571
38572@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38573 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38574 int number, mxb;
38575
38576- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38577+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38578 device->rs_in_flight -= sect_in;
38579
38580 rcu_read_lock();
38581@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38582 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38583 struct fifo_buffer *plan;
38584
38585- atomic_set(&device->rs_sect_in, 0);
38586- atomic_set(&device->rs_sect_ev, 0);
38587+ atomic_set_unchecked(&device->rs_sect_in, 0);
38588+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38589 device->rs_in_flight = 0;
38590 device->rs_last_events =
38591 (int)part_stat_read(&disk->part0, sectors[0]) +
38592diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38593index 773e964..e85af00 100644
38594--- a/drivers/block/loop.c
38595+++ b/drivers/block/loop.c
38596@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
38597
38598 file_start_write(file);
38599 set_fs(get_ds());
38600- bw = file->f_op->write(file, buf, len, &pos);
38601+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38602 set_fs(old_fs);
38603 file_end_write(file);
38604 if (likely(bw == len))
38605diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38606index 09e628da..7607aaa 100644
38607--- a/drivers/block/pktcdvd.c
38608+++ b/drivers/block/pktcdvd.c
38609@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38610
38611 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38612 {
38613- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38614+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38615 }
38616
38617 /*
38618@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38619 return -EROFS;
38620 }
38621 pd->settings.fp = ti.fp;
38622- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38623+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38624
38625 if (ti.nwa_v) {
38626 pd->nwa = be32_to_cpu(ti.next_writable);
38627diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38628index b67066d..515b7f4 100644
38629--- a/drivers/block/rbd.c
38630+++ b/drivers/block/rbd.c
38631@@ -64,7 +64,7 @@
38632 * If the counter is already at its maximum value returns
38633 * -EINVAL without updating it.
38634 */
38635-static int atomic_inc_return_safe(atomic_t *v)
38636+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38637 {
38638 unsigned int counter;
38639
38640diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38641index e5565fb..71be10b4 100644
38642--- a/drivers/block/smart1,2.h
38643+++ b/drivers/block/smart1,2.h
38644@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38645 }
38646
38647 static struct access_method smart4_access = {
38648- smart4_submit_command,
38649- smart4_intr_mask,
38650- smart4_fifo_full,
38651- smart4_intr_pending,
38652- smart4_completed,
38653+ .submit_command = smart4_submit_command,
38654+ .set_intr_mask = smart4_intr_mask,
38655+ .fifo_full = smart4_fifo_full,
38656+ .intr_pending = smart4_intr_pending,
38657+ .command_completed = smart4_completed,
38658 };
38659
38660 /*
38661@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38662 }
38663
38664 static struct access_method smart2_access = {
38665- smart2_submit_command,
38666- smart2_intr_mask,
38667- smart2_fifo_full,
38668- smart2_intr_pending,
38669- smart2_completed,
38670+ .submit_command = smart2_submit_command,
38671+ .set_intr_mask = smart2_intr_mask,
38672+ .fifo_full = smart2_fifo_full,
38673+ .intr_pending = smart2_intr_pending,
38674+ .command_completed = smart2_completed,
38675 };
38676
38677 /*
38678@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38679 }
38680
38681 static struct access_method smart2e_access = {
38682- smart2e_submit_command,
38683- smart2e_intr_mask,
38684- smart2e_fifo_full,
38685- smart2e_intr_pending,
38686- smart2e_completed,
38687+ .submit_command = smart2e_submit_command,
38688+ .set_intr_mask = smart2e_intr_mask,
38689+ .fifo_full = smart2e_fifo_full,
38690+ .intr_pending = smart2e_intr_pending,
38691+ .command_completed = smart2e_completed,
38692 };
38693
38694 /*
38695@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38696 }
38697
38698 static struct access_method smart1_access = {
38699- smart1_submit_command,
38700- smart1_intr_mask,
38701- smart1_fifo_full,
38702- smart1_intr_pending,
38703- smart1_completed,
38704+ .submit_command = smart1_submit_command,
38705+ .set_intr_mask = smart1_intr_mask,
38706+ .fifo_full = smart1_fifo_full,
38707+ .intr_pending = smart1_intr_pending,
38708+ .command_completed = smart1_completed,
38709 };
38710diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38711index 55c135b..9f8d60c 100644
38712--- a/drivers/bluetooth/btwilink.c
38713+++ b/drivers/bluetooth/btwilink.c
38714@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38715
38716 static int bt_ti_probe(struct platform_device *pdev)
38717 {
38718- static struct ti_st *hst;
38719+ struct ti_st *hst;
38720 struct hci_dev *hdev;
38721 int err;
38722
38723diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38724index 5d28a45..a538f90 100644
38725--- a/drivers/cdrom/cdrom.c
38726+++ b/drivers/cdrom/cdrom.c
38727@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38728 ENSURE(reset, CDC_RESET);
38729 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38730 cdi->mc_flags = 0;
38731- cdo->n_minors = 0;
38732 cdi->options = CDO_USE_FFLAGS;
38733
38734 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38735@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38736 else
38737 cdi->cdda_method = CDDA_OLD;
38738
38739- if (!cdo->generic_packet)
38740- cdo->generic_packet = cdrom_dummy_generic_packet;
38741+ if (!cdo->generic_packet) {
38742+ pax_open_kernel();
38743+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38744+ pax_close_kernel();
38745+ }
38746
38747 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38748 mutex_lock(&cdrom_mutex);
38749@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38750 if (cdi->exit)
38751 cdi->exit(cdi);
38752
38753- cdi->ops->n_minors--;
38754 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38755 }
38756
38757@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38758 */
38759 nr = nframes;
38760 do {
38761- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38762+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38763 if (cgc.buffer)
38764 break;
38765
38766@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38767 struct cdrom_device_info *cdi;
38768 int ret;
38769
38770- ret = scnprintf(info + *pos, max_size - *pos, header);
38771+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38772 if (!ret)
38773 return 1;
38774
38775diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38776index 584bc31..e64a12c 100644
38777--- a/drivers/cdrom/gdrom.c
38778+++ b/drivers/cdrom/gdrom.c
38779@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38780 .audio_ioctl = gdrom_audio_ioctl,
38781 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38782 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38783- .n_minors = 1,
38784 };
38785
38786 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38787diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38788index a4af822..ed58cd1 100644
38789--- a/drivers/char/Kconfig
38790+++ b/drivers/char/Kconfig
38791@@ -17,7 +17,8 @@ config DEVMEM
38792
38793 config DEVKMEM
38794 bool "/dev/kmem virtual device support"
38795- default y
38796+ default n
38797+ depends on !GRKERNSEC_KMEM
38798 help
38799 Say Y here if you want to support the /dev/kmem device. The
38800 /dev/kmem device is rarely used, but can be used for certain
38801@@ -586,6 +587,7 @@ config DEVPORT
38802 bool
38803 depends on !M68K
38804 depends on ISA || PCI
38805+ depends on !GRKERNSEC_KMEM
38806 default y
38807
38808 source "drivers/s390/char/Kconfig"
38809diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38810index a48e05b..6bac831 100644
38811--- a/drivers/char/agp/compat_ioctl.c
38812+++ b/drivers/char/agp/compat_ioctl.c
38813@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38814 return -ENOMEM;
38815 }
38816
38817- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38818+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38819 sizeof(*usegment) * ureserve.seg_count)) {
38820 kfree(usegment);
38821 kfree(ksegment);
38822diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38823index 09f17eb..8531d2f 100644
38824--- a/drivers/char/agp/frontend.c
38825+++ b/drivers/char/agp/frontend.c
38826@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38827 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38828 return -EFAULT;
38829
38830- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38831+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38832 return -EFAULT;
38833
38834 client = agp_find_client_by_pid(reserve.pid);
38835@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38836 if (segment == NULL)
38837 return -ENOMEM;
38838
38839- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38840+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38841 sizeof(struct agp_segment) * reserve.seg_count)) {
38842 kfree(segment);
38843 return -EFAULT;
38844diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38845index 4f94375..413694e 100644
38846--- a/drivers/char/genrtc.c
38847+++ b/drivers/char/genrtc.c
38848@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38849 switch (cmd) {
38850
38851 case RTC_PLL_GET:
38852+ memset(&pll, 0, sizeof(pll));
38853 if (get_rtc_pll(&pll))
38854 return -EINVAL;
38855 else
38856diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38857index 5c0baa9..44011b1 100644
38858--- a/drivers/char/hpet.c
38859+++ b/drivers/char/hpet.c
38860@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38861 }
38862
38863 static int
38864-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38865+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38866 struct hpet_info *info)
38867 {
38868 struct hpet_timer __iomem *timer;
38869diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38870index 24cc4ed..f9807cf 100644
38871--- a/drivers/char/i8k.c
38872+++ b/drivers/char/i8k.c
38873@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38874 },
38875 };
38876
38877-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38878+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38879 {
38880 .ident = "Dell Inspiron",
38881 .matches = {
38882diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38883index 9bb5928..57a7801 100644
38884--- a/drivers/char/ipmi/ipmi_msghandler.c
38885+++ b/drivers/char/ipmi/ipmi_msghandler.c
38886@@ -436,7 +436,7 @@ struct ipmi_smi {
38887 struct proc_dir_entry *proc_dir;
38888 char proc_dir_name[10];
38889
38890- atomic_t stats[IPMI_NUM_STATS];
38891+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38892
38893 /*
38894 * run_to_completion duplicate of smb_info, smi_info
38895@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38896 static DEFINE_MUTEX(smi_watchers_mutex);
38897
38898 #define ipmi_inc_stat(intf, stat) \
38899- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38900+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38901 #define ipmi_get_stat(intf, stat) \
38902- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38903+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38904
38905 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38906 "ACPI", "SMBIOS", "PCI",
38907@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38908 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38909 init_waitqueue_head(&intf->waitq);
38910 for (i = 0; i < IPMI_NUM_STATS; i++)
38911- atomic_set(&intf->stats[i], 0);
38912+ atomic_set_unchecked(&intf->stats[i], 0);
38913
38914 intf->proc_dir = NULL;
38915
38916diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38917index 518585c..6c985cef 100644
38918--- a/drivers/char/ipmi/ipmi_si_intf.c
38919+++ b/drivers/char/ipmi/ipmi_si_intf.c
38920@@ -289,7 +289,7 @@ struct smi_info {
38921 unsigned char slave_addr;
38922
38923 /* Counters and things for the proc filesystem. */
38924- atomic_t stats[SI_NUM_STATS];
38925+ atomic_unchecked_t stats[SI_NUM_STATS];
38926
38927 struct task_struct *thread;
38928
38929@@ -298,9 +298,9 @@ struct smi_info {
38930 };
38931
38932 #define smi_inc_stat(smi, stat) \
38933- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38934+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38935 #define smi_get_stat(smi, stat) \
38936- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38937+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38938
38939 #define SI_MAX_PARMS 4
38940
38941@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
38942 atomic_set(&new_smi->req_events, 0);
38943 new_smi->run_to_completion = false;
38944 for (i = 0; i < SI_NUM_STATS; i++)
38945- atomic_set(&new_smi->stats[i], 0);
38946+ atomic_set_unchecked(&new_smi->stats[i], 0);
38947
38948 new_smi->interrupt_disabled = true;
38949 atomic_set(&new_smi->need_watch, 0);
38950diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38951index 297110c..3f69b43 100644
38952--- a/drivers/char/mem.c
38953+++ b/drivers/char/mem.c
38954@@ -18,6 +18,7 @@
38955 #include <linux/raw.h>
38956 #include <linux/tty.h>
38957 #include <linux/capability.h>
38958+#include <linux/security.h>
38959 #include <linux/ptrace.h>
38960 #include <linux/device.h>
38961 #include <linux/highmem.h>
38962@@ -36,6 +37,10 @@
38963
38964 #define DEVPORT_MINOR 4
38965
38966+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38967+extern const struct file_operations grsec_fops;
38968+#endif
38969+
38970 static inline unsigned long size_inside_page(unsigned long start,
38971 unsigned long size)
38972 {
38973@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38974
38975 while (cursor < to) {
38976 if (!devmem_is_allowed(pfn)) {
38977+#ifdef CONFIG_GRKERNSEC_KMEM
38978+ gr_handle_mem_readwrite(from, to);
38979+#else
38980 printk(KERN_INFO
38981 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38982 current->comm, from, to);
38983+#endif
38984 return 0;
38985 }
38986 cursor += PAGE_SIZE;
38987@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38988 }
38989 return 1;
38990 }
38991+#elif defined(CONFIG_GRKERNSEC_KMEM)
38992+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38993+{
38994+ return 0;
38995+}
38996 #else
38997 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38998 {
38999@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39000 #endif
39001
39002 while (count > 0) {
39003- unsigned long remaining;
39004+ unsigned long remaining = 0;
39005+ char *temp;
39006
39007 sz = size_inside_page(p, count);
39008
39009@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39010 if (!ptr)
39011 return -EFAULT;
39012
39013- remaining = copy_to_user(buf, ptr, sz);
39014+#ifdef CONFIG_PAX_USERCOPY
39015+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39016+ if (!temp) {
39017+ unxlate_dev_mem_ptr(p, ptr);
39018+ return -ENOMEM;
39019+ }
39020+ remaining = probe_kernel_read(temp, ptr, sz);
39021+#else
39022+ temp = ptr;
39023+#endif
39024+
39025+ if (!remaining)
39026+ remaining = copy_to_user(buf, temp, sz);
39027+
39028+#ifdef CONFIG_PAX_USERCOPY
39029+ kfree(temp);
39030+#endif
39031+
39032 unxlate_dev_mem_ptr(p, ptr);
39033 if (remaining)
39034 return -EFAULT;
39035@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39036 size_t count, loff_t *ppos)
39037 {
39038 unsigned long p = *ppos;
39039- ssize_t low_count, read, sz;
39040+ ssize_t low_count, read, sz, err = 0;
39041 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39042- int err = 0;
39043
39044 read = 0;
39045 if (p < (unsigned long) high_memory) {
39046@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39047 }
39048 #endif
39049 while (low_count > 0) {
39050+ char *temp;
39051+
39052 sz = size_inside_page(p, low_count);
39053
39054 /*
39055@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39056 */
39057 kbuf = xlate_dev_kmem_ptr((void *)p);
39058
39059- if (copy_to_user(buf, kbuf, sz))
39060+#ifdef CONFIG_PAX_USERCOPY
39061+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39062+ if (!temp)
39063+ return -ENOMEM;
39064+ err = probe_kernel_read(temp, kbuf, sz);
39065+#else
39066+ temp = kbuf;
39067+#endif
39068+
39069+ if (!err)
39070+ err = copy_to_user(buf, temp, sz);
39071+
39072+#ifdef CONFIG_PAX_USERCOPY
39073+ kfree(temp);
39074+#endif
39075+
39076+ if (err)
39077 return -EFAULT;
39078 buf += sz;
39079 p += sz;
39080@@ -804,6 +853,9 @@ static const struct memdev {
39081 #ifdef CONFIG_PRINTK
39082 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39083 #endif
39084+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39085+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39086+#endif
39087 };
39088
39089 static int memory_open(struct inode *inode, struct file *filp)
39090@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
39091 continue;
39092
39093 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39094- NULL, devlist[minor].name);
39095+ NULL, "%s", devlist[minor].name);
39096 }
39097
39098 return tty_init();
39099diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39100index 9df78e2..01ba9ae 100644
39101--- a/drivers/char/nvram.c
39102+++ b/drivers/char/nvram.c
39103@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39104
39105 spin_unlock_irq(&rtc_lock);
39106
39107- if (copy_to_user(buf, contents, tmp - contents))
39108+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39109 return -EFAULT;
39110
39111 *ppos = i;
39112diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39113index 0ea9986..e7b07e4 100644
39114--- a/drivers/char/pcmcia/synclink_cs.c
39115+++ b/drivers/char/pcmcia/synclink_cs.c
39116@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39117
39118 if (debug_level >= DEBUG_LEVEL_INFO)
39119 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39120- __FILE__, __LINE__, info->device_name, port->count);
39121+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39122
39123 if (tty_port_close_start(port, tty, filp) == 0)
39124 goto cleanup;
39125@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39126 cleanup:
39127 if (debug_level >= DEBUG_LEVEL_INFO)
39128 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39129- tty->driver->name, port->count);
39130+ tty->driver->name, atomic_read(&port->count));
39131 }
39132
39133 /* Wait until the transmitter is empty.
39134@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39135
39136 if (debug_level >= DEBUG_LEVEL_INFO)
39137 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39138- __FILE__, __LINE__, tty->driver->name, port->count);
39139+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39140
39141 /* If port is closing, signal caller to try again */
39142 if (port->flags & ASYNC_CLOSING){
39143@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39144 goto cleanup;
39145 }
39146 spin_lock(&port->lock);
39147- port->count++;
39148+ atomic_inc(&port->count);
39149 spin_unlock(&port->lock);
39150 spin_unlock_irqrestore(&info->netlock, flags);
39151
39152- if (port->count == 1) {
39153+ if (atomic_read(&port->count) == 1) {
39154 /* 1st open on this device, init hardware */
39155 retval = startup(info, tty);
39156 if (retval < 0)
39157@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39158 unsigned short new_crctype;
39159
39160 /* return error if TTY interface open */
39161- if (info->port.count)
39162+ if (atomic_read(&info->port.count))
39163 return -EBUSY;
39164
39165 switch (encoding)
39166@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39167
39168 /* arbitrate between network and tty opens */
39169 spin_lock_irqsave(&info->netlock, flags);
39170- if (info->port.count != 0 || info->netcount != 0) {
39171+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39172 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39173 spin_unlock_irqrestore(&info->netlock, flags);
39174 return -EBUSY;
39175@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39176 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39177
39178 /* return error if TTY interface open */
39179- if (info->port.count)
39180+ if (atomic_read(&info->port.count))
39181 return -EBUSY;
39182
39183 if (cmd != SIOCWANDEV)
39184diff --git a/drivers/char/random.c b/drivers/char/random.c
39185index 9cd6968..6416f00 100644
39186--- a/drivers/char/random.c
39187+++ b/drivers/char/random.c
39188@@ -289,9 +289,6 @@
39189 /*
39190 * To allow fractional bits to be tracked, the entropy_count field is
39191 * denominated in units of 1/8th bits.
39192- *
39193- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39194- * credit_entropy_bits() needs to be 64 bits wide.
39195 */
39196 #define ENTROPY_SHIFT 3
39197 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39198@@ -439,9 +436,9 @@ struct entropy_store {
39199 };
39200
39201 static void push_to_pool(struct work_struct *work);
39202-static __u32 input_pool_data[INPUT_POOL_WORDS];
39203-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39204-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39205+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39206+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39207+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39208
39209 static struct entropy_store input_pool = {
39210 .poolinfo = &poolinfo_table[0],
39211@@ -635,7 +632,7 @@ retry:
39212 /* The +2 corresponds to the /4 in the denominator */
39213
39214 do {
39215- unsigned int anfrac = min(pnfrac, pool_size/2);
39216+ u64 anfrac = min(pnfrac, pool_size/2);
39217 unsigned int add =
39218 ((pool_size - entropy_count)*anfrac*3) >> s;
39219
39220@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39221
39222 extract_buf(r, tmp);
39223 i = min_t(int, nbytes, EXTRACT_SIZE);
39224- if (copy_to_user(buf, tmp, i)) {
39225+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39226 ret = -EFAULT;
39227 break;
39228 }
39229@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39230 static int proc_do_uuid(struct ctl_table *table, int write,
39231 void __user *buffer, size_t *lenp, loff_t *ppos)
39232 {
39233- struct ctl_table fake_table;
39234+ ctl_table_no_const fake_table;
39235 unsigned char buf[64], tmp_uuid[16], *uuid;
39236
39237 uuid = table->data;
39238@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39239 static int proc_do_entropy(struct ctl_table *table, int write,
39240 void __user *buffer, size_t *lenp, loff_t *ppos)
39241 {
39242- struct ctl_table fake_table;
39243+ ctl_table_no_const fake_table;
39244 int entropy_count;
39245
39246 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39247diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39248index e496dae..3db53b6 100644
39249--- a/drivers/char/sonypi.c
39250+++ b/drivers/char/sonypi.c
39251@@ -54,6 +54,7 @@
39252
39253 #include <asm/uaccess.h>
39254 #include <asm/io.h>
39255+#include <asm/local.h>
39256
39257 #include <linux/sonypi.h>
39258
39259@@ -490,7 +491,7 @@ static struct sonypi_device {
39260 spinlock_t fifo_lock;
39261 wait_queue_head_t fifo_proc_list;
39262 struct fasync_struct *fifo_async;
39263- int open_count;
39264+ local_t open_count;
39265 int model;
39266 struct input_dev *input_jog_dev;
39267 struct input_dev *input_key_dev;
39268@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39269 static int sonypi_misc_release(struct inode *inode, struct file *file)
39270 {
39271 mutex_lock(&sonypi_device.lock);
39272- sonypi_device.open_count--;
39273+ local_dec(&sonypi_device.open_count);
39274 mutex_unlock(&sonypi_device.lock);
39275 return 0;
39276 }
39277@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39278 {
39279 mutex_lock(&sonypi_device.lock);
39280 /* Flush input queue on first open */
39281- if (!sonypi_device.open_count)
39282+ if (!local_read(&sonypi_device.open_count))
39283 kfifo_reset(&sonypi_device.fifo);
39284- sonypi_device.open_count++;
39285+ local_inc(&sonypi_device.open_count);
39286 mutex_unlock(&sonypi_device.lock);
39287
39288 return 0;
39289@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39290
39291 static struct platform_device *sonypi_platform_device;
39292
39293-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39294+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39295 {
39296 .ident = "Sony Vaio",
39297 .matches = {
39298diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39299index 565a947..dcdc06e 100644
39300--- a/drivers/char/tpm/tpm_acpi.c
39301+++ b/drivers/char/tpm/tpm_acpi.c
39302@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39303 virt = acpi_os_map_iomem(start, len);
39304 if (!virt) {
39305 kfree(log->bios_event_log);
39306+ log->bios_event_log = NULL;
39307 printk("%s: ERROR - Unable to map memory\n", __func__);
39308 return -EIO;
39309 }
39310
39311- memcpy_fromio(log->bios_event_log, virt, len);
39312+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39313
39314 acpi_os_unmap_iomem(virt, len);
39315 return 0;
39316diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39317index 3a56a13..f8cbd25 100644
39318--- a/drivers/char/tpm/tpm_eventlog.c
39319+++ b/drivers/char/tpm/tpm_eventlog.c
39320@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39321 event = addr;
39322
39323 if ((event->event_type == 0 && event->event_size == 0) ||
39324- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39325+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39326 return NULL;
39327
39328 return addr;
39329@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39330 return NULL;
39331
39332 if ((event->event_type == 0 && event->event_size == 0) ||
39333- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39334+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39335 return NULL;
39336
39337 (*pos)++;
39338@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39339 int i;
39340
39341 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39342- seq_putc(m, data[i]);
39343+ if (!seq_putc(m, data[i]))
39344+ return -EFAULT;
39345
39346 return 0;
39347 }
39348diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39349index 72d7028..1586601 100644
39350--- a/drivers/char/virtio_console.c
39351+++ b/drivers/char/virtio_console.c
39352@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39353 if (to_user) {
39354 ssize_t ret;
39355
39356- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39357+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39358 if (ret)
39359 return -EFAULT;
39360 } else {
39361@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39362 if (!port_has_data(port) && !port->host_connected)
39363 return 0;
39364
39365- return fill_readbuf(port, ubuf, count, true);
39366+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39367 }
39368
39369 static int wait_port_writable(struct port *port, bool nonblock)
39370diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39371index 956b7e5..b655045 100644
39372--- a/drivers/clk/clk-composite.c
39373+++ b/drivers/clk/clk-composite.c
39374@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39375 struct clk *clk;
39376 struct clk_init_data init;
39377 struct clk_composite *composite;
39378- struct clk_ops *clk_composite_ops;
39379+ clk_ops_no_const *clk_composite_ops;
39380
39381 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39382 if (!composite) {
39383diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
39384index 2e4f6d4..b4cf487 100644
39385--- a/drivers/clk/hisilicon/clk-hi3620.c
39386+++ b/drivers/clk/hisilicon/clk-hi3620.c
39387@@ -38,44 +38,44 @@
39388 #include "clk.h"
39389
39390 /* clock parent list */
39391-static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39392-static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39393-static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39394-static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39395-static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39396-static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39397-static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39398-static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39399-static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39400-static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39401-static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39402-static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39403-static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39404-static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39405-static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39406-static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39407-static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39408-static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39409+static const char * const timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39410+static const char * const timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39411+static const char * const timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39412+static const char * const timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39413+static const char * const timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39414+static const char * const timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39415+static const char * const timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39416+static const char * const timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39417+static const char * const timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39418+static const char * const timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39419+static const char * const uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39420+static const char * const uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39421+static const char * const uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39422+static const char * const uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39423+static const char * const uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39424+static const char * const spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39425+static const char * const spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39426+static const char * const spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39427 /* share axi parent */
39428-static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39429-static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39430-static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39431-static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39432-static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39433-static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39434-static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39435-static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39436-static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39437-static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39438-static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39439-static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39440+static const char * const saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39441+static const char * const pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39442+static const char * const pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39443+static const char * const sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39444+static const char * const mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39445+static const char * const mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39446+static const char * const g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39447+static const char * const venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39448+static const char * const vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39449+static const char * const vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39450+static const char * const edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39451+static const char * const ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39452 "armpll3", "armpll5", };
39453-static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39454-static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39455+static const char * const edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39456+static const char * const ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39457 "armpll3", "armpll5", };
39458-static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39459-static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39460-static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39461+static const char * const rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39462+static const char * const mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39463+static const char * const mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39464
39465
39466 /* fixed rate clocks */
39467diff --git a/drivers/clk/hisilicon/clk-hix5hd2.c b/drivers/clk/hisilicon/clk-hix5hd2.c
39468index 3f369c6..05f9ffd 100644
39469--- a/drivers/clk/hisilicon/clk-hix5hd2.c
39470+++ b/drivers/clk/hisilicon/clk-hix5hd2.c
39471@@ -46,15 +46,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
39472 { HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
39473 };
39474
39475-static const char *sfc_mux_p[] __initconst = {
39476+static const char * const sfc_mux_p[] __initconst = {
39477 "24m", "150m", "200m", "100m", "75m", };
39478 static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
39479
39480-static const char *sdio_mux_p[] __initconst = {
39481+static const char * const sdio_mux_p[] __initconst = {
39482 "75m", "100m", "50m", "15m", };
39483 static u32 sdio_mux_table[] = {0, 1, 2, 3};
39484
39485-static const char *fephy_mux_p[] __initconst = { "25m", "125m"};
39486+static const char * const fephy_mux_p[] __initconst = { "25m", "125m"};
39487 static u32 fephy_mux_table[] = {0, 1};
39488
39489
39490diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
39491index 7eb684c..147c6fc 100644
39492--- a/drivers/clk/rockchip/clk-rk3188.c
39493+++ b/drivers/clk/rockchip/clk-rk3188.c
39494@@ -704,7 +704,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
39495 GATE(ACLK_GPS, "aclk_gps", "aclk_peri", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS),
39496 };
39497
39498-static const char *rk3188_critical_clocks[] __initconst = {
39499+static const char * const rk3188_critical_clocks[] __initconst = {
39500 "aclk_cpu",
39501 "aclk_peri",
39502 "hclk_peri",
39503diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
39504index 05d7a0b..4fc131c 100644
39505--- a/drivers/clk/rockchip/clk-rk3288.c
39506+++ b/drivers/clk/rockchip/clk-rk3288.c
39507@@ -771,7 +771,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
39508 GATE(0, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),
39509 };
39510
39511-static const char *rk3288_critical_clocks[] __initconst = {
39512+static const char * const rk3288_critical_clocks[] __initconst = {
39513 "aclk_cpu",
39514 "aclk_peri",
39515 "hclk_peri",
39516diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
39517index 58d2e3b..0c21b0d 100644
39518--- a/drivers/clk/rockchip/clk.h
39519+++ b/drivers/clk/rockchip/clk.h
39520@@ -182,7 +182,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
39521 const char **parent_names, u8 num_parents,
39522 void __iomem *reg, int shift);
39523
39524-#define PNAME(x) static const char *x[] __initconst
39525+#define PNAME(x) static const char * const x[] __initconst
39526
39527 enum rockchip_clk_branch_type {
39528 branch_composite,
39529diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39530index e4c7538..99c50cd 100644
39531--- a/drivers/clk/samsung/clk.h
39532+++ b/drivers/clk/samsung/clk.h
39533@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39534 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39535 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39536
39537-#define PNAME(x) static const char *x[] __initdata
39538+#define PNAME(x) static const char * const x[] __initconst
39539
39540 /**
39541 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39542diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39543index dd3a78c..386d49c 100644
39544--- a/drivers/clk/socfpga/clk-gate.c
39545+++ b/drivers/clk/socfpga/clk-gate.c
39546@@ -22,6 +22,7 @@
39547 #include <linux/mfd/syscon.h>
39548 #include <linux/of.h>
39549 #include <linux/regmap.h>
39550+#include <asm/pgtable.h>
39551
39552 #include "clk.h"
39553
39554@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39555 return 0;
39556 }
39557
39558-static struct clk_ops gateclk_ops = {
39559+static clk_ops_no_const gateclk_ops __read_only = {
39560 .prepare = socfpga_clk_prepare,
39561 .recalc_rate = socfpga_clk_recalc_rate,
39562 .get_parent = socfpga_clk_get_parent,
39563@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39564 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39565 socfpga_clk->hw.bit_idx = clk_gate[1];
39566
39567- gateclk_ops.enable = clk_gate_ops.enable;
39568- gateclk_ops.disable = clk_gate_ops.disable;
39569+ pax_open_kernel();
39570+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39571+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39572+ pax_close_kernel();
39573 }
39574
39575 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39576diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39577index de6da95..c98278b 100644
39578--- a/drivers/clk/socfpga/clk-pll.c
39579+++ b/drivers/clk/socfpga/clk-pll.c
39580@@ -21,6 +21,7 @@
39581 #include <linux/io.h>
39582 #include <linux/of.h>
39583 #include <linux/of_address.h>
39584+#include <asm/pgtable.h>
39585
39586 #include "clk.h"
39587
39588@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39589 CLK_MGR_PLL_CLK_SRC_MASK;
39590 }
39591
39592-static struct clk_ops clk_pll_ops = {
39593+static clk_ops_no_const clk_pll_ops __read_only = {
39594 .recalc_rate = clk_pll_recalc_rate,
39595 .get_parent = clk_pll_get_parent,
39596 };
39597@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39598 pll_clk->hw.hw.init = &init;
39599
39600 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39601- clk_pll_ops.enable = clk_gate_ops.enable;
39602- clk_pll_ops.disable = clk_gate_ops.disable;
39603+ pax_open_kernel();
39604+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39605+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39606+ pax_close_kernel();
39607
39608 clk = clk_register(NULL, &pll_clk->hw.hw);
39609 if (WARN_ON(IS_ERR(clk))) {
39610diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
39611index 3654f61..81abe81 100644
39612--- a/drivers/clk/ti/composite.c
39613+++ b/drivers/clk/ti/composite.c
39614@@ -69,7 +69,7 @@ struct component_clk {
39615 struct list_head link;
39616 };
39617
39618-static const char * __initconst component_clk_types[] = {
39619+static const char * const __initconst component_clk_types[] = {
39620 "gate", "divider", "mux"
39621 };
39622
39623diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
39624index f870aad..04ba1e4 100644
39625--- a/drivers/clk/zynq/clkc.c
39626+++ b/drivers/clk/zynq/clkc.c
39627@@ -85,22 +85,22 @@ static DEFINE_SPINLOCK(canmioclk_lock);
39628 static DEFINE_SPINLOCK(dbgclk_lock);
39629 static DEFINE_SPINLOCK(aperclk_lock);
39630
39631-static const char *armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39632-static const char *ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39633-static const char *iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39634-static const char *gem0_mux_parents[] __initconst = {"gem0_div1", "dummy_name"};
39635-static const char *gem1_mux_parents[] __initconst = {"gem1_div1", "dummy_name"};
39636-static const char *can0_mio_mux2_parents[] __initconst = {"can0_gate",
39637+static const char * const armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39638+static const char * const ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39639+static const char * const iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39640+static const char * gem0_mux_parents[] __initdata = {"gem0_div1", "dummy_name"};
39641+static const char * gem1_mux_parents[] __initdata = {"gem1_div1", "dummy_name"};
39642+static const char * const can0_mio_mux2_parents[] __initconst = {"can0_gate",
39643 "can0_mio_mux"};
39644-static const char *can1_mio_mux2_parents[] __initconst = {"can1_gate",
39645+static const char * const can1_mio_mux2_parents[] __initconst = {"can1_gate",
39646 "can1_mio_mux"};
39647-static const char *dbg_emio_mux_parents[] __initconst = {"dbg_div",
39648+static const char * dbg_emio_mux_parents[] __initdata = {"dbg_div",
39649 "dummy_name"};
39650
39651-static const char *dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39652-static const char *gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39653-static const char *gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39654-static const char *swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39655+static const char * const dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39656+static const char * const gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39657+static const char * const gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39658+static const char * const swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39659
39660 static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
39661 const char *clk_name, void __iomem *fclk_ctrl_reg,
39662diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39663index b0c18ed..1713a80 100644
39664--- a/drivers/cpufreq/acpi-cpufreq.c
39665+++ b/drivers/cpufreq/acpi-cpufreq.c
39666@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39667 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39668 per_cpu(acfreq_data, cpu) = data;
39669
39670- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39671- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39672+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39673+ pax_open_kernel();
39674+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39675+ pax_close_kernel();
39676+ }
39677
39678 result = acpi_processor_register_performance(data->acpi_data, cpu);
39679 if (result)
39680@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39681 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39682 break;
39683 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39684- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39685+ pax_open_kernel();
39686+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39687+ pax_close_kernel();
39688 break;
39689 default:
39690 break;
39691@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39692 if (!msrs)
39693 return;
39694
39695- acpi_cpufreq_driver.boost_supported = true;
39696- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39697+ pax_open_kernel();
39698+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39699+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39700+ pax_close_kernel();
39701
39702 cpu_notifier_register_begin();
39703
39704diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39705index bab67db..91af7e3 100644
39706--- a/drivers/cpufreq/cpufreq-dt.c
39707+++ b/drivers/cpufreq/cpufreq-dt.c
39708@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39709 if (!IS_ERR(cpu_reg))
39710 regulator_put(cpu_reg);
39711
39712- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39713+ pax_open_kernel();
39714+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39715+ pax_close_kernel();
39716
39717 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39718 if (ret)
39719diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39720index 8ae655c..3141442 100644
39721--- a/drivers/cpufreq/cpufreq.c
39722+++ b/drivers/cpufreq/cpufreq.c
39723@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39724 }
39725
39726 mutex_lock(&cpufreq_governor_mutex);
39727- list_del(&governor->governor_list);
39728+ pax_list_del(&governor->governor_list);
39729 mutex_unlock(&cpufreq_governor_mutex);
39730 return;
39731 }
39732@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39733 return NOTIFY_OK;
39734 }
39735
39736-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39737+static struct notifier_block cpufreq_cpu_notifier = {
39738 .notifier_call = cpufreq_cpu_callback,
39739 };
39740
39741@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39742 return 0;
39743
39744 write_lock_irqsave(&cpufreq_driver_lock, flags);
39745- cpufreq_driver->boost_enabled = state;
39746+ pax_open_kernel();
39747+ *(bool *)&cpufreq_driver->boost_enabled = state;
39748+ pax_close_kernel();
39749 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39750
39751 ret = cpufreq_driver->set_boost(state);
39752 if (ret) {
39753 write_lock_irqsave(&cpufreq_driver_lock, flags);
39754- cpufreq_driver->boost_enabled = !state;
39755+ pax_open_kernel();
39756+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39757+ pax_close_kernel();
39758 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39759
39760 pr_err("%s: Cannot %s BOOST\n",
39761@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39762 cpufreq_driver = driver_data;
39763 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39764
39765- if (driver_data->setpolicy)
39766- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39767+ if (driver_data->setpolicy) {
39768+ pax_open_kernel();
39769+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39770+ pax_close_kernel();
39771+ }
39772
39773 if (cpufreq_boost_supported()) {
39774 /*
39775 * Check if driver provides function to enable boost -
39776 * if not, use cpufreq_boost_set_sw as default
39777 */
39778- if (!cpufreq_driver->set_boost)
39779- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39780+ if (!cpufreq_driver->set_boost) {
39781+ pax_open_kernel();
39782+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39783+ pax_close_kernel();
39784+ }
39785
39786 ret = cpufreq_sysfs_create_file(&boost.attr);
39787 if (ret) {
39788diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39789index 1b44496..b80ff5e 100644
39790--- a/drivers/cpufreq/cpufreq_governor.c
39791+++ b/drivers/cpufreq/cpufreq_governor.c
39792@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39793 struct dbs_data *dbs_data;
39794 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39795 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39796- struct od_ops *od_ops = NULL;
39797+ const struct od_ops *od_ops = NULL;
39798 struct od_dbs_tuners *od_tuners = NULL;
39799 struct cs_dbs_tuners *cs_tuners = NULL;
39800 struct cpu_dbs_common_info *cpu_cdbs;
39801@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39802
39803 if ((cdata->governor == GOV_CONSERVATIVE) &&
39804 (!policy->governor->initialized)) {
39805- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39806+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39807
39808 cpufreq_register_notifier(cs_ops->notifier_block,
39809 CPUFREQ_TRANSITION_NOTIFIER);
39810@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39811
39812 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39813 (policy->governor->initialized == 1)) {
39814- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39815+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39816
39817 cpufreq_unregister_notifier(cs_ops->notifier_block,
39818 CPUFREQ_TRANSITION_NOTIFIER);
39819diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39820index cc401d1..8197340 100644
39821--- a/drivers/cpufreq/cpufreq_governor.h
39822+++ b/drivers/cpufreq/cpufreq_governor.h
39823@@ -212,7 +212,7 @@ struct common_dbs_data {
39824 void (*exit)(struct dbs_data *dbs_data);
39825
39826 /* Governor specific ops, see below */
39827- void *gov_ops;
39828+ const void *gov_ops;
39829 };
39830
39831 /* Governor Per policy data */
39832@@ -232,7 +232,7 @@ struct od_ops {
39833 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39834 unsigned int freq_next, unsigned int relation);
39835 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39836-};
39837+} __no_const;
39838
39839 struct cs_ops {
39840 struct notifier_block *notifier_block;
39841diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39842index ad3f38f..8f086cd 100644
39843--- a/drivers/cpufreq/cpufreq_ondemand.c
39844+++ b/drivers/cpufreq/cpufreq_ondemand.c
39845@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39846
39847 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39848
39849-static struct od_ops od_ops = {
39850+static struct od_ops od_ops __read_only = {
39851 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39852 .powersave_bias_target = generic_powersave_bias_target,
39853 .freq_increase = dbs_freq_increase,
39854@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39855 (struct cpufreq_policy *, unsigned int, unsigned int),
39856 unsigned int powersave_bias)
39857 {
39858- od_ops.powersave_bias_target = f;
39859+ pax_open_kernel();
39860+ *(void **)&od_ops.powersave_bias_target = f;
39861+ pax_close_kernel();
39862 od_set_powersave_bias(powersave_bias);
39863 }
39864 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39865
39866 void od_unregister_powersave_bias_handler(void)
39867 {
39868- od_ops.powersave_bias_target = generic_powersave_bias_target;
39869+ pax_open_kernel();
39870+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39871+ pax_close_kernel();
39872 od_set_powersave_bias(0);
39873 }
39874 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39875diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39876index 872c577..5fb3c20 100644
39877--- a/drivers/cpufreq/intel_pstate.c
39878+++ b/drivers/cpufreq/intel_pstate.c
39879@@ -133,10 +133,10 @@ struct pstate_funcs {
39880 struct cpu_defaults {
39881 struct pstate_adjust_policy pid_policy;
39882 struct pstate_funcs funcs;
39883-};
39884+} __do_const;
39885
39886 static struct pstate_adjust_policy pid_params;
39887-static struct pstate_funcs pstate_funcs;
39888+static struct pstate_funcs *pstate_funcs;
39889 static int hwp_active;
39890
39891 struct perf_limits {
39892@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39893
39894 cpu->pstate.current_pstate = pstate;
39895
39896- pstate_funcs.set(cpu, pstate);
39897+ pstate_funcs->set(cpu, pstate);
39898 }
39899
39900 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39901 {
39902- cpu->pstate.min_pstate = pstate_funcs.get_min();
39903- cpu->pstate.max_pstate = pstate_funcs.get_max();
39904- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39905- cpu->pstate.scaling = pstate_funcs.get_scaling();
39906+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39907+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39908+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39909+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39910
39911- if (pstate_funcs.get_vid)
39912- pstate_funcs.get_vid(cpu);
39913+ if (pstate_funcs->get_vid)
39914+ pstate_funcs->get_vid(cpu);
39915 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39916 }
39917
39918@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
39919 rdmsrl(MSR_IA32_APERF, aperf);
39920 rdmsrl(MSR_IA32_MPERF, mperf);
39921
39922- if (!pstate_funcs.get_max() ||
39923- !pstate_funcs.get_min() ||
39924- !pstate_funcs.get_turbo())
39925+ if (!pstate_funcs->get_max() ||
39926+ !pstate_funcs->get_min() ||
39927+ !pstate_funcs->get_turbo())
39928 return -ENODEV;
39929
39930 rdmsrl(MSR_IA32_APERF, tmp);
39931@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
39932 return 0;
39933 }
39934
39935-static void copy_pid_params(struct pstate_adjust_policy *policy)
39936+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39937 {
39938 pid_params.sample_rate_ms = policy->sample_rate_ms;
39939 pid_params.p_gain_pct = policy->p_gain_pct;
39940@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39941
39942 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39943 {
39944- pstate_funcs.get_max = funcs->get_max;
39945- pstate_funcs.get_min = funcs->get_min;
39946- pstate_funcs.get_turbo = funcs->get_turbo;
39947- pstate_funcs.get_scaling = funcs->get_scaling;
39948- pstate_funcs.set = funcs->set;
39949- pstate_funcs.get_vid = funcs->get_vid;
39950+ pstate_funcs = funcs;
39951 }
39952
39953 #if IS_ENABLED(CONFIG_ACPI)
39954diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39955index 529cfd9..0e28fff 100644
39956--- a/drivers/cpufreq/p4-clockmod.c
39957+++ b/drivers/cpufreq/p4-clockmod.c
39958@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39959 case 0x0F: /* Core Duo */
39960 case 0x16: /* Celeron Core */
39961 case 0x1C: /* Atom */
39962- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39963+ pax_open_kernel();
39964+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39965+ pax_close_kernel();
39966 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39967 case 0x0D: /* Pentium M (Dothan) */
39968- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39969+ pax_open_kernel();
39970+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39971+ pax_close_kernel();
39972 /* fall through */
39973 case 0x09: /* Pentium M (Banias) */
39974 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39975@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39976
39977 /* on P-4s, the TSC runs with constant frequency independent whether
39978 * throttling is active or not. */
39979- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39980+ pax_open_kernel();
39981+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39982+ pax_close_kernel();
39983
39984 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39985 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39986diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39987index 9bb42ba..b01b4a2 100644
39988--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39989+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39990@@ -18,14 +18,12 @@
39991 #include <asm/head.h>
39992 #include <asm/timer.h>
39993
39994-static struct cpufreq_driver *cpufreq_us3_driver;
39995-
39996 struct us3_freq_percpu_info {
39997 struct cpufreq_frequency_table table[4];
39998 };
39999
40000 /* Indexed by cpu number. */
40001-static struct us3_freq_percpu_info *us3_freq_table;
40002+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
40003
40004 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
40005 * in the Safari config register.
40006@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
40007
40008 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
40009 {
40010- if (cpufreq_us3_driver)
40011- us3_freq_target(policy, 0);
40012+ us3_freq_target(policy, 0);
40013
40014 return 0;
40015 }
40016
40017+static int __init us3_freq_init(void);
40018+static void __exit us3_freq_exit(void);
40019+
40020+static struct cpufreq_driver cpufreq_us3_driver = {
40021+ .init = us3_freq_cpu_init,
40022+ .verify = cpufreq_generic_frequency_table_verify,
40023+ .target_index = us3_freq_target,
40024+ .get = us3_freq_get,
40025+ .exit = us3_freq_cpu_exit,
40026+ .name = "UltraSPARC-III",
40027+
40028+};
40029+
40030 static int __init us3_freq_init(void)
40031 {
40032 unsigned long manuf, impl, ver;
40033- int ret;
40034
40035 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40036 return -ENODEV;
40037@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40038 (impl == CHEETAH_IMPL ||
40039 impl == CHEETAH_PLUS_IMPL ||
40040 impl == JAGUAR_IMPL ||
40041- impl == PANTHER_IMPL)) {
40042- struct cpufreq_driver *driver;
40043-
40044- ret = -ENOMEM;
40045- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40046- if (!driver)
40047- goto err_out;
40048-
40049- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40050- GFP_KERNEL);
40051- if (!us3_freq_table)
40052- goto err_out;
40053-
40054- driver->init = us3_freq_cpu_init;
40055- driver->verify = cpufreq_generic_frequency_table_verify;
40056- driver->target_index = us3_freq_target;
40057- driver->get = us3_freq_get;
40058- driver->exit = us3_freq_cpu_exit;
40059- strcpy(driver->name, "UltraSPARC-III");
40060-
40061- cpufreq_us3_driver = driver;
40062- ret = cpufreq_register_driver(driver);
40063- if (ret)
40064- goto err_out;
40065-
40066- return 0;
40067-
40068-err_out:
40069- if (driver) {
40070- kfree(driver);
40071- cpufreq_us3_driver = NULL;
40072- }
40073- kfree(us3_freq_table);
40074- us3_freq_table = NULL;
40075- return ret;
40076- }
40077+ impl == PANTHER_IMPL))
40078+ return cpufreq_register_driver(&cpufreq_us3_driver);
40079
40080 return -ENODEV;
40081 }
40082
40083 static void __exit us3_freq_exit(void)
40084 {
40085- if (cpufreq_us3_driver) {
40086- cpufreq_unregister_driver(cpufreq_us3_driver);
40087- kfree(cpufreq_us3_driver);
40088- cpufreq_us3_driver = NULL;
40089- kfree(us3_freq_table);
40090- us3_freq_table = NULL;
40091- }
40092+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40093 }
40094
40095 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40096diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40097index 7d4a315..21bb886 100644
40098--- a/drivers/cpufreq/speedstep-centrino.c
40099+++ b/drivers/cpufreq/speedstep-centrino.c
40100@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40101 !cpu_has(cpu, X86_FEATURE_EST))
40102 return -ENODEV;
40103
40104- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40105- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40106+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40107+ pax_open_kernel();
40108+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40109+ pax_close_kernel();
40110+ }
40111
40112 if (policy->cpu != 0)
40113 return -ENODEV;
40114diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40115index 2697e87..c32476c 100644
40116--- a/drivers/cpuidle/driver.c
40117+++ b/drivers/cpuidle/driver.c
40118@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
40119
40120 static void poll_idle_init(struct cpuidle_driver *drv)
40121 {
40122- struct cpuidle_state *state = &drv->states[0];
40123+ cpuidle_state_no_const *state = &drv->states[0];
40124
40125 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40126 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40127diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40128index fb9f511..213e6cc 100644
40129--- a/drivers/cpuidle/governor.c
40130+++ b/drivers/cpuidle/governor.c
40131@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40132 mutex_lock(&cpuidle_lock);
40133 if (__cpuidle_find_governor(gov->name) == NULL) {
40134 ret = 0;
40135- list_add_tail(&gov->governor_list, &cpuidle_governors);
40136+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40137 if (!cpuidle_curr_governor ||
40138 cpuidle_curr_governor->rating < gov->rating)
40139 cpuidle_switch_governor(gov);
40140diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40141index 832a2c3..1794080 100644
40142--- a/drivers/cpuidle/sysfs.c
40143+++ b/drivers/cpuidle/sysfs.c
40144@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40145 NULL
40146 };
40147
40148-static struct attribute_group cpuidle_attr_group = {
40149+static attribute_group_no_const cpuidle_attr_group = {
40150 .attrs = cpuidle_default_attrs,
40151 .name = "cpuidle",
40152 };
40153diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40154index 8d2a772..33826c9 100644
40155--- a/drivers/crypto/hifn_795x.c
40156+++ b/drivers/crypto/hifn_795x.c
40157@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40158 MODULE_PARM_DESC(hifn_pll_ref,
40159 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40160
40161-static atomic_t hifn_dev_number;
40162+static atomic_unchecked_t hifn_dev_number;
40163
40164 #define ACRYPTO_OP_DECRYPT 0
40165 #define ACRYPTO_OP_ENCRYPT 1
40166@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40167 goto err_out_disable_pci_device;
40168
40169 snprintf(name, sizeof(name), "hifn%d",
40170- atomic_inc_return(&hifn_dev_number)-1);
40171+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40172
40173 err = pci_request_regions(pdev, name);
40174 if (err)
40175diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40176index 30b538d8..1610d75 100644
40177--- a/drivers/devfreq/devfreq.c
40178+++ b/drivers/devfreq/devfreq.c
40179@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40180 goto err_out;
40181 }
40182
40183- list_add(&governor->node, &devfreq_governor_list);
40184+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40185
40186 list_for_each_entry(devfreq, &devfreq_list, node) {
40187 int ret = 0;
40188@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40189 }
40190 }
40191
40192- list_del(&governor->node);
40193+ pax_list_del((struct list_head *)&governor->node);
40194 err_out:
40195 mutex_unlock(&devfreq_list_lock);
40196
40197diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40198index 8ee383d..736b5de 100644
40199--- a/drivers/dma/sh/shdma-base.c
40200+++ b/drivers/dma/sh/shdma-base.c
40201@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40202 schan->slave_id = -EINVAL;
40203 }
40204
40205- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40206- sdev->desc_size, GFP_KERNEL);
40207+ schan->desc = kcalloc(sdev->desc_size,
40208+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40209 if (!schan->desc) {
40210 ret = -ENOMEM;
40211 goto edescalloc;
40212diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40213index 9f1d4c7..fceff78 100644
40214--- a/drivers/dma/sh/shdmac.c
40215+++ b/drivers/dma/sh/shdmac.c
40216@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40217 return ret;
40218 }
40219
40220-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40221+static struct notifier_block sh_dmae_nmi_notifier = {
40222 .notifier_call = sh_dmae_nmi_handler,
40223
40224 /* Run before NMI debug handler and KGDB */
40225diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40226index 592af5f..bb1d583 100644
40227--- a/drivers/edac/edac_device.c
40228+++ b/drivers/edac/edac_device.c
40229@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40230 */
40231 int edac_device_alloc_index(void)
40232 {
40233- static atomic_t device_indexes = ATOMIC_INIT(0);
40234+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40235
40236- return atomic_inc_return(&device_indexes) - 1;
40237+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40238 }
40239 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40240
40241diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40242index c84eecb..4d7381d 100644
40243--- a/drivers/edac/edac_mc_sysfs.c
40244+++ b/drivers/edac/edac_mc_sysfs.c
40245@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40246 struct dev_ch_attribute {
40247 struct device_attribute attr;
40248 int channel;
40249-};
40250+} __do_const;
40251
40252 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40253 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40254@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
40255 }
40256
40257 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
40258+ pax_open_kernel();
40259 if (mci->get_sdram_scrub_rate) {
40260- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40261- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40262+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40263+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40264 }
40265
40266 if (mci->set_sdram_scrub_rate) {
40267- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40268- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40269+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40270+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40271 }
40272+ pax_close_kernel();
40273
40274 err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
40275 if (err) {
40276diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40277index 2cf44b4d..6dd2dc7 100644
40278--- a/drivers/edac/edac_pci.c
40279+++ b/drivers/edac/edac_pci.c
40280@@ -29,7 +29,7 @@
40281
40282 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40283 static LIST_HEAD(edac_pci_list);
40284-static atomic_t pci_indexes = ATOMIC_INIT(0);
40285+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40286
40287 /*
40288 * edac_pci_alloc_ctl_info
40289@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40290 */
40291 int edac_pci_alloc_index(void)
40292 {
40293- return atomic_inc_return(&pci_indexes) - 1;
40294+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40295 }
40296 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40297
40298diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40299index 24d877f..4e30133 100644
40300--- a/drivers/edac/edac_pci_sysfs.c
40301+++ b/drivers/edac/edac_pci_sysfs.c
40302@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40303 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40304 static int edac_pci_poll_msec = 1000; /* one second workq period */
40305
40306-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40307-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40308+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40309+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40310
40311 static struct kobject *edac_pci_top_main_kobj;
40312 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40313@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40314 void *value;
40315 ssize_t(*show) (void *, char *);
40316 ssize_t(*store) (void *, const char *, size_t);
40317-};
40318+} __do_const;
40319
40320 /* Set of show/store abstract level functions for PCI Parity object */
40321 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40322@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40323 edac_printk(KERN_CRIT, EDAC_PCI,
40324 "Signaled System Error on %s\n",
40325 pci_name(dev));
40326- atomic_inc(&pci_nonparity_count);
40327+ atomic_inc_unchecked(&pci_nonparity_count);
40328 }
40329
40330 if (status & (PCI_STATUS_PARITY)) {
40331@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40332 "Master Data Parity Error on %s\n",
40333 pci_name(dev));
40334
40335- atomic_inc(&pci_parity_count);
40336+ atomic_inc_unchecked(&pci_parity_count);
40337 }
40338
40339 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40340@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40341 "Detected Parity Error on %s\n",
40342 pci_name(dev));
40343
40344- atomic_inc(&pci_parity_count);
40345+ atomic_inc_unchecked(&pci_parity_count);
40346 }
40347 }
40348
40349@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40350 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40351 "Signaled System Error on %s\n",
40352 pci_name(dev));
40353- atomic_inc(&pci_nonparity_count);
40354+ atomic_inc_unchecked(&pci_nonparity_count);
40355 }
40356
40357 if (status & (PCI_STATUS_PARITY)) {
40358@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40359 "Master Data Parity Error on "
40360 "%s\n", pci_name(dev));
40361
40362- atomic_inc(&pci_parity_count);
40363+ atomic_inc_unchecked(&pci_parity_count);
40364 }
40365
40366 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40367@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40368 "Detected Parity Error on %s\n",
40369 pci_name(dev));
40370
40371- atomic_inc(&pci_parity_count);
40372+ atomic_inc_unchecked(&pci_parity_count);
40373 }
40374 }
40375 }
40376@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40377 if (!check_pci_errors)
40378 return;
40379
40380- before_count = atomic_read(&pci_parity_count);
40381+ before_count = atomic_read_unchecked(&pci_parity_count);
40382
40383 /* scan all PCI devices looking for a Parity Error on devices and
40384 * bridges.
40385@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40386 /* Only if operator has selected panic on PCI Error */
40387 if (edac_pci_get_panic_on_pe()) {
40388 /* If the count is different 'after' from 'before' */
40389- if (before_count != atomic_read(&pci_parity_count))
40390+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40391 panic("EDAC: PCI Parity Error");
40392 }
40393 }
40394diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40395index c2359a1..8bd119d 100644
40396--- a/drivers/edac/mce_amd.h
40397+++ b/drivers/edac/mce_amd.h
40398@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40399 bool (*mc0_mce)(u16, u8);
40400 bool (*mc1_mce)(u16, u8);
40401 bool (*mc2_mce)(u16, u8);
40402-};
40403+} __no_const;
40404
40405 void amd_report_gart_errors(bool);
40406 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40407diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40408index 57ea7f4..af06b76 100644
40409--- a/drivers/firewire/core-card.c
40410+++ b/drivers/firewire/core-card.c
40411@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40412 const struct fw_card_driver *driver,
40413 struct device *device)
40414 {
40415- static atomic_t index = ATOMIC_INIT(-1);
40416+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40417
40418- card->index = atomic_inc_return(&index);
40419+ card->index = atomic_inc_return_unchecked(&index);
40420 card->driver = driver;
40421 card->device = device;
40422 card->current_tlabel = 0;
40423@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40424
40425 void fw_core_remove_card(struct fw_card *card)
40426 {
40427- struct fw_card_driver dummy_driver = dummy_driver_template;
40428+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40429
40430 card->driver->update_phy_reg(card, 4,
40431 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40432diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40433index f9e3aee..269dbdb 100644
40434--- a/drivers/firewire/core-device.c
40435+++ b/drivers/firewire/core-device.c
40436@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40437 struct config_rom_attribute {
40438 struct device_attribute attr;
40439 u32 key;
40440-};
40441+} __do_const;
40442
40443 static ssize_t show_immediate(struct device *dev,
40444 struct device_attribute *dattr, char *buf)
40445diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40446index d6a09b9..18e90dd 100644
40447--- a/drivers/firewire/core-transaction.c
40448+++ b/drivers/firewire/core-transaction.c
40449@@ -38,6 +38,7 @@
40450 #include <linux/timer.h>
40451 #include <linux/types.h>
40452 #include <linux/workqueue.h>
40453+#include <linux/sched.h>
40454
40455 #include <asm/byteorder.h>
40456
40457diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40458index e1480ff6..1a429bd 100644
40459--- a/drivers/firewire/core.h
40460+++ b/drivers/firewire/core.h
40461@@ -111,6 +111,7 @@ struct fw_card_driver {
40462
40463 int (*stop_iso)(struct fw_iso_context *ctx);
40464 };
40465+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40466
40467 void fw_card_initialize(struct fw_card *card,
40468 const struct fw_card_driver *driver, struct device *device);
40469diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40470index f51d376..b118e40 100644
40471--- a/drivers/firewire/ohci.c
40472+++ b/drivers/firewire/ohci.c
40473@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40474 be32_to_cpu(ohci->next_header));
40475 }
40476
40477+#ifndef CONFIG_GRKERNSEC
40478 if (param_remote_dma) {
40479 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40480 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40481 }
40482+#endif
40483
40484 spin_unlock_irq(&ohci->lock);
40485
40486@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40487 unsigned long flags;
40488 int n, ret = 0;
40489
40490+#ifndef CONFIG_GRKERNSEC
40491 if (param_remote_dma)
40492 return 0;
40493+#endif
40494
40495 /*
40496 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40497diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40498index 94a58a0..f5eba42 100644
40499--- a/drivers/firmware/dmi-id.c
40500+++ b/drivers/firmware/dmi-id.c
40501@@ -16,7 +16,7 @@
40502 struct dmi_device_attribute{
40503 struct device_attribute dev_attr;
40504 int field;
40505-};
40506+} __do_const;
40507 #define to_dmi_dev_attr(_dev_attr) \
40508 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40509
40510diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40511index ccc2018..56a33c5 100644
40512--- a/drivers/firmware/dmi_scan.c
40513+++ b/drivers/firmware/dmi_scan.c
40514@@ -894,7 +894,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40515 if (buf == NULL)
40516 return -1;
40517
40518- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40519+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40520
40521 dmi_unmap(buf);
40522 return 0;
40523diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40524index 4fd9961..52d60ce 100644
40525--- a/drivers/firmware/efi/cper.c
40526+++ b/drivers/firmware/efi/cper.c
40527@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40528 */
40529 u64 cper_next_record_id(void)
40530 {
40531- static atomic64_t seq;
40532+ static atomic64_unchecked_t seq;
40533
40534- if (!atomic64_read(&seq))
40535- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40536+ if (!atomic64_read_unchecked(&seq))
40537+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40538
40539- return atomic64_inc_return(&seq);
40540+ return atomic64_inc_return_unchecked(&seq);
40541 }
40542 EXPORT_SYMBOL_GPL(cper_next_record_id);
40543
40544diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40545index 3061bb8..92b5fcc 100644
40546--- a/drivers/firmware/efi/efi.c
40547+++ b/drivers/firmware/efi/efi.c
40548@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
40549 };
40550
40551 static struct efivars generic_efivars;
40552-static struct efivar_operations generic_ops;
40553+static efivar_operations_no_const generic_ops __read_only;
40554
40555 static int generic_ops_register(void)
40556 {
40557- generic_ops.get_variable = efi.get_variable;
40558- generic_ops.set_variable = efi.set_variable;
40559- generic_ops.get_next_variable = efi.get_next_variable;
40560- generic_ops.query_variable_store = efi_query_variable_store;
40561+ pax_open_kernel();
40562+ *(void **)&generic_ops.get_variable = efi.get_variable;
40563+ *(void **)&generic_ops.set_variable = efi.set_variable;
40564+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40565+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40566+ pax_close_kernel();
40567
40568 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40569 }
40570diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40571index 7b2e049..a253334 100644
40572--- a/drivers/firmware/efi/efivars.c
40573+++ b/drivers/firmware/efi/efivars.c
40574@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40575 static int
40576 create_efivars_bin_attributes(void)
40577 {
40578- struct bin_attribute *attr;
40579+ bin_attribute_no_const *attr;
40580 int error;
40581
40582 /* new_var */
40583diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40584index 87b8e3b..c4afb35 100644
40585--- a/drivers/firmware/efi/runtime-map.c
40586+++ b/drivers/firmware/efi/runtime-map.c
40587@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40588 kfree(entry);
40589 }
40590
40591-static struct kobj_type __refdata map_ktype = {
40592+static const struct kobj_type __refconst map_ktype = {
40593 .sysfs_ops = &map_attr_ops,
40594 .default_attrs = def_attrs,
40595 .release = map_release,
40596diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40597index f1ab05e..ab51228 100644
40598--- a/drivers/firmware/google/gsmi.c
40599+++ b/drivers/firmware/google/gsmi.c
40600@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40601 return local_hash_64(input, 32);
40602 }
40603
40604-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40605+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40606 {
40607 .ident = "Google Board",
40608 .matches = {
40609diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40610index 2f569aa..26e4f39 100644
40611--- a/drivers/firmware/google/memconsole.c
40612+++ b/drivers/firmware/google/memconsole.c
40613@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40614 return false;
40615 }
40616
40617-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40618+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40619 {
40620 .ident = "Google Board",
40621 .matches = {
40622@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40623 if (!found_memconsole())
40624 return -ENODEV;
40625
40626- memconsole_bin_attr.size = memconsole_length;
40627+ pax_open_kernel();
40628+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40629+ pax_close_kernel();
40630+
40631 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40632 }
40633
40634diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40635index cc016c61..d35279e 100644
40636--- a/drivers/firmware/memmap.c
40637+++ b/drivers/firmware/memmap.c
40638@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40639 kfree(entry);
40640 }
40641
40642-static struct kobj_type __refdata memmap_ktype = {
40643+static const struct kobj_type __refconst memmap_ktype = {
40644 .release = release_firmware_map_entry,
40645 .sysfs_ops = &memmap_attr_ops,
40646 .default_attrs = def_attrs,
40647diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40648index 3cfcfc6..09d6f117 100644
40649--- a/drivers/gpio/gpio-em.c
40650+++ b/drivers/gpio/gpio-em.c
40651@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40652 struct em_gio_priv *p;
40653 struct resource *io[2], *irq[2];
40654 struct gpio_chip *gpio_chip;
40655- struct irq_chip *irq_chip;
40656+ irq_chip_no_const *irq_chip;
40657 const char *name = dev_name(&pdev->dev);
40658 int ret;
40659
40660diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40661index 7818cd1..1be40e5 100644
40662--- a/drivers/gpio/gpio-ich.c
40663+++ b/drivers/gpio/gpio-ich.c
40664@@ -94,7 +94,7 @@ struct ichx_desc {
40665 * this option allows driver caching written output values
40666 */
40667 bool use_outlvl_cache;
40668-};
40669+} __do_const;
40670
40671 static struct {
40672 spinlock_t lock;
40673diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40674index f476ae2..05e1bdd 100644
40675--- a/drivers/gpio/gpio-omap.c
40676+++ b/drivers/gpio/gpio-omap.c
40677@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40678 const struct omap_gpio_platform_data *pdata;
40679 struct resource *res;
40680 struct gpio_bank *bank;
40681- struct irq_chip *irqc;
40682+ irq_chip_no_const *irqc;
40683 int ret;
40684
40685 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40686diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40687index c49522e..9a7ee54 100644
40688--- a/drivers/gpio/gpio-rcar.c
40689+++ b/drivers/gpio/gpio-rcar.c
40690@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40691 struct gpio_rcar_priv *p;
40692 struct resource *io, *irq;
40693 struct gpio_chip *gpio_chip;
40694- struct irq_chip *irq_chip;
40695+ irq_chip_no_const *irq_chip;
40696 struct device *dev = &pdev->dev;
40697 const char *name = dev_name(dev);
40698 int ret;
40699diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40700index c1caa45..f0f97d2 100644
40701--- a/drivers/gpio/gpio-vr41xx.c
40702+++ b/drivers/gpio/gpio-vr41xx.c
40703@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40704 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40705 maskl, pendl, maskh, pendh);
40706
40707- atomic_inc(&irq_err_count);
40708+ atomic_inc_unchecked(&irq_err_count);
40709
40710 return -EINVAL;
40711 }
40712diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40713index 1ca9295..9f3d481 100644
40714--- a/drivers/gpio/gpiolib.c
40715+++ b/drivers/gpio/gpiolib.c
40716@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40717 }
40718
40719 if (gpiochip->irqchip) {
40720- gpiochip->irqchip->irq_request_resources = NULL;
40721- gpiochip->irqchip->irq_release_resources = NULL;
40722+ pax_open_kernel();
40723+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40724+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40725+ pax_close_kernel();
40726 gpiochip->irqchip = NULL;
40727 }
40728 }
40729@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40730 gpiochip->irqchip = NULL;
40731 return -EINVAL;
40732 }
40733- irqchip->irq_request_resources = gpiochip_irq_reqres;
40734- irqchip->irq_release_resources = gpiochip_irq_relres;
40735+
40736+ pax_open_kernel();
40737+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40738+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40739+ pax_close_kernel();
40740
40741 /*
40742 * Prepare the mapping since the irqchip shall be orthogonal to
40743diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40744index 488f51d..301d462 100644
40745--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40746+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40747@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40748 enum cache_policy alternate_policy,
40749 void __user *alternate_aperture_base,
40750 uint64_t alternate_aperture_size);
40751-};
40752+} __no_const;
40753
40754 /**
40755 * struct device_queue_manager
40756diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40757index 5940531..a75b0e5 100644
40758--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40759+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40760@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40761
40762 void (*submit_packet)(struct kernel_queue *kq);
40763 void (*rollback_packet)(struct kernel_queue *kq);
40764-};
40765+} __no_const;
40766
40767 struct kernel_queue {
40768 struct kernel_queue_ops ops;
40769diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40770index 9b23525..65f4110 100644
40771--- a/drivers/gpu/drm/drm_context.c
40772+++ b/drivers/gpu/drm/drm_context.c
40773@@ -53,6 +53,9 @@ struct drm_ctx_list {
40774 */
40775 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40776 {
40777+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40778+ return;
40779+
40780 mutex_lock(&dev->struct_mutex);
40781 idr_remove(&dev->ctx_idr, ctx_handle);
40782 mutex_unlock(&dev->struct_mutex);
40783@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40784 */
40785 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40786 {
40787+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40788+ return -EINVAL;
40789+
40790 idr_init(&dev->ctx_idr);
40791 return 0;
40792 }
40793@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40794 */
40795 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40796 {
40797+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40798+ return;
40799+
40800 mutex_lock(&dev->struct_mutex);
40801 idr_destroy(&dev->ctx_idr);
40802 mutex_unlock(&dev->struct_mutex);
40803@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40804 {
40805 struct drm_ctx_list *pos, *tmp;
40806
40807+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40808+ return;
40809+
40810 mutex_lock(&dev->ctxlist_mutex);
40811
40812 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40813 if (pos->tag == file &&
40814- pos->handle != DRM_KERNEL_CONTEXT) {
40815+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40816 if (dev->driver->context_dtor)
40817 dev->driver->context_dtor(dev, pos->handle);
40818
40819@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40820 struct drm_local_map *map;
40821 struct drm_map_list *_entry;
40822
40823+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40824+ return -EINVAL;
40825+
40826 mutex_lock(&dev->struct_mutex);
40827
40828 map = idr_find(&dev->ctx_idr, request->ctx_id);
40829@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40830 struct drm_local_map *map = NULL;
40831 struct drm_map_list *r_list = NULL;
40832
40833+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40834+ return -EINVAL;
40835+
40836 mutex_lock(&dev->struct_mutex);
40837 list_for_each_entry(r_list, &dev->maplist, head) {
40838 if (r_list->map
40839@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40840 {
40841 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40842
40843- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40844+ if (file_priv->master->lock.hw_lock == NULL) {
40845+ DRM_ERROR(
40846+ "Device has been unregistered. Hard exit. Process %d\n",
40847+ task_pid_nr(current));
40848+ send_sig(SIGTERM, current, 0);
40849+ return -EPERM;
40850+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40851 DRM_ERROR("Lock isn't held after context switch\n");
40852 }
40853
40854@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40855 struct drm_ctx ctx;
40856 int i;
40857
40858+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40859+ return -EINVAL;
40860+
40861 if (res->count >= DRM_RESERVED_CONTEXTS) {
40862 memset(&ctx, 0, sizeof(ctx));
40863 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40864@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40865 struct drm_ctx_list *ctx_entry;
40866 struct drm_ctx *ctx = data;
40867
40868+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40869+ return -EINVAL;
40870+
40871 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40872- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40873+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40874 /* Skip kernel's context and get a new one. */
40875 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40876 }
40877@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40878 {
40879 struct drm_ctx *ctx = data;
40880
40881+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40882+ return -EINVAL;
40883+
40884 /* This is 0, because we don't handle any context flags */
40885 ctx->flags = 0;
40886
40887@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40888 {
40889 struct drm_ctx *ctx = data;
40890
40891+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40892+ return -EINVAL;
40893+
40894 DRM_DEBUG("%d\n", ctx->handle);
40895 return drm_context_switch(dev, dev->last_context, ctx->handle);
40896 }
40897@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40898 {
40899 struct drm_ctx *ctx = data;
40900
40901+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40902+ return -EINVAL;
40903+
40904 DRM_DEBUG("%d\n", ctx->handle);
40905 drm_context_switch_complete(dev, file_priv, ctx->handle);
40906
40907@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40908 {
40909 struct drm_ctx *ctx = data;
40910
40911+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40912+ return -EINVAL;
40913+
40914 DRM_DEBUG("%d\n", ctx->handle);
40915- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40916+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40917 if (dev->driver->context_dtor)
40918 dev->driver->context_dtor(dev, ctx->handle);
40919 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40920diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40921index b6f076b..2918de2 100644
40922--- a/drivers/gpu/drm/drm_crtc.c
40923+++ b/drivers/gpu/drm/drm_crtc.c
40924@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40925 goto done;
40926 }
40927
40928- if (copy_to_user(&enum_ptr[copied].name,
40929+ if (copy_to_user(enum_ptr[copied].name,
40930 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40931 ret = -EFAULT;
40932 goto done;
40933diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40934index d512134..a80a8e4 100644
40935--- a/drivers/gpu/drm/drm_drv.c
40936+++ b/drivers/gpu/drm/drm_drv.c
40937@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40938
40939 drm_device_set_unplugged(dev);
40940
40941- if (dev->open_count == 0) {
40942+ if (local_read(&dev->open_count) == 0) {
40943 drm_put_dev(dev);
40944 }
40945 mutex_unlock(&drm_global_mutex);
40946@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40947 if (drm_ht_create(&dev->map_hash, 12))
40948 goto err_minors;
40949
40950- ret = drm_legacy_ctxbitmap_init(dev);
40951- if (ret) {
40952- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40953- goto err_ht;
40954+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40955+ ret = drm_legacy_ctxbitmap_init(dev);
40956+ if (ret) {
40957+ DRM_ERROR(
40958+ "Cannot allocate memory for context bitmap.\n");
40959+ goto err_ht;
40960+ }
40961 }
40962
40963 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40964diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40965index 076dd60..e4a4ba7 100644
40966--- a/drivers/gpu/drm/drm_fops.c
40967+++ b/drivers/gpu/drm/drm_fops.c
40968@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40969 return PTR_ERR(minor);
40970
40971 dev = minor->dev;
40972- if (!dev->open_count++)
40973+ if (local_inc_return(&dev->open_count) == 1)
40974 need_setup = 1;
40975
40976 /* share address_space across all char-devs of a single device */
40977@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40978 return 0;
40979
40980 err_undo:
40981- dev->open_count--;
40982+ local_dec(&dev->open_count);
40983 drm_minor_release(minor);
40984 return retcode;
40985 }
40986@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40987
40988 mutex_lock(&drm_global_mutex);
40989
40990- DRM_DEBUG("open_count = %d\n", dev->open_count);
40991+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40992
40993 mutex_lock(&dev->struct_mutex);
40994 list_del(&file_priv->lhead);
40995@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40996 * Begin inline drm_release
40997 */
40998
40999- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
41000+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
41001 task_pid_nr(current),
41002 (long)old_encode_dev(file_priv->minor->kdev->devt),
41003- dev->open_count);
41004+ local_read(&dev->open_count));
41005
41006 /* Release any auth tokens that might point to this file_priv,
41007 (do that under the drm_global_mutex) */
41008@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
41009 * End inline drm_release
41010 */
41011
41012- if (!--dev->open_count) {
41013+ if (local_dec_and_test(&dev->open_count)) {
41014 retcode = drm_lastclose(dev);
41015 if (drm_device_is_unplugged(dev))
41016 drm_put_dev(dev);
41017diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
41018index 3d2e91c..d31c4c9 100644
41019--- a/drivers/gpu/drm/drm_global.c
41020+++ b/drivers/gpu/drm/drm_global.c
41021@@ -36,7 +36,7 @@
41022 struct drm_global_item {
41023 struct mutex mutex;
41024 void *object;
41025- int refcount;
41026+ atomic_t refcount;
41027 };
41028
41029 static struct drm_global_item glob[DRM_GLOBAL_NUM];
41030@@ -49,7 +49,7 @@ void drm_global_init(void)
41031 struct drm_global_item *item = &glob[i];
41032 mutex_init(&item->mutex);
41033 item->object = NULL;
41034- item->refcount = 0;
41035+ atomic_set(&item->refcount, 0);
41036 }
41037 }
41038
41039@@ -59,7 +59,7 @@ void drm_global_release(void)
41040 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41041 struct drm_global_item *item = &glob[i];
41042 BUG_ON(item->object != NULL);
41043- BUG_ON(item->refcount != 0);
41044+ BUG_ON(atomic_read(&item->refcount) != 0);
41045 }
41046 }
41047
41048@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41049 struct drm_global_item *item = &glob[ref->global_type];
41050
41051 mutex_lock(&item->mutex);
41052- if (item->refcount == 0) {
41053+ if (atomic_read(&item->refcount) == 0) {
41054 item->object = kzalloc(ref->size, GFP_KERNEL);
41055 if (unlikely(item->object == NULL)) {
41056 ret = -ENOMEM;
41057@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41058 goto out_err;
41059
41060 }
41061- ++item->refcount;
41062+ atomic_inc(&item->refcount);
41063 ref->object = item->object;
41064 mutex_unlock(&item->mutex);
41065 return 0;
41066@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41067 struct drm_global_item *item = &glob[ref->global_type];
41068
41069 mutex_lock(&item->mutex);
41070- BUG_ON(item->refcount == 0);
41071+ BUG_ON(atomic_read(&item->refcount) == 0);
41072 BUG_ON(ref->object != item->object);
41073- if (--item->refcount == 0) {
41074+ if (atomic_dec_and_test(&item->refcount)) {
41075 ref->release(ref);
41076 item->object = NULL;
41077 }
41078diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41079index f1b32f9..394f791 100644
41080--- a/drivers/gpu/drm/drm_info.c
41081+++ b/drivers/gpu/drm/drm_info.c
41082@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41083 struct drm_local_map *map;
41084 struct drm_map_list *r_list;
41085
41086- /* Hardcoded from _DRM_FRAME_BUFFER,
41087- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41088- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41089- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41090+ static const char * const types[] = {
41091+ [_DRM_FRAME_BUFFER] = "FB",
41092+ [_DRM_REGISTERS] = "REG",
41093+ [_DRM_SHM] = "SHM",
41094+ [_DRM_AGP] = "AGP",
41095+ [_DRM_SCATTER_GATHER] = "SG",
41096+ [_DRM_CONSISTENT] = "PCI"};
41097 const char *type;
41098 int i;
41099
41100@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41101 map = r_list->map;
41102 if (!map)
41103 continue;
41104- if (map->type < 0 || map->type > 5)
41105+ if (map->type >= ARRAY_SIZE(types))
41106 type = "??";
41107 else
41108 type = types[map->type];
41109diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41110index 2f4c4343..dd12cd2 100644
41111--- a/drivers/gpu/drm/drm_ioc32.c
41112+++ b/drivers/gpu/drm/drm_ioc32.c
41113@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41114 request = compat_alloc_user_space(nbytes);
41115 if (!access_ok(VERIFY_WRITE, request, nbytes))
41116 return -EFAULT;
41117- list = (struct drm_buf_desc *) (request + 1);
41118+ list = (struct drm_buf_desc __user *) (request + 1);
41119
41120 if (__put_user(count, &request->count)
41121 || __put_user(list, &request->list))
41122@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41123 request = compat_alloc_user_space(nbytes);
41124 if (!access_ok(VERIFY_WRITE, request, nbytes))
41125 return -EFAULT;
41126- list = (struct drm_buf_pub *) (request + 1);
41127+ list = (struct drm_buf_pub __user *) (request + 1);
41128
41129 if (__put_user(count, &request->count)
41130 || __put_user(list, &request->list))
41131@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41132 return 0;
41133 }
41134
41135-drm_ioctl_compat_t *drm_compat_ioctls[] = {
41136+drm_ioctl_compat_t drm_compat_ioctls[] = {
41137 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41138 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41139 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41140@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
41141 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41142 {
41143 unsigned int nr = DRM_IOCTL_NR(cmd);
41144- drm_ioctl_compat_t *fn;
41145 int ret;
41146
41147 /* Assume that ioctls without an explicit compat routine will just
41148@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41149 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41150 return drm_ioctl(filp, cmd, arg);
41151
41152- fn = drm_compat_ioctls[nr];
41153-
41154- if (fn != NULL)
41155- ret = (*fn) (filp, cmd, arg);
41156+ if (drm_compat_ioctls[nr] != NULL)
41157+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41158 else
41159 ret = drm_ioctl(filp, cmd, arg);
41160
41161diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41162index 3785d66..1c489ef 100644
41163--- a/drivers/gpu/drm/drm_ioctl.c
41164+++ b/drivers/gpu/drm/drm_ioctl.c
41165@@ -655,7 +655,7 @@ long drm_ioctl(struct file *filp,
41166 struct drm_file *file_priv = filp->private_data;
41167 struct drm_device *dev;
41168 const struct drm_ioctl_desc *ioctl = NULL;
41169- drm_ioctl_t *func;
41170+ drm_ioctl_no_const_t func;
41171 unsigned int nr = DRM_IOCTL_NR(cmd);
41172 int retcode = -EINVAL;
41173 char stack_kdata[128];
41174diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41175index f861361..b61d4c7 100644
41176--- a/drivers/gpu/drm/drm_lock.c
41177+++ b/drivers/gpu/drm/drm_lock.c
41178@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41179 struct drm_master *master = file_priv->master;
41180 int ret = 0;
41181
41182+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41183+ return -EINVAL;
41184+
41185 ++file_priv->lock_count;
41186
41187- if (lock->context == DRM_KERNEL_CONTEXT) {
41188+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41189 DRM_ERROR("Process %d using kernel context %d\n",
41190 task_pid_nr(current), lock->context);
41191 return -EINVAL;
41192@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41193 struct drm_lock *lock = data;
41194 struct drm_master *master = file_priv->master;
41195
41196- if (lock->context == DRM_KERNEL_CONTEXT) {
41197+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41198+ return -EINVAL;
41199+
41200+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41201 DRM_ERROR("Process %d using kernel context %d\n",
41202 task_pid_nr(current), lock->context);
41203 return -EINVAL;
41204 }
41205
41206+ if (!master->lock.hw_lock) {
41207+ DRM_ERROR(
41208+ "Device has been unregistered. Hard exit. Process %d\n",
41209+ task_pid_nr(current));
41210+ send_sig(SIGTERM, current, 0);
41211+ return -EPERM;
41212+ }
41213+
41214 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41215 /* FIXME: Should really bail out here. */
41216 }
41217diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41218index d4813e0..6c1ab4d 100644
41219--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41220+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41221@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41222 u32 pipeconf_reg = PIPEACONF;
41223 u32 dspcntr_reg = DSPACNTR;
41224
41225- u32 pipeconf = dev_priv->pipeconf[pipe];
41226- u32 dspcntr = dev_priv->dspcntr[pipe];
41227+ u32 pipeconf;
41228+ u32 dspcntr;
41229 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41230
41231+ if (pipe == -1)
41232+ return;
41233+
41234+ pipeconf = dev_priv->pipeconf[pipe];
41235+ dspcntr = dev_priv->dspcntr[pipe];
41236+
41237 if (pipe) {
41238 pipeconf_reg = PIPECCONF;
41239 dspcntr_reg = DSPCCNTR;
41240diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41241index 93ec5dc..82acbaf 100644
41242--- a/drivers/gpu/drm/i810/i810_drv.h
41243+++ b/drivers/gpu/drm/i810/i810_drv.h
41244@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41245 int page_flipping;
41246
41247 wait_queue_head_t irq_queue;
41248- atomic_t irq_received;
41249- atomic_t irq_emitted;
41250+ atomic_unchecked_t irq_received;
41251+ atomic_unchecked_t irq_emitted;
41252
41253 int front_offset;
41254 } drm_i810_private_t;
41255diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41256index 1a46787..7fb387c 100644
41257--- a/drivers/gpu/drm/i915/i915_dma.c
41258+++ b/drivers/gpu/drm/i915/i915_dma.c
41259@@ -149,6 +149,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
41260 case I915_PARAM_MMAP_VERSION:
41261 value = 1;
41262 break;
41263+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41264+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41265+ break;
41266 default:
41267 DRM_DEBUG("Unknown parameter %d\n", param->param);
41268 return -EINVAL;
41269@@ -362,7 +365,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41270 * locking inversion with the driver load path. And the access here is
41271 * completely racy anyway. So don't bother with locking for now.
41272 */
41273- return dev->open_count == 0;
41274+ return local_read(&dev->open_count) == 0;
41275 }
41276
41277 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41278diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41279index 38a7425..5322b16 100644
41280--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41281+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41282@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41283 static int
41284 validate_exec_list(struct drm_device *dev,
41285 struct drm_i915_gem_exec_object2 *exec,
41286- int count)
41287+ unsigned int count)
41288 {
41289 unsigned relocs_total = 0;
41290 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41291 unsigned invalid_flags;
41292- int i;
41293+ unsigned int i;
41294
41295 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41296 if (USES_FULL_PPGTT(dev))
41297diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41298index 176de63..b50b66a 100644
41299--- a/drivers/gpu/drm/i915/i915_ioc32.c
41300+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41301@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41302 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41303 || __put_user(batchbuffer32.num_cliprects,
41304 &batchbuffer->num_cliprects)
41305- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41306+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41307 &batchbuffer->cliprects))
41308 return -EFAULT;
41309
41310@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41311
41312 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41313 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41314- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41315+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41316 &cmdbuffer->buf)
41317 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41318 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41319 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41320 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41321- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41322+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41323 &cmdbuffer->cliprects))
41324 return -EFAULT;
41325
41326@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41327 (unsigned long)request);
41328 }
41329
41330-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41331+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41332 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41333 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41334 [DRM_I915_GETPARAM] = compat_i915_getparam,
41335@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41336 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41337 {
41338 unsigned int nr = DRM_IOCTL_NR(cmd);
41339- drm_ioctl_compat_t *fn = NULL;
41340 int ret;
41341
41342 if (nr < DRM_COMMAND_BASE)
41343 return drm_compat_ioctl(filp, cmd, arg);
41344
41345- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41346- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41347-
41348- if (fn != NULL)
41349- ret = (*fn) (filp, cmd, arg);
41350+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41351+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41352 else
41353 ret = drm_ioctl(filp, cmd, arg);
41354
41355diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41356index f75173c..f283e45 100644
41357--- a/drivers/gpu/drm/i915/intel_display.c
41358+++ b/drivers/gpu/drm/i915/intel_display.c
41359@@ -13056,13 +13056,13 @@ struct intel_quirk {
41360 int subsystem_vendor;
41361 int subsystem_device;
41362 void (*hook)(struct drm_device *dev);
41363-};
41364+} __do_const;
41365
41366 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41367 struct intel_dmi_quirk {
41368 void (*hook)(struct drm_device *dev);
41369 const struct dmi_system_id (*dmi_id_list)[];
41370-};
41371+} __do_const;
41372
41373 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41374 {
41375@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41376 return 1;
41377 }
41378
41379-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41380+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41381 {
41382- .dmi_id_list = &(const struct dmi_system_id[]) {
41383- {
41384- .callback = intel_dmi_reverse_brightness,
41385- .ident = "NCR Corporation",
41386- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41387- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41388- },
41389- },
41390- { } /* terminating entry */
41391+ .callback = intel_dmi_reverse_brightness,
41392+ .ident = "NCR Corporation",
41393+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41394+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41395 },
41396+ },
41397+ { } /* terminating entry */
41398+};
41399+
41400+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41401+ {
41402+ .dmi_id_list = &intel_dmi_quirks_table,
41403 .hook = quirk_invert_brightness,
41404 },
41405 };
41406diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41407index a002f53..0d60514 100644
41408--- a/drivers/gpu/drm/imx/imx-drm-core.c
41409+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41410@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41411 if (imxdrm->pipes >= MAX_CRTC)
41412 return -EINVAL;
41413
41414- if (imxdrm->drm->open_count)
41415+ if (local_read(&imxdrm->drm->open_count))
41416 return -EBUSY;
41417
41418 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41419diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41420index b4a20149..219ab78 100644
41421--- a/drivers/gpu/drm/mga/mga_drv.h
41422+++ b/drivers/gpu/drm/mga/mga_drv.h
41423@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41424 u32 clear_cmd;
41425 u32 maccess;
41426
41427- atomic_t vbl_received; /**< Number of vblanks received. */
41428+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41429 wait_queue_head_t fence_queue;
41430- atomic_t last_fence_retired;
41431+ atomic_unchecked_t last_fence_retired;
41432 u32 next_fence_to_post;
41433
41434 unsigned int fb_cpp;
41435diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41436index 729bfd5..14bae78 100644
41437--- a/drivers/gpu/drm/mga/mga_ioc32.c
41438+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41439@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41440 return 0;
41441 }
41442
41443-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41444+drm_ioctl_compat_t mga_compat_ioctls[] = {
41445 [DRM_MGA_INIT] = compat_mga_init,
41446 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41447 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41448@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41449 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41450 {
41451 unsigned int nr = DRM_IOCTL_NR(cmd);
41452- drm_ioctl_compat_t *fn = NULL;
41453 int ret;
41454
41455 if (nr < DRM_COMMAND_BASE)
41456 return drm_compat_ioctl(filp, cmd, arg);
41457
41458- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41459- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41460-
41461- if (fn != NULL)
41462- ret = (*fn) (filp, cmd, arg);
41463+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41464+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41465 else
41466 ret = drm_ioctl(filp, cmd, arg);
41467
41468diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41469index 1b071b8..de8601a 100644
41470--- a/drivers/gpu/drm/mga/mga_irq.c
41471+++ b/drivers/gpu/drm/mga/mga_irq.c
41472@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41473 if (crtc != 0)
41474 return 0;
41475
41476- return atomic_read(&dev_priv->vbl_received);
41477+ return atomic_read_unchecked(&dev_priv->vbl_received);
41478 }
41479
41480
41481@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41482 /* VBLANK interrupt */
41483 if (status & MGA_VLINEPEN) {
41484 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41485- atomic_inc(&dev_priv->vbl_received);
41486+ atomic_inc_unchecked(&dev_priv->vbl_received);
41487 drm_handle_vblank(dev, 0);
41488 handled = 1;
41489 }
41490@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41491 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41492 MGA_WRITE(MGA_PRIMEND, prim_end);
41493
41494- atomic_inc(&dev_priv->last_fence_retired);
41495+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41496 wake_up(&dev_priv->fence_queue);
41497 handled = 1;
41498 }
41499@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41500 * using fences.
41501 */
41502 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41503- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41504+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41505 - *sequence) <= (1 << 23)));
41506
41507 *sequence = cur_fence;
41508diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41509index 0190b69..60c3eaf 100644
41510--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41511+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41512@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41513 struct bit_table {
41514 const char id;
41515 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41516-};
41517+} __no_const;
41518
41519 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41520
41521diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41522index 8763deb..936b423 100644
41523--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41524+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41525@@ -940,7 +940,8 @@ static struct drm_driver
41526 driver_stub = {
41527 .driver_features =
41528 DRIVER_USE_AGP |
41529- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41530+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41531+ DRIVER_KMS_LEGACY_CONTEXT,
41532
41533 .load = nouveau_drm_load,
41534 .unload = nouveau_drm_unload,
41535diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41536index fc68f09..0511d71 100644
41537--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41538+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41539@@ -121,7 +121,6 @@ struct nouveau_drm {
41540 struct drm_global_reference mem_global_ref;
41541 struct ttm_bo_global_ref bo_global_ref;
41542 struct ttm_bo_device bdev;
41543- atomic_t validate_sequence;
41544 int (*move)(struct nouveau_channel *,
41545 struct ttm_buffer_object *,
41546 struct ttm_mem_reg *, struct ttm_mem_reg *);
41547diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41548index 462679a..88e32a7 100644
41549--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41550+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41551@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41552 unsigned long arg)
41553 {
41554 unsigned int nr = DRM_IOCTL_NR(cmd);
41555- drm_ioctl_compat_t *fn = NULL;
41556+ drm_ioctl_compat_t fn = NULL;
41557 int ret;
41558
41559 if (nr < DRM_COMMAND_BASE)
41560diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41561index 273e501..3b6c0a2 100644
41562--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41563+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41564@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41565 }
41566
41567 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41568- nouveau_vram_manager_init,
41569- nouveau_vram_manager_fini,
41570- nouveau_vram_manager_new,
41571- nouveau_vram_manager_del,
41572- nouveau_vram_manager_debug
41573+ .init = nouveau_vram_manager_init,
41574+ .takedown = nouveau_vram_manager_fini,
41575+ .get_node = nouveau_vram_manager_new,
41576+ .put_node = nouveau_vram_manager_del,
41577+ .debug = nouveau_vram_manager_debug
41578 };
41579
41580 static int
41581@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41582 }
41583
41584 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41585- nouveau_gart_manager_init,
41586- nouveau_gart_manager_fini,
41587- nouveau_gart_manager_new,
41588- nouveau_gart_manager_del,
41589- nouveau_gart_manager_debug
41590+ .init = nouveau_gart_manager_init,
41591+ .takedown = nouveau_gart_manager_fini,
41592+ .get_node = nouveau_gart_manager_new,
41593+ .put_node = nouveau_gart_manager_del,
41594+ .debug = nouveau_gart_manager_debug
41595 };
41596
41597 /*XXX*/
41598@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41599 }
41600
41601 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41602- nv04_gart_manager_init,
41603- nv04_gart_manager_fini,
41604- nv04_gart_manager_new,
41605- nv04_gart_manager_del,
41606- nv04_gart_manager_debug
41607+ .init = nv04_gart_manager_init,
41608+ .takedown = nv04_gart_manager_fini,
41609+ .get_node = nv04_gart_manager_new,
41610+ .put_node = nv04_gart_manager_del,
41611+ .debug = nv04_gart_manager_debug
41612 };
41613
41614 int
41615diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41616index c7592ec..dd45ebc 100644
41617--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41618+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41619@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41620 * locking inversion with the driver load path. And the access here is
41621 * completely racy anyway. So don't bother with locking for now.
41622 */
41623- return dev->open_count == 0;
41624+ return local_read(&dev->open_count) == 0;
41625 }
41626
41627 static const struct vga_switcheroo_client_ops
41628diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41629index 9782364..89bd954 100644
41630--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41631+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41632@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41633 int ret;
41634
41635 mutex_lock(&qdev->async_io_mutex);
41636- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41637+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41638 if (qdev->last_sent_io_cmd > irq_num) {
41639 if (intr)
41640 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41641- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41642+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41643 else
41644 ret = wait_event_timeout(qdev->io_cmd_event,
41645- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41646+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41647 /* 0 is timeout, just bail the "hw" has gone away */
41648 if (ret <= 0)
41649 goto out;
41650- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41651+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41652 }
41653 outb(val, addr);
41654 qdev->last_sent_io_cmd = irq_num + 1;
41655 if (intr)
41656 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41657- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41658+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41659 else
41660 ret = wait_event_timeout(qdev->io_cmd_event,
41661- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41662+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41663 out:
41664 if (ret > 0)
41665 ret = 0;
41666diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41667index 6911b8c..89d6867 100644
41668--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41669+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41670@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41671 struct drm_info_node *node = (struct drm_info_node *) m->private;
41672 struct qxl_device *qdev = node->minor->dev->dev_private;
41673
41674- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41675- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41676- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41677- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41678+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41679+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41680+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41681+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41682 seq_printf(m, "%d\n", qdev->irq_received_error);
41683 return 0;
41684 }
41685diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41686index 7c6cafe..460f542 100644
41687--- a/drivers/gpu/drm/qxl/qxl_drv.h
41688+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41689@@ -290,10 +290,10 @@ struct qxl_device {
41690 unsigned int last_sent_io_cmd;
41691
41692 /* interrupt handling */
41693- atomic_t irq_received;
41694- atomic_t irq_received_display;
41695- atomic_t irq_received_cursor;
41696- atomic_t irq_received_io_cmd;
41697+ atomic_unchecked_t irq_received;
41698+ atomic_unchecked_t irq_received_display;
41699+ atomic_unchecked_t irq_received_cursor;
41700+ atomic_unchecked_t irq_received_io_cmd;
41701 unsigned irq_received_error;
41702 wait_queue_head_t display_event;
41703 wait_queue_head_t cursor_event;
41704diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41705index b110883..dd06418 100644
41706--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41707+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41708@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41709
41710 /* TODO copy slow path code from i915 */
41711 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41712- unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)cmd->command, cmd->command_size);
41713+ unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void __force_user *)(unsigned long)cmd->command, cmd->command_size);
41714
41715 {
41716 struct qxl_drawable *draw = fb_cmd;
41717@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41718 struct drm_qxl_reloc reloc;
41719
41720 if (copy_from_user(&reloc,
41721- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41722+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41723 sizeof(reloc))) {
41724 ret = -EFAULT;
41725 goto out_free_bos;
41726@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41727
41728 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41729
41730- struct drm_qxl_command *commands =
41731- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41732+ struct drm_qxl_command __user *commands =
41733+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41734
41735- if (copy_from_user(&user_cmd, &commands[cmd_num],
41736+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41737 sizeof(user_cmd)))
41738 return -EFAULT;
41739
41740diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41741index 0bf1e20..42a7310 100644
41742--- a/drivers/gpu/drm/qxl/qxl_irq.c
41743+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41744@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41745 if (!pending)
41746 return IRQ_NONE;
41747
41748- atomic_inc(&qdev->irq_received);
41749+ atomic_inc_unchecked(&qdev->irq_received);
41750
41751 if (pending & QXL_INTERRUPT_DISPLAY) {
41752- atomic_inc(&qdev->irq_received_display);
41753+ atomic_inc_unchecked(&qdev->irq_received_display);
41754 wake_up_all(&qdev->display_event);
41755 qxl_queue_garbage_collect(qdev, false);
41756 }
41757 if (pending & QXL_INTERRUPT_CURSOR) {
41758- atomic_inc(&qdev->irq_received_cursor);
41759+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41760 wake_up_all(&qdev->cursor_event);
41761 }
41762 if (pending & QXL_INTERRUPT_IO_CMD) {
41763- atomic_inc(&qdev->irq_received_io_cmd);
41764+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41765 wake_up_all(&qdev->io_cmd_event);
41766 }
41767 if (pending & QXL_INTERRUPT_ERROR) {
41768@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41769 init_waitqueue_head(&qdev->io_cmd_event);
41770 INIT_WORK(&qdev->client_monitors_config_work,
41771 qxl_client_monitors_config_work_func);
41772- atomic_set(&qdev->irq_received, 0);
41773- atomic_set(&qdev->irq_received_display, 0);
41774- atomic_set(&qdev->irq_received_cursor, 0);
41775- atomic_set(&qdev->irq_received_io_cmd, 0);
41776+ atomic_set_unchecked(&qdev->irq_received, 0);
41777+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41778+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41779+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41780 qdev->irq_received_error = 0;
41781 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41782 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41783diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41784index 0cbc4c9..0e46686 100644
41785--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41786+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41787@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41788 }
41789 }
41790
41791-static struct vm_operations_struct qxl_ttm_vm_ops;
41792+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41793 static const struct vm_operations_struct *ttm_vm_ops;
41794
41795 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41796@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41797 return r;
41798 if (unlikely(ttm_vm_ops == NULL)) {
41799 ttm_vm_ops = vma->vm_ops;
41800+ pax_open_kernel();
41801 qxl_ttm_vm_ops = *ttm_vm_ops;
41802 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41803+ pax_close_kernel();
41804 }
41805 vma->vm_ops = &qxl_ttm_vm_ops;
41806 return 0;
41807@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41808 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41809 {
41810 #if defined(CONFIG_DEBUG_FS)
41811- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41812- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41813- unsigned i;
41814+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41815+ {
41816+ .name = "qxl_mem_mm",
41817+ .show = &qxl_mm_dump_table,
41818+ },
41819+ {
41820+ .name = "qxl_surf_mm",
41821+ .show = &qxl_mm_dump_table,
41822+ }
41823+ };
41824
41825- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41826- if (i == 0)
41827- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41828- else
41829- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41830- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41831- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41832- qxl_mem_types_list[i].driver_features = 0;
41833- if (i == 0)
41834- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41835- else
41836- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41837+ pax_open_kernel();
41838+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41839+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41840+ pax_close_kernel();
41841
41842- }
41843- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41844+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41845 #else
41846 return 0;
41847 #endif
41848diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41849index 2c45ac9..5d740f8 100644
41850--- a/drivers/gpu/drm/r128/r128_cce.c
41851+++ b/drivers/gpu/drm/r128/r128_cce.c
41852@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41853
41854 /* GH: Simple idle check.
41855 */
41856- atomic_set(&dev_priv->idle_count, 0);
41857+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41858
41859 /* We don't support anything other than bus-mastering ring mode,
41860 * but the ring can be in either AGP or PCI space for the ring
41861diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41862index 723e5d6..102dbaf 100644
41863--- a/drivers/gpu/drm/r128/r128_drv.h
41864+++ b/drivers/gpu/drm/r128/r128_drv.h
41865@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41866 int is_pci;
41867 unsigned long cce_buffers_offset;
41868
41869- atomic_t idle_count;
41870+ atomic_unchecked_t idle_count;
41871
41872 int page_flipping;
41873 int current_page;
41874 u32 crtc_offset;
41875 u32 crtc_offset_cntl;
41876
41877- atomic_t vbl_received;
41878+ atomic_unchecked_t vbl_received;
41879
41880 u32 color_fmt;
41881 unsigned int front_offset;
41882diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41883index 663f38c..ec159a1 100644
41884--- a/drivers/gpu/drm/r128/r128_ioc32.c
41885+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41886@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41887 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41888 }
41889
41890-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41891+drm_ioctl_compat_t r128_compat_ioctls[] = {
41892 [DRM_R128_INIT] = compat_r128_init,
41893 [DRM_R128_DEPTH] = compat_r128_depth,
41894 [DRM_R128_STIPPLE] = compat_r128_stipple,
41895@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41896 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41897 {
41898 unsigned int nr = DRM_IOCTL_NR(cmd);
41899- drm_ioctl_compat_t *fn = NULL;
41900 int ret;
41901
41902 if (nr < DRM_COMMAND_BASE)
41903 return drm_compat_ioctl(filp, cmd, arg);
41904
41905- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41906- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41907-
41908- if (fn != NULL)
41909- ret = (*fn) (filp, cmd, arg);
41910+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41911+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41912 else
41913 ret = drm_ioctl(filp, cmd, arg);
41914
41915diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41916index c2ae496..30b5993 100644
41917--- a/drivers/gpu/drm/r128/r128_irq.c
41918+++ b/drivers/gpu/drm/r128/r128_irq.c
41919@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41920 if (crtc != 0)
41921 return 0;
41922
41923- return atomic_read(&dev_priv->vbl_received);
41924+ return atomic_read_unchecked(&dev_priv->vbl_received);
41925 }
41926
41927 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41928@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41929 /* VBLANK interrupt */
41930 if (status & R128_CRTC_VBLANK_INT) {
41931 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41932- atomic_inc(&dev_priv->vbl_received);
41933+ atomic_inc_unchecked(&dev_priv->vbl_received);
41934 drm_handle_vblank(dev, 0);
41935 return IRQ_HANDLED;
41936 }
41937diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41938index 8fd2d9f..18c9660 100644
41939--- a/drivers/gpu/drm/r128/r128_state.c
41940+++ b/drivers/gpu/drm/r128/r128_state.c
41941@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41942
41943 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41944 {
41945- if (atomic_read(&dev_priv->idle_count) == 0)
41946+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41947 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41948 else
41949- atomic_set(&dev_priv->idle_count, 0);
41950+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41951 }
41952
41953 #endif
41954diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41955index b928c17..e5d9400 100644
41956--- a/drivers/gpu/drm/radeon/mkregtable.c
41957+++ b/drivers/gpu/drm/radeon/mkregtable.c
41958@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41959 regex_t mask_rex;
41960 regmatch_t match[4];
41961 char buf[1024];
41962- size_t end;
41963+ long end;
41964 int len;
41965 int done = 0;
41966 int r;
41967 unsigned o;
41968 struct offset *offset;
41969 char last_reg_s[10];
41970- int last_reg;
41971+ unsigned long last_reg;
41972
41973 if (regcomp
41974 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41975diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41976index bd7519f..e1c2cd95 100644
41977--- a/drivers/gpu/drm/radeon/radeon_device.c
41978+++ b/drivers/gpu/drm/radeon/radeon_device.c
41979@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41980 * locking inversion with the driver load path. And the access here is
41981 * completely racy anyway. So don't bother with locking for now.
41982 */
41983- return dev->open_count == 0;
41984+ return local_read(&dev->open_count) == 0;
41985 }
41986
41987 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41988diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41989index 46bd393..6ae4719 100644
41990--- a/drivers/gpu/drm/radeon/radeon_drv.h
41991+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41992@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41993
41994 /* SW interrupt */
41995 wait_queue_head_t swi_queue;
41996- atomic_t swi_emitted;
41997+ atomic_unchecked_t swi_emitted;
41998 int vblank_crtc;
41999 uint32_t irq_enable_reg;
42000 uint32_t r500_disp_irq_reg;
42001diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
42002index 0b98ea1..a3c770f 100644
42003--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
42004+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
42005@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42006 request = compat_alloc_user_space(sizeof(*request));
42007 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
42008 || __put_user(req32.param, &request->param)
42009- || __put_user((void __user *)(unsigned long)req32.value,
42010+ || __put_user((unsigned long)req32.value,
42011 &request->value))
42012 return -EFAULT;
42013
42014@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42015 #define compat_radeon_cp_setparam NULL
42016 #endif /* X86_64 || IA64 */
42017
42018-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42019+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
42020 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
42021 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
42022 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
42023@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42024 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42025 {
42026 unsigned int nr = DRM_IOCTL_NR(cmd);
42027- drm_ioctl_compat_t *fn = NULL;
42028 int ret;
42029
42030 if (nr < DRM_COMMAND_BASE)
42031 return drm_compat_ioctl(filp, cmd, arg);
42032
42033- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
42034- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
42035-
42036- if (fn != NULL)
42037- ret = (*fn) (filp, cmd, arg);
42038+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42039+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42040 else
42041 ret = drm_ioctl(filp, cmd, arg);
42042
42043diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42044index 244b19b..c19226d 100644
42045--- a/drivers/gpu/drm/radeon/radeon_irq.c
42046+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42047@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42048 unsigned int ret;
42049 RING_LOCALS;
42050
42051- atomic_inc(&dev_priv->swi_emitted);
42052- ret = atomic_read(&dev_priv->swi_emitted);
42053+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42054+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42055
42056 BEGIN_RING(4);
42057 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42058@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42059 drm_radeon_private_t *dev_priv =
42060 (drm_radeon_private_t *) dev->dev_private;
42061
42062- atomic_set(&dev_priv->swi_emitted, 0);
42063+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42064 init_waitqueue_head(&dev_priv->swi_queue);
42065
42066 dev->max_vblank_count = 0x001fffff;
42067diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42068index 15aee72..cda326e 100644
42069--- a/drivers/gpu/drm/radeon/radeon_state.c
42070+++ b/drivers/gpu/drm/radeon/radeon_state.c
42071@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42072 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42073 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42074
42075- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42076+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42077 sarea_priv->nbox * sizeof(depth_boxes[0])))
42078 return -EFAULT;
42079
42080@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42081 {
42082 drm_radeon_private_t *dev_priv = dev->dev_private;
42083 drm_radeon_getparam_t *param = data;
42084- int value;
42085+ int value = 0;
42086
42087 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42088
42089diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42090index edafd3c..3af7c9c 100644
42091--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42092+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42093@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42094 man->size = size >> PAGE_SHIFT;
42095 }
42096
42097-static struct vm_operations_struct radeon_ttm_vm_ops;
42098+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42099 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42100
42101 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42102@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42103 }
42104 if (unlikely(ttm_vm_ops == NULL)) {
42105 ttm_vm_ops = vma->vm_ops;
42106+ pax_open_kernel();
42107 radeon_ttm_vm_ops = *ttm_vm_ops;
42108 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42109+ pax_close_kernel();
42110 }
42111 vma->vm_ops = &radeon_ttm_vm_ops;
42112 return 0;
42113diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42114index 1a52522..8e78043 100644
42115--- a/drivers/gpu/drm/tegra/dc.c
42116+++ b/drivers/gpu/drm/tegra/dc.c
42117@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42118 }
42119
42120 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42121- dc->debugfs_files[i].data = dc;
42122+ *(void **)&dc->debugfs_files[i].data = dc;
42123
42124 err = drm_debugfs_create_files(dc->debugfs_files,
42125 ARRAY_SIZE(debugfs_files),
42126diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42127index ed970f6..4eeea42 100644
42128--- a/drivers/gpu/drm/tegra/dsi.c
42129+++ b/drivers/gpu/drm/tegra/dsi.c
42130@@ -62,7 +62,7 @@ struct tegra_dsi {
42131 struct clk *clk_lp;
42132 struct clk *clk;
42133
42134- struct drm_info_list *debugfs_files;
42135+ drm_info_list_no_const *debugfs_files;
42136 struct drm_minor *minor;
42137 struct dentry *debugfs;
42138
42139diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42140index 7eaaee74..cc2bc04 100644
42141--- a/drivers/gpu/drm/tegra/hdmi.c
42142+++ b/drivers/gpu/drm/tegra/hdmi.c
42143@@ -64,7 +64,7 @@ struct tegra_hdmi {
42144 bool stereo;
42145 bool dvi;
42146
42147- struct drm_info_list *debugfs_files;
42148+ drm_info_list_no_const *debugfs_files;
42149 struct drm_minor *minor;
42150 struct dentry *debugfs;
42151 };
42152diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42153index aa0bd054..aea6a01 100644
42154--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42155+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42156@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42157 }
42158
42159 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42160- ttm_bo_man_init,
42161- ttm_bo_man_takedown,
42162- ttm_bo_man_get_node,
42163- ttm_bo_man_put_node,
42164- ttm_bo_man_debug
42165+ .init = ttm_bo_man_init,
42166+ .takedown = ttm_bo_man_takedown,
42167+ .get_node = ttm_bo_man_get_node,
42168+ .put_node = ttm_bo_man_put_node,
42169+ .debug = ttm_bo_man_debug
42170 };
42171 EXPORT_SYMBOL(ttm_bo_manager_func);
42172diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42173index a1803fb..c53f6b0 100644
42174--- a/drivers/gpu/drm/ttm/ttm_memory.c
42175+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42176@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42177 zone->glob = glob;
42178 glob->zone_kernel = zone;
42179 ret = kobject_init_and_add(
42180- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42181+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42182 if (unlikely(ret != 0)) {
42183 kobject_put(&zone->kobj);
42184 return ret;
42185@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42186 zone->glob = glob;
42187 glob->zone_dma32 = zone;
42188 ret = kobject_init_and_add(
42189- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42190+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42191 if (unlikely(ret != 0)) {
42192 kobject_put(&zone->kobj);
42193 return ret;
42194diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42195index 025c429..314062f 100644
42196--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42197+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42198@@ -54,7 +54,7 @@
42199
42200 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42201 #define SMALL_ALLOCATION 16
42202-#define FREE_ALL_PAGES (~0U)
42203+#define FREE_ALL_PAGES (~0UL)
42204 /* times are in msecs */
42205 #define PAGE_FREE_INTERVAL 1000
42206
42207@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42208 * @free_all: If set to true will free all pages in pool
42209 * @use_static: Safe to use static buffer
42210 **/
42211-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42212+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42213 bool use_static)
42214 {
42215 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42216 unsigned long irq_flags;
42217 struct page *p;
42218 struct page **pages_to_free;
42219- unsigned freed_pages = 0,
42220- npages_to_free = nr_free;
42221+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42222
42223 if (NUM_PAGES_TO_ALLOC < nr_free)
42224 npages_to_free = NUM_PAGES_TO_ALLOC;
42225@@ -371,7 +370,8 @@ restart:
42226 __list_del(&p->lru, &pool->list);
42227
42228 ttm_pool_update_free_locked(pool, freed_pages);
42229- nr_free -= freed_pages;
42230+ if (likely(nr_free != FREE_ALL_PAGES))
42231+ nr_free -= freed_pages;
42232 }
42233
42234 spin_unlock_irqrestore(&pool->lock, irq_flags);
42235@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42236 unsigned i;
42237 unsigned pool_offset;
42238 struct ttm_page_pool *pool;
42239- int shrink_pages = sc->nr_to_scan;
42240+ unsigned long shrink_pages = sc->nr_to_scan;
42241 unsigned long freed = 0;
42242
42243 if (!mutex_trylock(&lock))
42244@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42245 pool_offset = ++start_pool % NUM_POOLS;
42246 /* select start pool in round robin fashion */
42247 for (i = 0; i < NUM_POOLS; ++i) {
42248- unsigned nr_free = shrink_pages;
42249+ unsigned long nr_free = shrink_pages;
42250 if (shrink_pages == 0)
42251 break;
42252 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42253@@ -673,7 +673,7 @@ out:
42254 }
42255
42256 /* Put all pages in pages list to correct pool to wait for reuse */
42257-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42258+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42259 enum ttm_caching_state cstate)
42260 {
42261 unsigned long irq_flags;
42262@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42263 struct list_head plist;
42264 struct page *p = NULL;
42265 gfp_t gfp_flags = GFP_USER;
42266- unsigned count;
42267+ unsigned long count;
42268 int r;
42269
42270 /* set zero flag for page allocation if required */
42271diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42272index 01e1d27..aaa018a 100644
42273--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42274+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42275@@ -56,7 +56,7 @@
42276
42277 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42278 #define SMALL_ALLOCATION 4
42279-#define FREE_ALL_PAGES (~0U)
42280+#define FREE_ALL_PAGES (~0UL)
42281 /* times are in msecs */
42282 #define IS_UNDEFINED (0)
42283 #define IS_WC (1<<1)
42284@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42285 * @nr_free: If set to true will free all pages in pool
42286 * @use_static: Safe to use static buffer
42287 **/
42288-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42289+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42290 bool use_static)
42291 {
42292 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42293@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42294 struct dma_page *dma_p, *tmp;
42295 struct page **pages_to_free;
42296 struct list_head d_pages;
42297- unsigned freed_pages = 0,
42298- npages_to_free = nr_free;
42299+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42300
42301 if (NUM_PAGES_TO_ALLOC < nr_free)
42302 npages_to_free = NUM_PAGES_TO_ALLOC;
42303@@ -499,7 +498,8 @@ restart:
42304 /* remove range of pages from the pool */
42305 if (freed_pages) {
42306 ttm_pool_update_free_locked(pool, freed_pages);
42307- nr_free -= freed_pages;
42308+ if (likely(nr_free != FREE_ALL_PAGES))
42309+ nr_free -= freed_pages;
42310 }
42311
42312 spin_unlock_irqrestore(&pool->lock, irq_flags);
42313@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42314 struct dma_page *d_page, *next;
42315 enum pool_type type;
42316 bool is_cached = false;
42317- unsigned count = 0, i, npages = 0;
42318+ unsigned long count = 0, i, npages = 0;
42319 unsigned long irq_flags;
42320
42321 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42322@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42323 static unsigned start_pool;
42324 unsigned idx = 0;
42325 unsigned pool_offset;
42326- unsigned shrink_pages = sc->nr_to_scan;
42327+ unsigned long shrink_pages = sc->nr_to_scan;
42328 struct device_pools *p;
42329 unsigned long freed = 0;
42330
42331@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42332 goto out;
42333 pool_offset = ++start_pool % _manager->npools;
42334 list_for_each_entry(p, &_manager->pools, pools) {
42335- unsigned nr_free;
42336+ unsigned long nr_free;
42337
42338 if (!p->dev)
42339 continue;
42340@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42341 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42342 freed += nr_free - shrink_pages;
42343
42344- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42345+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42346 p->pool->dev_name, p->pool->name, current->pid,
42347 nr_free, shrink_pages);
42348 }
42349diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42350index 5fc16ce..1bd84ec 100644
42351--- a/drivers/gpu/drm/udl/udl_fb.c
42352+++ b/drivers/gpu/drm/udl/udl_fb.c
42353@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42354 fb_deferred_io_cleanup(info);
42355 kfree(info->fbdefio);
42356 info->fbdefio = NULL;
42357- info->fbops->fb_mmap = udl_fb_mmap;
42358 }
42359
42360 pr_warn("released /dev/fb%d user=%d count=%d\n",
42361diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42362index ef8c500..01030c8 100644
42363--- a/drivers/gpu/drm/via/via_drv.h
42364+++ b/drivers/gpu/drm/via/via_drv.h
42365@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42366 typedef uint32_t maskarray_t[5];
42367
42368 typedef struct drm_via_irq {
42369- atomic_t irq_received;
42370+ atomic_unchecked_t irq_received;
42371 uint32_t pending_mask;
42372 uint32_t enable_mask;
42373 wait_queue_head_t irq_queue;
42374@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42375 struct timeval last_vblank;
42376 int last_vblank_valid;
42377 unsigned usec_per_vblank;
42378- atomic_t vbl_received;
42379+ atomic_unchecked_t vbl_received;
42380 drm_via_state_t hc_state;
42381 char pci_buf[VIA_PCI_BUF_SIZE];
42382 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42383diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42384index 1319433..a993b0c 100644
42385--- a/drivers/gpu/drm/via/via_irq.c
42386+++ b/drivers/gpu/drm/via/via_irq.c
42387@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42388 if (crtc != 0)
42389 return 0;
42390
42391- return atomic_read(&dev_priv->vbl_received);
42392+ return atomic_read_unchecked(&dev_priv->vbl_received);
42393 }
42394
42395 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42396@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42397
42398 status = VIA_READ(VIA_REG_INTERRUPT);
42399 if (status & VIA_IRQ_VBLANK_PENDING) {
42400- atomic_inc(&dev_priv->vbl_received);
42401- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42402+ atomic_inc_unchecked(&dev_priv->vbl_received);
42403+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42404 do_gettimeofday(&cur_vblank);
42405 if (dev_priv->last_vblank_valid) {
42406 dev_priv->usec_per_vblank =
42407@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42408 dev_priv->last_vblank = cur_vblank;
42409 dev_priv->last_vblank_valid = 1;
42410 }
42411- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42412+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42413 DRM_DEBUG("US per vblank is: %u\n",
42414 dev_priv->usec_per_vblank);
42415 }
42416@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42417
42418 for (i = 0; i < dev_priv->num_irqs; ++i) {
42419 if (status & cur_irq->pending_mask) {
42420- atomic_inc(&cur_irq->irq_received);
42421+ atomic_inc_unchecked(&cur_irq->irq_received);
42422 wake_up(&cur_irq->irq_queue);
42423 handled = 1;
42424 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42425@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42426 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42427 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42428 masks[irq][4]));
42429- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42430+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42431 } else {
42432 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42433 (((cur_irq_sequence =
42434- atomic_read(&cur_irq->irq_received)) -
42435+ atomic_read_unchecked(&cur_irq->irq_received)) -
42436 *sequence) <= (1 << 23)));
42437 }
42438 *sequence = cur_irq_sequence;
42439@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42440 }
42441
42442 for (i = 0; i < dev_priv->num_irqs; ++i) {
42443- atomic_set(&cur_irq->irq_received, 0);
42444+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42445 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42446 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42447 init_waitqueue_head(&cur_irq->irq_queue);
42448@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42449 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42450 case VIA_IRQ_RELATIVE:
42451 irqwait->request.sequence +=
42452- atomic_read(&cur_irq->irq_received);
42453+ atomic_read_unchecked(&cur_irq->irq_received);
42454 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42455 case VIA_IRQ_ABSOLUTE:
42456 break;
42457diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42458index d26a6da..5fa41ed 100644
42459--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42460+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42461@@ -447,7 +447,7 @@ struct vmw_private {
42462 * Fencing and IRQs.
42463 */
42464
42465- atomic_t marker_seq;
42466+ atomic_unchecked_t marker_seq;
42467 wait_queue_head_t fence_queue;
42468 wait_queue_head_t fifo_queue;
42469 spinlock_t waiter_lock;
42470diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42471index 39f2b03..d1b0a64 100644
42472--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42473+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42474@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42475 (unsigned int) min,
42476 (unsigned int) fifo->capabilities);
42477
42478- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42479+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42480 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42481 vmw_marker_queue_init(&fifo->marker_queue);
42482 return vmw_fifo_send_fence(dev_priv, &dummy);
42483@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42484 if (reserveable)
42485 iowrite32(bytes, fifo_mem +
42486 SVGA_FIFO_RESERVED);
42487- return fifo_mem + (next_cmd >> 2);
42488+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42489 } else {
42490 need_bounce = true;
42491 }
42492@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42493
42494 fm = vmw_fifo_reserve(dev_priv, bytes);
42495 if (unlikely(fm == NULL)) {
42496- *seqno = atomic_read(&dev_priv->marker_seq);
42497+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42498 ret = -ENOMEM;
42499 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42500 false, 3*HZ);
42501@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42502 }
42503
42504 do {
42505- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42506+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42507 } while (*seqno == 0);
42508
42509 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42510diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42511index 170b61b..fec7348 100644
42512--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42513+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42514@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42515 }
42516
42517 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42518- vmw_gmrid_man_init,
42519- vmw_gmrid_man_takedown,
42520- vmw_gmrid_man_get_node,
42521- vmw_gmrid_man_put_node,
42522- vmw_gmrid_man_debug
42523+ .init = vmw_gmrid_man_init,
42524+ .takedown = vmw_gmrid_man_takedown,
42525+ .get_node = vmw_gmrid_man_get_node,
42526+ .put_node = vmw_gmrid_man_put_node,
42527+ .debug = vmw_gmrid_man_debug
42528 };
42529diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42530index 69c8ce2..cacb0ab 100644
42531--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42532+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42533@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42534 int ret;
42535
42536 num_clips = arg->num_clips;
42537- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42538+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42539
42540 if (unlikely(num_clips == 0))
42541 return 0;
42542@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42543 int ret;
42544
42545 num_clips = arg->num_clips;
42546- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42547+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42548
42549 if (unlikely(num_clips == 0))
42550 return 0;
42551diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42552index 9fe9827..0aa2fc0 100644
42553--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42554+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42555@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42556 * emitted. Then the fence is stale and signaled.
42557 */
42558
42559- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42560+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42561 > VMW_FENCE_WRAP);
42562
42563 return ret;
42564@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42565
42566 if (fifo_idle)
42567 down_read(&fifo_state->rwsem);
42568- signal_seq = atomic_read(&dev_priv->marker_seq);
42569+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42570 ret = 0;
42571
42572 for (;;) {
42573diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42574index efd1ffd..0ae13ca 100644
42575--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42576+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42577@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42578 while (!vmw_lag_lt(queue, us)) {
42579 spin_lock(&queue->lock);
42580 if (list_empty(&queue->head))
42581- seqno = atomic_read(&dev_priv->marker_seq);
42582+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42583 else {
42584 marker = list_first_entry(&queue->head,
42585 struct vmw_marker, head);
42586diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42587index 37ac7b5..d52a5c9 100644
42588--- a/drivers/gpu/vga/vga_switcheroo.c
42589+++ b/drivers/gpu/vga/vga_switcheroo.c
42590@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42591
42592 /* this version is for the case where the power switch is separate
42593 to the device being powered down. */
42594-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42595+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42596 {
42597 /* copy over all the bus versions */
42598 if (dev->bus && dev->bus->pm) {
42599@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42600 return ret;
42601 }
42602
42603-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42604+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42605 {
42606 /* copy over all the bus versions */
42607 if (dev->bus && dev->bus->pm) {
42608diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42609index 56ce8c2..32ce524 100644
42610--- a/drivers/hid/hid-core.c
42611+++ b/drivers/hid/hid-core.c
42612@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42613
42614 int hid_add_device(struct hid_device *hdev)
42615 {
42616- static atomic_t id = ATOMIC_INIT(0);
42617+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42618 int ret;
42619
42620 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42621@@ -2574,7 +2574,7 @@ int hid_add_device(struct hid_device *hdev)
42622 /* XXX hack, any other cleaner solution after the driver core
42623 * is converted to allow more than 20 bytes as the device name? */
42624 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42625- hdev->vendor, hdev->product, atomic_inc_return(&id));
42626+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42627
42628 hid_debug_register(hdev, dev_name(&hdev->dev));
42629 ret = device_add(&hdev->dev);
42630diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42631index c13fb5b..55a3802 100644
42632--- a/drivers/hid/hid-wiimote-debug.c
42633+++ b/drivers/hid/hid-wiimote-debug.c
42634@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42635 else if (size == 0)
42636 return -EIO;
42637
42638- if (copy_to_user(u, buf, size))
42639+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42640 return -EFAULT;
42641
42642 *off += size;
42643diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42644index 00bc30e..d8e5097 100644
42645--- a/drivers/hv/channel.c
42646+++ b/drivers/hv/channel.c
42647@@ -370,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42648 int ret = 0;
42649
42650 next_gpadl_handle =
42651- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42652+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42653
42654 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42655 if (ret)
42656diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42657index 50e51a5..b0bfd78 100644
42658--- a/drivers/hv/hv.c
42659+++ b/drivers/hv/hv.c
42660@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42661 u64 output_address = (output) ? virt_to_phys(output) : 0;
42662 u32 output_address_hi = output_address >> 32;
42663 u32 output_address_lo = output_address & 0xFFFFFFFF;
42664- void *hypercall_page = hv_context.hypercall_page;
42665+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42666
42667 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42668 "=a"(hv_status_lo) : "d" (control_hi),
42669@@ -164,7 +164,7 @@ int hv_init(void)
42670 /* See if the hypercall page is already set */
42671 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42672
42673- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42674+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42675
42676 if (!virtaddr)
42677 goto cleanup;
42678diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42679index ff16938..e60879c 100644
42680--- a/drivers/hv/hv_balloon.c
42681+++ b/drivers/hv/hv_balloon.c
42682@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42683
42684 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42685 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42686-static atomic_t trans_id = ATOMIC_INIT(0);
42687+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42688
42689 static int dm_ring_size = (5 * PAGE_SIZE);
42690
42691@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
42692 pr_info("Memory hot add failed\n");
42693
42694 dm->state = DM_INITIALIZED;
42695- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42696+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42697 vmbus_sendpacket(dm->dev->channel, &resp,
42698 sizeof(struct dm_hot_add_response),
42699 (unsigned long)NULL,
42700@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
42701 memset(&status, 0, sizeof(struct dm_status));
42702 status.hdr.type = DM_STATUS_REPORT;
42703 status.hdr.size = sizeof(struct dm_status);
42704- status.hdr.trans_id = atomic_inc_return(&trans_id);
42705+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42706
42707 /*
42708 * The host expects the guest to report free memory.
42709@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
42710 * send the status. This can happen if we were interrupted
42711 * after we picked our transaction ID.
42712 */
42713- if (status.hdr.trans_id != atomic_read(&trans_id))
42714+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42715 return;
42716
42717 /*
42718@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
42719 */
42720
42721 do {
42722- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42723+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42724 ret = vmbus_sendpacket(dm_device.dev->channel,
42725 bl_resp,
42726 bl_resp->hdr.size,
42727@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42728
42729 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42730 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42731- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42732+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42733 resp.hdr.size = sizeof(struct dm_unballoon_response);
42734
42735 vmbus_sendpacket(dm_device.dev->channel, &resp,
42736@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42737 memset(&version_req, 0, sizeof(struct dm_version_request));
42738 version_req.hdr.type = DM_VERSION_REQUEST;
42739 version_req.hdr.size = sizeof(struct dm_version_request);
42740- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42741+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42742 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42743 version_req.is_last_attempt = 1;
42744
42745@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
42746 memset(&version_req, 0, sizeof(struct dm_version_request));
42747 version_req.hdr.type = DM_VERSION_REQUEST;
42748 version_req.hdr.size = sizeof(struct dm_version_request);
42749- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42750+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42751 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42752 version_req.is_last_attempt = 0;
42753
42754@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
42755 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42756 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42757 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42758- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42759+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42760
42761 cap_msg.caps.cap_bits.balloon = 1;
42762 cap_msg.caps.cap_bits.hot_add = 1;
42763diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42764index 44b1c94..6dccc2c 100644
42765--- a/drivers/hv/hyperv_vmbus.h
42766+++ b/drivers/hv/hyperv_vmbus.h
42767@@ -632,7 +632,7 @@ enum vmbus_connect_state {
42768 struct vmbus_connection {
42769 enum vmbus_connect_state conn_state;
42770
42771- atomic_t next_gpadl_handle;
42772+ atomic_unchecked_t next_gpadl_handle;
42773
42774 /*
42775 * Represents channel interrupts. Each bit position represents a
42776diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42777index f518b8d7..4bc0b64 100644
42778--- a/drivers/hv/vmbus_drv.c
42779+++ b/drivers/hv/vmbus_drv.c
42780@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42781 {
42782 int ret = 0;
42783
42784- static atomic_t device_num = ATOMIC_INIT(0);
42785+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42786
42787 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42788- atomic_inc_return(&device_num));
42789+ atomic_inc_return_unchecked(&device_num));
42790
42791 child_device_obj->device.bus = &hv_bus;
42792 child_device_obj->device.parent = &hv_acpi_dev->dev;
42793diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42794index 579bdf9..0dac21d5 100644
42795--- a/drivers/hwmon/acpi_power_meter.c
42796+++ b/drivers/hwmon/acpi_power_meter.c
42797@@ -116,7 +116,7 @@ struct sensor_template {
42798 struct device_attribute *devattr,
42799 const char *buf, size_t count);
42800 int index;
42801-};
42802+} __do_const;
42803
42804 /* Averaging interval */
42805 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42806@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42807 struct sensor_template *attrs)
42808 {
42809 struct device *dev = &resource->acpi_dev->dev;
42810- struct sensor_device_attribute *sensors =
42811+ sensor_device_attribute_no_const *sensors =
42812 &resource->sensors[resource->num_sensors];
42813 int res = 0;
42814
42815@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42816 return 0;
42817 }
42818
42819-static struct dmi_system_id __initdata pm_dmi_table[] = {
42820+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42821 {
42822 enable_cap_knobs, "IBM Active Energy Manager",
42823 {
42824diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42825index 0af63da..05a183a 100644
42826--- a/drivers/hwmon/applesmc.c
42827+++ b/drivers/hwmon/applesmc.c
42828@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42829 {
42830 struct applesmc_node_group *grp;
42831 struct applesmc_dev_attr *node;
42832- struct attribute *attr;
42833+ attribute_no_const *attr;
42834 int ret, i;
42835
42836 for (grp = groups; grp->format; grp++) {
42837diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42838index cccef87..06ce8ec 100644
42839--- a/drivers/hwmon/asus_atk0110.c
42840+++ b/drivers/hwmon/asus_atk0110.c
42841@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42842 struct atk_sensor_data {
42843 struct list_head list;
42844 struct atk_data *data;
42845- struct device_attribute label_attr;
42846- struct device_attribute input_attr;
42847- struct device_attribute limit1_attr;
42848- struct device_attribute limit2_attr;
42849+ device_attribute_no_const label_attr;
42850+ device_attribute_no_const input_attr;
42851+ device_attribute_no_const limit1_attr;
42852+ device_attribute_no_const limit2_attr;
42853 char label_attr_name[ATTR_NAME_SIZE];
42854 char input_attr_name[ATTR_NAME_SIZE];
42855 char limit1_attr_name[ATTR_NAME_SIZE];
42856@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42857 static struct device_attribute atk_name_attr =
42858 __ATTR(name, 0444, atk_name_show, NULL);
42859
42860-static void atk_init_attribute(struct device_attribute *attr, char *name,
42861+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42862 sysfs_show_func show)
42863 {
42864 sysfs_attr_init(&attr->attr);
42865diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42866index 5b7fec8..05c957a 100644
42867--- a/drivers/hwmon/coretemp.c
42868+++ b/drivers/hwmon/coretemp.c
42869@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42870 return NOTIFY_OK;
42871 }
42872
42873-static struct notifier_block coretemp_cpu_notifier __refdata = {
42874+static struct notifier_block coretemp_cpu_notifier = {
42875 .notifier_call = coretemp_cpu_callback,
42876 };
42877
42878diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42879index 7a8a6fb..015c1fd 100644
42880--- a/drivers/hwmon/ibmaem.c
42881+++ b/drivers/hwmon/ibmaem.c
42882@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42883 struct aem_rw_sensor_template *rw)
42884 {
42885 struct device *dev = &data->pdev->dev;
42886- struct sensor_device_attribute *sensors = data->sensors;
42887+ sensor_device_attribute_no_const *sensors = data->sensors;
42888 int err;
42889
42890 /* Set up read-only sensors */
42891diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42892index 17ae2eb..21b71dd 100644
42893--- a/drivers/hwmon/iio_hwmon.c
42894+++ b/drivers/hwmon/iio_hwmon.c
42895@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42896 {
42897 struct device *dev = &pdev->dev;
42898 struct iio_hwmon_state *st;
42899- struct sensor_device_attribute *a;
42900+ sensor_device_attribute_no_const *a;
42901 int ret, i;
42902 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42903 enum iio_chan_type type;
42904diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42905index 37f0170..414ec2c 100644
42906--- a/drivers/hwmon/nct6683.c
42907+++ b/drivers/hwmon/nct6683.c
42908@@ -397,11 +397,11 @@ static struct attribute_group *
42909 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42910 int repeat)
42911 {
42912- struct sensor_device_attribute_2 *a2;
42913- struct sensor_device_attribute *a;
42914+ sensor_device_attribute_2_no_const *a2;
42915+ sensor_device_attribute_no_const *a;
42916 struct sensor_device_template **t;
42917 struct sensor_device_attr_u *su;
42918- struct attribute_group *group;
42919+ attribute_group_no_const *group;
42920 struct attribute **attrs;
42921 int i, j, count;
42922
42923diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42924index 0773930..6f04305 100644
42925--- a/drivers/hwmon/nct6775.c
42926+++ b/drivers/hwmon/nct6775.c
42927@@ -952,10 +952,10 @@ static struct attribute_group *
42928 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42929 int repeat)
42930 {
42931- struct attribute_group *group;
42932+ attribute_group_no_const *group;
42933 struct sensor_device_attr_u *su;
42934- struct sensor_device_attribute *a;
42935- struct sensor_device_attribute_2 *a2;
42936+ sensor_device_attribute_no_const *a;
42937+ sensor_device_attribute_2_no_const *a2;
42938 struct attribute **attrs;
42939 struct sensor_device_template **t;
42940 int i, count;
42941diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42942index f2e47c7..45d7941 100644
42943--- a/drivers/hwmon/pmbus/pmbus_core.c
42944+++ b/drivers/hwmon/pmbus/pmbus_core.c
42945@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42946 return 0;
42947 }
42948
42949-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42950+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42951 const char *name,
42952 umode_t mode,
42953 ssize_t (*show)(struct device *dev,
42954@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42955 dev_attr->store = store;
42956 }
42957
42958-static void pmbus_attr_init(struct sensor_device_attribute *a,
42959+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42960 const char *name,
42961 umode_t mode,
42962 ssize_t (*show)(struct device *dev,
42963@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42964 u16 reg, u8 mask)
42965 {
42966 struct pmbus_boolean *boolean;
42967- struct sensor_device_attribute *a;
42968+ sensor_device_attribute_no_const *a;
42969
42970 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42971 if (!boolean)
42972@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42973 bool update, bool readonly)
42974 {
42975 struct pmbus_sensor *sensor;
42976- struct device_attribute *a;
42977+ device_attribute_no_const *a;
42978
42979 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42980 if (!sensor)
42981@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42982 const char *lstring, int index)
42983 {
42984 struct pmbus_label *label;
42985- struct device_attribute *a;
42986+ device_attribute_no_const *a;
42987
42988 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42989 if (!label)
42990diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42991index d4f0935..7420593 100644
42992--- a/drivers/hwmon/sht15.c
42993+++ b/drivers/hwmon/sht15.c
42994@@ -169,7 +169,7 @@ struct sht15_data {
42995 int supply_uv;
42996 bool supply_uv_valid;
42997 struct work_struct update_supply_work;
42998- atomic_t interrupt_handled;
42999+ atomic_unchecked_t interrupt_handled;
43000 };
43001
43002 /**
43003@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
43004 ret = gpio_direction_input(data->pdata->gpio_data);
43005 if (ret)
43006 return ret;
43007- atomic_set(&data->interrupt_handled, 0);
43008+ atomic_set_unchecked(&data->interrupt_handled, 0);
43009
43010 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43011 if (gpio_get_value(data->pdata->gpio_data) == 0) {
43012 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
43013 /* Only relevant if the interrupt hasn't occurred. */
43014- if (!atomic_read(&data->interrupt_handled))
43015+ if (!atomic_read_unchecked(&data->interrupt_handled))
43016 schedule_work(&data->read_work);
43017 }
43018 ret = wait_event_timeout(data->wait_queue,
43019@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
43020
43021 /* First disable the interrupt */
43022 disable_irq_nosync(irq);
43023- atomic_inc(&data->interrupt_handled);
43024+ atomic_inc_unchecked(&data->interrupt_handled);
43025 /* Then schedule a reading work struct */
43026 if (data->state != SHT15_READING_NOTHING)
43027 schedule_work(&data->read_work);
43028@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
43029 * If not, then start the interrupt again - care here as could
43030 * have gone low in meantime so verify it hasn't!
43031 */
43032- atomic_set(&data->interrupt_handled, 0);
43033+ atomic_set_unchecked(&data->interrupt_handled, 0);
43034 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43035 /* If still not occurred or another handler was scheduled */
43036 if (gpio_get_value(data->pdata->gpio_data)
43037- || atomic_read(&data->interrupt_handled))
43038+ || atomic_read_unchecked(&data->interrupt_handled))
43039 return;
43040 }
43041
43042diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43043index ac91c07..8e69663 100644
43044--- a/drivers/hwmon/via-cputemp.c
43045+++ b/drivers/hwmon/via-cputemp.c
43046@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43047 return NOTIFY_OK;
43048 }
43049
43050-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43051+static struct notifier_block via_cputemp_cpu_notifier = {
43052 .notifier_call = via_cputemp_cpu_callback,
43053 };
43054
43055diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43056index 65e3240..e6c511d 100644
43057--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43058+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43059@@ -39,7 +39,7 @@
43060 extern struct i2c_adapter amd756_smbus;
43061
43062 static struct i2c_adapter *s4882_adapter;
43063-static struct i2c_algorithm *s4882_algo;
43064+static i2c_algorithm_no_const *s4882_algo;
43065
43066 /* Wrapper access functions for multiplexed SMBus */
43067 static DEFINE_MUTEX(amd756_lock);
43068diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43069index b19a310..d6eece0 100644
43070--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43071+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43072@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43073 /* usb layer */
43074
43075 /* Send command to device, and get response. */
43076-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43077+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43078 {
43079 int ret = 0;
43080 int actual;
43081diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43082index 88eda09..cf40434 100644
43083--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43084+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43085@@ -37,7 +37,7 @@
43086 extern struct i2c_adapter *nforce2_smbus;
43087
43088 static struct i2c_adapter *s4985_adapter;
43089-static struct i2c_algorithm *s4985_algo;
43090+static i2c_algorithm_no_const *s4985_algo;
43091
43092 /* Wrapper access functions for multiplexed SMBus */
43093 static DEFINE_MUTEX(nforce2_lock);
43094diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43095index 71c7a39..71dd3e0 100644
43096--- a/drivers/i2c/i2c-dev.c
43097+++ b/drivers/i2c/i2c-dev.c
43098@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43099 break;
43100 }
43101
43102- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43103+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43104 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43105 if (IS_ERR(rdwr_pa[i].buf)) {
43106 res = PTR_ERR(rdwr_pa[i].buf);
43107diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43108index 0b510ba..4fbb5085 100644
43109--- a/drivers/ide/ide-cd.c
43110+++ b/drivers/ide/ide-cd.c
43111@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43112 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43113 if ((unsigned long)buf & alignment
43114 || blk_rq_bytes(rq) & q->dma_pad_mask
43115- || object_is_on_stack(buf))
43116+ || object_starts_on_stack(buf))
43117 drive->dma = 0;
43118 }
43119 }
43120diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43121index 4df97f6..c751151 100644
43122--- a/drivers/iio/industrialio-core.c
43123+++ b/drivers/iio/industrialio-core.c
43124@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43125 }
43126
43127 static
43128-int __iio_device_attr_init(struct device_attribute *dev_attr,
43129+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43130 const char *postfix,
43131 struct iio_chan_spec const *chan,
43132 ssize_t (*readfunc)(struct device *dev,
43133diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43134index e28a494..f7c2671 100644
43135--- a/drivers/infiniband/core/cm.c
43136+++ b/drivers/infiniband/core/cm.c
43137@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43138
43139 struct cm_counter_group {
43140 struct kobject obj;
43141- atomic_long_t counter[CM_ATTR_COUNT];
43142+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43143 };
43144
43145 struct cm_counter_attribute {
43146@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43147 struct ib_mad_send_buf *msg = NULL;
43148 int ret;
43149
43150- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43151+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43152 counter[CM_REQ_COUNTER]);
43153
43154 /* Quick state check to discard duplicate REQs. */
43155@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43156 if (!cm_id_priv)
43157 return;
43158
43159- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43160+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43161 counter[CM_REP_COUNTER]);
43162 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43163 if (ret)
43164@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
43165 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43166 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43167 spin_unlock_irq(&cm_id_priv->lock);
43168- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43169+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43170 counter[CM_RTU_COUNTER]);
43171 goto out;
43172 }
43173@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
43174 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43175 dreq_msg->local_comm_id);
43176 if (!cm_id_priv) {
43177- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43178+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43179 counter[CM_DREQ_COUNTER]);
43180 cm_issue_drep(work->port, work->mad_recv_wc);
43181 return -EINVAL;
43182@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
43183 case IB_CM_MRA_REP_RCVD:
43184 break;
43185 case IB_CM_TIMEWAIT:
43186- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43187+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43188 counter[CM_DREQ_COUNTER]);
43189 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43190 goto unlock;
43191@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
43192 cm_free_msg(msg);
43193 goto deref;
43194 case IB_CM_DREQ_RCVD:
43195- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43196+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43197 counter[CM_DREQ_COUNTER]);
43198 goto unlock;
43199 default:
43200@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
43201 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43202 cm_id_priv->msg, timeout)) {
43203 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43204- atomic_long_inc(&work->port->
43205+ atomic_long_inc_unchecked(&work->port->
43206 counter_group[CM_RECV_DUPLICATES].
43207 counter[CM_MRA_COUNTER]);
43208 goto out;
43209@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
43210 break;
43211 case IB_CM_MRA_REQ_RCVD:
43212 case IB_CM_MRA_REP_RCVD:
43213- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43214+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43215 counter[CM_MRA_COUNTER]);
43216 /* fall through */
43217 default:
43218@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
43219 case IB_CM_LAP_IDLE:
43220 break;
43221 case IB_CM_MRA_LAP_SENT:
43222- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43223+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43224 counter[CM_LAP_COUNTER]);
43225 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43226 goto unlock;
43227@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
43228 cm_free_msg(msg);
43229 goto deref;
43230 case IB_CM_LAP_RCVD:
43231- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43232+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43233 counter[CM_LAP_COUNTER]);
43234 goto unlock;
43235 default:
43236@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43237 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43238 if (cur_cm_id_priv) {
43239 spin_unlock_irq(&cm.lock);
43240- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43241+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43242 counter[CM_SIDR_REQ_COUNTER]);
43243 goto out; /* Duplicate message. */
43244 }
43245@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43246 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43247 msg->retries = 1;
43248
43249- atomic_long_add(1 + msg->retries,
43250+ atomic_long_add_unchecked(1 + msg->retries,
43251 &port->counter_group[CM_XMIT].counter[attr_index]);
43252 if (msg->retries)
43253- atomic_long_add(msg->retries,
43254+ atomic_long_add_unchecked(msg->retries,
43255 &port->counter_group[CM_XMIT_RETRIES].
43256 counter[attr_index]);
43257
43258@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43259 }
43260
43261 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43262- atomic_long_inc(&port->counter_group[CM_RECV].
43263+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43264 counter[attr_id - CM_ATTR_ID_OFFSET]);
43265
43266 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43267@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43268 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43269
43270 return sprintf(buf, "%ld\n",
43271- atomic_long_read(&group->counter[cm_attr->index]));
43272+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43273 }
43274
43275 static const struct sysfs_ops cm_counter_ops = {
43276diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43277index 9f5ad7c..588cd84 100644
43278--- a/drivers/infiniband/core/fmr_pool.c
43279+++ b/drivers/infiniband/core/fmr_pool.c
43280@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43281
43282 struct task_struct *thread;
43283
43284- atomic_t req_ser;
43285- atomic_t flush_ser;
43286+ atomic_unchecked_t req_ser;
43287+ atomic_unchecked_t flush_ser;
43288
43289 wait_queue_head_t force_wait;
43290 };
43291@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43292 struct ib_fmr_pool *pool = pool_ptr;
43293
43294 do {
43295- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43296+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43297 ib_fmr_batch_release(pool);
43298
43299- atomic_inc(&pool->flush_ser);
43300+ atomic_inc_unchecked(&pool->flush_ser);
43301 wake_up_interruptible(&pool->force_wait);
43302
43303 if (pool->flush_function)
43304@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43305 }
43306
43307 set_current_state(TASK_INTERRUPTIBLE);
43308- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43309+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43310 !kthread_should_stop())
43311 schedule();
43312 __set_current_state(TASK_RUNNING);
43313@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43314 pool->dirty_watermark = params->dirty_watermark;
43315 pool->dirty_len = 0;
43316 spin_lock_init(&pool->pool_lock);
43317- atomic_set(&pool->req_ser, 0);
43318- atomic_set(&pool->flush_ser, 0);
43319+ atomic_set_unchecked(&pool->req_ser, 0);
43320+ atomic_set_unchecked(&pool->flush_ser, 0);
43321 init_waitqueue_head(&pool->force_wait);
43322
43323 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43324@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43325 }
43326 spin_unlock_irq(&pool->pool_lock);
43327
43328- serial = atomic_inc_return(&pool->req_ser);
43329+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43330 wake_up_process(pool->thread);
43331
43332 if (wait_event_interruptible(pool->force_wait,
43333- atomic_read(&pool->flush_ser) - serial >= 0))
43334+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43335 return -EINTR;
43336
43337 return 0;
43338@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43339 } else {
43340 list_add_tail(&fmr->list, &pool->dirty_list);
43341 if (++pool->dirty_len >= pool->dirty_watermark) {
43342- atomic_inc(&pool->req_ser);
43343+ atomic_inc_unchecked(&pool->req_ser);
43344 wake_up_process(pool->thread);
43345 }
43346 }
43347diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43348index a9f0489..27a161b 100644
43349--- a/drivers/infiniband/core/uverbs_cmd.c
43350+++ b/drivers/infiniband/core/uverbs_cmd.c
43351@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43352 if (copy_from_user(&cmd, buf, sizeof cmd))
43353 return -EFAULT;
43354
43355+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43356+ return -EFAULT;
43357+
43358 INIT_UDATA(&udata, buf + sizeof cmd,
43359 (unsigned long) cmd.response + sizeof resp,
43360 in_len - sizeof cmd, out_len - sizeof resp);
43361diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43362index 6791fd1..78bdcdf 100644
43363--- a/drivers/infiniband/hw/cxgb4/mem.c
43364+++ b/drivers/infiniband/hw/cxgb4/mem.c
43365@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43366 int err;
43367 struct fw_ri_tpte tpt;
43368 u32 stag_idx;
43369- static atomic_t key;
43370+ static atomic_unchecked_t key;
43371
43372 if (c4iw_fatal_error(rdev))
43373 return -EIO;
43374@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43375 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43376 rdev->stats.stag.max = rdev->stats.stag.cur;
43377 mutex_unlock(&rdev->stats.lock);
43378- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43379+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43380 }
43381 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43382 __func__, stag_state, type, pdid, stag_idx);
43383diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43384index 79b3dbc..96e5fcc 100644
43385--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43386+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43387@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43388 struct ib_atomic_eth *ateth;
43389 struct ipath_ack_entry *e;
43390 u64 vaddr;
43391- atomic64_t *maddr;
43392+ atomic64_unchecked_t *maddr;
43393 u64 sdata;
43394 u32 rkey;
43395 u8 next;
43396@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43397 IB_ACCESS_REMOTE_ATOMIC)))
43398 goto nack_acc_unlck;
43399 /* Perform atomic OP and save result. */
43400- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43401+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43402 sdata = be64_to_cpu(ateth->swap_data);
43403 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43404 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43405- (u64) atomic64_add_return(sdata, maddr) - sdata :
43406+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43407 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43408 be64_to_cpu(ateth->compare_data),
43409 sdata);
43410diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43411index 1f95bba..9530f87 100644
43412--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43413+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43414@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43415 unsigned long flags;
43416 struct ib_wc wc;
43417 u64 sdata;
43418- atomic64_t *maddr;
43419+ atomic64_unchecked_t *maddr;
43420 enum ib_wc_status send_status;
43421
43422 /*
43423@@ -382,11 +382,11 @@ again:
43424 IB_ACCESS_REMOTE_ATOMIC)))
43425 goto acc_err;
43426 /* Perform atomic OP and save result. */
43427- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43428+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43429 sdata = wqe->wr.wr.atomic.compare_add;
43430 *(u64 *) sqp->s_sge.sge.vaddr =
43431 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43432- (u64) atomic64_add_return(sdata, maddr) - sdata :
43433+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43434 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43435 sdata, wqe->wr.wr.atomic.swap);
43436 goto send_comp;
43437diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43438index 5904026..f1c30e5 100644
43439--- a/drivers/infiniband/hw/mlx4/mad.c
43440+++ b/drivers/infiniband/hw/mlx4/mad.c
43441@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43442
43443 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43444 {
43445- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43446+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43447 cpu_to_be64(0xff00000000000000LL);
43448 }
43449
43450diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43451index ed327e6..ca1739e0 100644
43452--- a/drivers/infiniband/hw/mlx4/mcg.c
43453+++ b/drivers/infiniband/hw/mlx4/mcg.c
43454@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43455 {
43456 char name[20];
43457
43458- atomic_set(&ctx->tid, 0);
43459+ atomic_set_unchecked(&ctx->tid, 0);
43460 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43461 ctx->mcg_wq = create_singlethread_workqueue(name);
43462 if (!ctx->mcg_wq)
43463diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43464index f829fd9..1a8d436 100644
43465--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43466+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43467@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
43468 struct list_head mcg_mgid0_list;
43469 struct workqueue_struct *mcg_wq;
43470 struct mlx4_ib_demux_pv_ctx **tun;
43471- atomic_t tid;
43472+ atomic_unchecked_t tid;
43473 int flushing; /* flushing the work queue */
43474 };
43475
43476diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43477index 9d3e5c1..6f166df 100644
43478--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43479+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43480@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43481 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43482 }
43483
43484-int mthca_QUERY_FW(struct mthca_dev *dev)
43485+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43486 {
43487 struct mthca_mailbox *mailbox;
43488 u32 *outbox;
43489@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43490 CMD_TIME_CLASS_B);
43491 }
43492
43493-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43494+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43495 int num_mtt)
43496 {
43497 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43498@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43499 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43500 }
43501
43502-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43503+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43504 int eq_num)
43505 {
43506 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43507@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43508 CMD_TIME_CLASS_B);
43509 }
43510
43511-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43512+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43513 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43514 void *in_mad, void *response_mad)
43515 {
43516diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43517index ded76c1..0cf0a08 100644
43518--- a/drivers/infiniband/hw/mthca/mthca_main.c
43519+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43520@@ -692,7 +692,7 @@ err_close:
43521 return err;
43522 }
43523
43524-static int mthca_setup_hca(struct mthca_dev *dev)
43525+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43526 {
43527 int err;
43528
43529diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43530index ed9a989..6aa5dc2 100644
43531--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43532+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43533@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43534 * through the bitmaps)
43535 */
43536
43537-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43538+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43539 {
43540 int o;
43541 int m;
43542@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43543 return key;
43544 }
43545
43546-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43547+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43548 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43549 {
43550 struct mthca_mailbox *mailbox;
43551@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43552 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43553 }
43554
43555-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43556+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43557 u64 *buffer_list, int buffer_size_shift,
43558 int list_len, u64 iova, u64 total_size,
43559 u32 access, struct mthca_mr *mr)
43560diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43561index 415f8e1..e34214e 100644
43562--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43563+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43564@@ -764,7 +764,7 @@ unlock:
43565 return 0;
43566 }
43567
43568-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43569+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43570 {
43571 struct mthca_dev *dev = to_mdev(ibcq->device);
43572 struct mthca_cq *cq = to_mcq(ibcq);
43573diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43574index 3b2a6dc..bce26ff 100644
43575--- a/drivers/infiniband/hw/nes/nes.c
43576+++ b/drivers/infiniband/hw/nes/nes.c
43577@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43578 LIST_HEAD(nes_adapter_list);
43579 static LIST_HEAD(nes_dev_list);
43580
43581-atomic_t qps_destroyed;
43582+atomic_unchecked_t qps_destroyed;
43583
43584 static unsigned int ee_flsh_adapter;
43585 static unsigned int sysfs_nonidx_addr;
43586@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43587 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43588 struct nes_adapter *nesadapter = nesdev->nesadapter;
43589
43590- atomic_inc(&qps_destroyed);
43591+ atomic_inc_unchecked(&qps_destroyed);
43592
43593 /* Free the control structures */
43594
43595diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43596index bd9d132..70d84f4 100644
43597--- a/drivers/infiniband/hw/nes/nes.h
43598+++ b/drivers/infiniband/hw/nes/nes.h
43599@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43600 extern unsigned int wqm_quanta;
43601 extern struct list_head nes_adapter_list;
43602
43603-extern atomic_t cm_connects;
43604-extern atomic_t cm_accepts;
43605-extern atomic_t cm_disconnects;
43606-extern atomic_t cm_closes;
43607-extern atomic_t cm_connecteds;
43608-extern atomic_t cm_connect_reqs;
43609-extern atomic_t cm_rejects;
43610-extern atomic_t mod_qp_timouts;
43611-extern atomic_t qps_created;
43612-extern atomic_t qps_destroyed;
43613-extern atomic_t sw_qps_destroyed;
43614+extern atomic_unchecked_t cm_connects;
43615+extern atomic_unchecked_t cm_accepts;
43616+extern atomic_unchecked_t cm_disconnects;
43617+extern atomic_unchecked_t cm_closes;
43618+extern atomic_unchecked_t cm_connecteds;
43619+extern atomic_unchecked_t cm_connect_reqs;
43620+extern atomic_unchecked_t cm_rejects;
43621+extern atomic_unchecked_t mod_qp_timouts;
43622+extern atomic_unchecked_t qps_created;
43623+extern atomic_unchecked_t qps_destroyed;
43624+extern atomic_unchecked_t sw_qps_destroyed;
43625 extern u32 mh_detected;
43626 extern u32 mh_pauses_sent;
43627 extern u32 cm_packets_sent;
43628@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43629 extern u32 cm_packets_received;
43630 extern u32 cm_packets_dropped;
43631 extern u32 cm_packets_retrans;
43632-extern atomic_t cm_listens_created;
43633-extern atomic_t cm_listens_destroyed;
43634+extern atomic_unchecked_t cm_listens_created;
43635+extern atomic_unchecked_t cm_listens_destroyed;
43636 extern u32 cm_backlog_drops;
43637-extern atomic_t cm_loopbacks;
43638-extern atomic_t cm_nodes_created;
43639-extern atomic_t cm_nodes_destroyed;
43640-extern atomic_t cm_accel_dropped_pkts;
43641-extern atomic_t cm_resets_recvd;
43642-extern atomic_t pau_qps_created;
43643-extern atomic_t pau_qps_destroyed;
43644+extern atomic_unchecked_t cm_loopbacks;
43645+extern atomic_unchecked_t cm_nodes_created;
43646+extern atomic_unchecked_t cm_nodes_destroyed;
43647+extern atomic_unchecked_t cm_accel_dropped_pkts;
43648+extern atomic_unchecked_t cm_resets_recvd;
43649+extern atomic_unchecked_t pau_qps_created;
43650+extern atomic_unchecked_t pau_qps_destroyed;
43651
43652 extern u32 int_mod_timer_init;
43653 extern u32 int_mod_cq_depth_256;
43654diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43655index 6f09a72..cf4399d 100644
43656--- a/drivers/infiniband/hw/nes/nes_cm.c
43657+++ b/drivers/infiniband/hw/nes/nes_cm.c
43658@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43659 u32 cm_packets_retrans;
43660 u32 cm_packets_created;
43661 u32 cm_packets_received;
43662-atomic_t cm_listens_created;
43663-atomic_t cm_listens_destroyed;
43664+atomic_unchecked_t cm_listens_created;
43665+atomic_unchecked_t cm_listens_destroyed;
43666 u32 cm_backlog_drops;
43667-atomic_t cm_loopbacks;
43668-atomic_t cm_nodes_created;
43669-atomic_t cm_nodes_destroyed;
43670-atomic_t cm_accel_dropped_pkts;
43671-atomic_t cm_resets_recvd;
43672+atomic_unchecked_t cm_loopbacks;
43673+atomic_unchecked_t cm_nodes_created;
43674+atomic_unchecked_t cm_nodes_destroyed;
43675+atomic_unchecked_t cm_accel_dropped_pkts;
43676+atomic_unchecked_t cm_resets_recvd;
43677
43678 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43679 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43680@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43681 /* instance of function pointers for client API */
43682 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43683 static struct nes_cm_ops nes_cm_api = {
43684- mini_cm_accelerated,
43685- mini_cm_listen,
43686- mini_cm_del_listen,
43687- mini_cm_connect,
43688- mini_cm_close,
43689- mini_cm_accept,
43690- mini_cm_reject,
43691- mini_cm_recv_pkt,
43692- mini_cm_dealloc_core,
43693- mini_cm_get,
43694- mini_cm_set
43695+ .accelerated = mini_cm_accelerated,
43696+ .listen = mini_cm_listen,
43697+ .stop_listener = mini_cm_del_listen,
43698+ .connect = mini_cm_connect,
43699+ .close = mini_cm_close,
43700+ .accept = mini_cm_accept,
43701+ .reject = mini_cm_reject,
43702+ .recv_pkt = mini_cm_recv_pkt,
43703+ .destroy_cm_core = mini_cm_dealloc_core,
43704+ .get = mini_cm_get,
43705+ .set = mini_cm_set
43706 };
43707
43708 static struct nes_cm_core *g_cm_core;
43709
43710-atomic_t cm_connects;
43711-atomic_t cm_accepts;
43712-atomic_t cm_disconnects;
43713-atomic_t cm_closes;
43714-atomic_t cm_connecteds;
43715-atomic_t cm_connect_reqs;
43716-atomic_t cm_rejects;
43717+atomic_unchecked_t cm_connects;
43718+atomic_unchecked_t cm_accepts;
43719+atomic_unchecked_t cm_disconnects;
43720+atomic_unchecked_t cm_closes;
43721+atomic_unchecked_t cm_connecteds;
43722+atomic_unchecked_t cm_connect_reqs;
43723+atomic_unchecked_t cm_rejects;
43724
43725 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43726 {
43727@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43728 kfree(listener);
43729 listener = NULL;
43730 ret = 0;
43731- atomic_inc(&cm_listens_destroyed);
43732+ atomic_inc_unchecked(&cm_listens_destroyed);
43733 } else {
43734 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43735 }
43736@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43737 cm_node->rem_mac);
43738
43739 add_hte_node(cm_core, cm_node);
43740- atomic_inc(&cm_nodes_created);
43741+ atomic_inc_unchecked(&cm_nodes_created);
43742
43743 return cm_node;
43744 }
43745@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43746 }
43747
43748 atomic_dec(&cm_core->node_cnt);
43749- atomic_inc(&cm_nodes_destroyed);
43750+ atomic_inc_unchecked(&cm_nodes_destroyed);
43751 nesqp = cm_node->nesqp;
43752 if (nesqp) {
43753 nesqp->cm_node = NULL;
43754@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43755
43756 static void drop_packet(struct sk_buff *skb)
43757 {
43758- atomic_inc(&cm_accel_dropped_pkts);
43759+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43760 dev_kfree_skb_any(skb);
43761 }
43762
43763@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43764 {
43765
43766 int reset = 0; /* whether to send reset in case of err.. */
43767- atomic_inc(&cm_resets_recvd);
43768+ atomic_inc_unchecked(&cm_resets_recvd);
43769 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43770 " refcnt=%d\n", cm_node, cm_node->state,
43771 atomic_read(&cm_node->ref_count));
43772@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43773 rem_ref_cm_node(cm_node->cm_core, cm_node);
43774 return NULL;
43775 }
43776- atomic_inc(&cm_loopbacks);
43777+ atomic_inc_unchecked(&cm_loopbacks);
43778 loopbackremotenode->loopbackpartner = cm_node;
43779 loopbackremotenode->tcp_cntxt.rcv_wscale =
43780 NES_CM_DEFAULT_RCV_WND_SCALE;
43781@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43782 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43783 else {
43784 rem_ref_cm_node(cm_core, cm_node);
43785- atomic_inc(&cm_accel_dropped_pkts);
43786+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43787 dev_kfree_skb_any(skb);
43788 }
43789 break;
43790@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43791
43792 if ((cm_id) && (cm_id->event_handler)) {
43793 if (issue_disconn) {
43794- atomic_inc(&cm_disconnects);
43795+ atomic_inc_unchecked(&cm_disconnects);
43796 cm_event.event = IW_CM_EVENT_DISCONNECT;
43797 cm_event.status = disconn_status;
43798 cm_event.local_addr = cm_id->local_addr;
43799@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43800 }
43801
43802 if (issue_close) {
43803- atomic_inc(&cm_closes);
43804+ atomic_inc_unchecked(&cm_closes);
43805 nes_disconnect(nesqp, 1);
43806
43807 cm_id->provider_data = nesqp;
43808@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43809
43810 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43811 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43812- atomic_inc(&cm_accepts);
43813+ atomic_inc_unchecked(&cm_accepts);
43814
43815 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43816 netdev_refcnt_read(nesvnic->netdev));
43817@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43818 struct nes_cm_core *cm_core;
43819 u8 *start_buff;
43820
43821- atomic_inc(&cm_rejects);
43822+ atomic_inc_unchecked(&cm_rejects);
43823 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43824 loopback = cm_node->loopbackpartner;
43825 cm_core = cm_node->cm_core;
43826@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43827 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43828 ntohs(laddr->sin_port));
43829
43830- atomic_inc(&cm_connects);
43831+ atomic_inc_unchecked(&cm_connects);
43832 nesqp->active_conn = 1;
43833
43834 /* cache the cm_id in the qp */
43835@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43836 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43837 return err;
43838 }
43839- atomic_inc(&cm_listens_created);
43840+ atomic_inc_unchecked(&cm_listens_created);
43841 }
43842
43843 cm_id->add_ref(cm_id);
43844@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43845
43846 if (nesqp->destroyed)
43847 return;
43848- atomic_inc(&cm_connecteds);
43849+ atomic_inc_unchecked(&cm_connecteds);
43850 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43851 " local port 0x%04X. jiffies = %lu.\n",
43852 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43853@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43854
43855 cm_id->add_ref(cm_id);
43856 ret = cm_id->event_handler(cm_id, &cm_event);
43857- atomic_inc(&cm_closes);
43858+ atomic_inc_unchecked(&cm_closes);
43859 cm_event.event = IW_CM_EVENT_CLOSE;
43860 cm_event.status = 0;
43861 cm_event.provider_data = cm_id->provider_data;
43862@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43863 return;
43864 cm_id = cm_node->cm_id;
43865
43866- atomic_inc(&cm_connect_reqs);
43867+ atomic_inc_unchecked(&cm_connect_reqs);
43868 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43869 cm_node, cm_id, jiffies);
43870
43871@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43872 return;
43873 cm_id = cm_node->cm_id;
43874
43875- atomic_inc(&cm_connect_reqs);
43876+ atomic_inc_unchecked(&cm_connect_reqs);
43877 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43878 cm_node, cm_id, jiffies);
43879
43880diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43881index 4166452..fc952c3 100644
43882--- a/drivers/infiniband/hw/nes/nes_mgt.c
43883+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43884@@ -40,8 +40,8 @@
43885 #include "nes.h"
43886 #include "nes_mgt.h"
43887
43888-atomic_t pau_qps_created;
43889-atomic_t pau_qps_destroyed;
43890+atomic_unchecked_t pau_qps_created;
43891+atomic_unchecked_t pau_qps_destroyed;
43892
43893 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43894 {
43895@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43896 {
43897 struct sk_buff *skb;
43898 unsigned long flags;
43899- atomic_inc(&pau_qps_destroyed);
43900+ atomic_inc_unchecked(&pau_qps_destroyed);
43901
43902 /* Free packets that have not yet been forwarded */
43903 /* Lock is acquired by skb_dequeue when removing the skb */
43904@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43905 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43906 skb_queue_head_init(&nesqp->pau_list);
43907 spin_lock_init(&nesqp->pau_lock);
43908- atomic_inc(&pau_qps_created);
43909+ atomic_inc_unchecked(&pau_qps_created);
43910 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43911 }
43912
43913diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43914index 70acda9..a96de9d 100644
43915--- a/drivers/infiniband/hw/nes/nes_nic.c
43916+++ b/drivers/infiniband/hw/nes/nes_nic.c
43917@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43918 target_stat_values[++index] = mh_detected;
43919 target_stat_values[++index] = mh_pauses_sent;
43920 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43921- target_stat_values[++index] = atomic_read(&cm_connects);
43922- target_stat_values[++index] = atomic_read(&cm_accepts);
43923- target_stat_values[++index] = atomic_read(&cm_disconnects);
43924- target_stat_values[++index] = atomic_read(&cm_connecteds);
43925- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43926- target_stat_values[++index] = atomic_read(&cm_rejects);
43927- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43928- target_stat_values[++index] = atomic_read(&qps_created);
43929- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43930- target_stat_values[++index] = atomic_read(&qps_destroyed);
43931- target_stat_values[++index] = atomic_read(&cm_closes);
43932+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43933+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43934+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43935+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43936+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43937+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43938+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43939+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43940+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43941+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43942+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43943 target_stat_values[++index] = cm_packets_sent;
43944 target_stat_values[++index] = cm_packets_bounced;
43945 target_stat_values[++index] = cm_packets_created;
43946 target_stat_values[++index] = cm_packets_received;
43947 target_stat_values[++index] = cm_packets_dropped;
43948 target_stat_values[++index] = cm_packets_retrans;
43949- target_stat_values[++index] = atomic_read(&cm_listens_created);
43950- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43951+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43952+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43953 target_stat_values[++index] = cm_backlog_drops;
43954- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43955- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43956- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43957- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43958- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43959+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43960+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43961+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43962+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43963+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43964 target_stat_values[++index] = nesadapter->free_4kpbl;
43965 target_stat_values[++index] = nesadapter->free_256pbl;
43966 target_stat_values[++index] = int_mod_timer_init;
43967 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43968 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43969 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43970- target_stat_values[++index] = atomic_read(&pau_qps_created);
43971- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43972+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43973+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43974 }
43975
43976 /**
43977diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43978index c0d0296..3185f57 100644
43979--- a/drivers/infiniband/hw/nes/nes_verbs.c
43980+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43981@@ -46,9 +46,9 @@
43982
43983 #include <rdma/ib_umem.h>
43984
43985-atomic_t mod_qp_timouts;
43986-atomic_t qps_created;
43987-atomic_t sw_qps_destroyed;
43988+atomic_unchecked_t mod_qp_timouts;
43989+atomic_unchecked_t qps_created;
43990+atomic_unchecked_t sw_qps_destroyed;
43991
43992 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43993
43994@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43995 if (init_attr->create_flags)
43996 return ERR_PTR(-EINVAL);
43997
43998- atomic_inc(&qps_created);
43999+ atomic_inc_unchecked(&qps_created);
44000 switch (init_attr->qp_type) {
44001 case IB_QPT_RC:
44002 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
44003@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
44004 struct iw_cm_event cm_event;
44005 int ret = 0;
44006
44007- atomic_inc(&sw_qps_destroyed);
44008+ atomic_inc_unchecked(&sw_qps_destroyed);
44009 nesqp->destroyed = 1;
44010
44011 /* Blow away the connection if it exists. */
44012diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
44013index ffd48bf..83cdb56 100644
44014--- a/drivers/infiniband/hw/qib/qib.h
44015+++ b/drivers/infiniband/hw/qib/qib.h
44016@@ -52,6 +52,7 @@
44017 #include <linux/kref.h>
44018 #include <linux/sched.h>
44019 #include <linux/kthread.h>
44020+#include <linux/slab.h>
44021
44022 #include "qib_common.h"
44023 #include "qib_verbs.h"
44024diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44025index cdc7df4..a2fdfdb 100644
44026--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44027+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44028@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
44029 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
44030 }
44031
44032-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44033+static struct rtnl_link_ops ipoib_link_ops = {
44034 .kind = "ipoib",
44035 .maxtype = IFLA_IPOIB_MAX,
44036 .policy = ipoib_policy,
44037diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44038index e853a21..56fc5a8 100644
44039--- a/drivers/input/gameport/gameport.c
44040+++ b/drivers/input/gameport/gameport.c
44041@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44042 */
44043 static void gameport_init_port(struct gameport *gameport)
44044 {
44045- static atomic_t gameport_no = ATOMIC_INIT(-1);
44046+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44047
44048 __module_get(THIS_MODULE);
44049
44050 mutex_init(&gameport->drv_mutex);
44051 device_initialize(&gameport->dev);
44052 dev_set_name(&gameport->dev, "gameport%lu",
44053- (unsigned long)atomic_inc_return(&gameport_no));
44054+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44055 gameport->dev.bus = &gameport_bus;
44056 gameport->dev.release = gameport_release_port;
44057 if (gameport->parent)
44058diff --git a/drivers/input/input.c b/drivers/input/input.c
44059index cc357f1..ee42fbc 100644
44060--- a/drivers/input/input.c
44061+++ b/drivers/input/input.c
44062@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44063 */
44064 struct input_dev *input_allocate_device(void)
44065 {
44066- static atomic_t input_no = ATOMIC_INIT(-1);
44067+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44068 struct input_dev *dev;
44069
44070 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44071@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44072 INIT_LIST_HEAD(&dev->node);
44073
44074 dev_set_name(&dev->dev, "input%lu",
44075- (unsigned long)atomic_inc_return(&input_no));
44076+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44077
44078 __module_get(THIS_MODULE);
44079 }
44080diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44081index 4a95b22..874c182 100644
44082--- a/drivers/input/joystick/sidewinder.c
44083+++ b/drivers/input/joystick/sidewinder.c
44084@@ -30,6 +30,7 @@
44085 #include <linux/kernel.h>
44086 #include <linux/module.h>
44087 #include <linux/slab.h>
44088+#include <linux/sched.h>
44089 #include <linux/input.h>
44090 #include <linux/gameport.h>
44091 #include <linux/jiffies.h>
44092diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44093index 3aa2f3f..53c00ea 100644
44094--- a/drivers/input/joystick/xpad.c
44095+++ b/drivers/input/joystick/xpad.c
44096@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44097
44098 static int xpad_led_probe(struct usb_xpad *xpad)
44099 {
44100- static atomic_t led_seq = ATOMIC_INIT(-1);
44101+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44102 unsigned long led_no;
44103 struct xpad_led *led;
44104 struct led_classdev *led_cdev;
44105@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44106 if (!led)
44107 return -ENOMEM;
44108
44109- led_no = atomic_inc_return(&led_seq);
44110+ led_no = atomic_inc_return_unchecked(&led_seq);
44111
44112 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44113 led->xpad = xpad;
44114diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44115index ac1fa5f..5f7502c 100644
44116--- a/drivers/input/misc/ims-pcu.c
44117+++ b/drivers/input/misc/ims-pcu.c
44118@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44119
44120 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44121 {
44122- static atomic_t device_no = ATOMIC_INIT(-1);
44123+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44124
44125 const struct ims_pcu_device_info *info;
44126 int error;
44127@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44128 }
44129
44130 /* Device appears to be operable, complete initialization */
44131- pcu->device_no = atomic_inc_return(&device_no);
44132+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44133
44134 /*
44135 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44136diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44137index d02e1bd..d719719 100644
44138--- a/drivers/input/mouse/psmouse.h
44139+++ b/drivers/input/mouse/psmouse.h
44140@@ -124,7 +124,7 @@ struct psmouse_attribute {
44141 ssize_t (*set)(struct psmouse *psmouse, void *data,
44142 const char *buf, size_t count);
44143 bool protect;
44144-};
44145+} __do_const;
44146 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44147
44148 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44149diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44150index b604564..3f14ae4 100644
44151--- a/drivers/input/mousedev.c
44152+++ b/drivers/input/mousedev.c
44153@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44154
44155 spin_unlock_irq(&client->packet_lock);
44156
44157- if (copy_to_user(buffer, data, count))
44158+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44159 return -EFAULT;
44160
44161 return count;
44162diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44163index a05a517..323a2fd 100644
44164--- a/drivers/input/serio/serio.c
44165+++ b/drivers/input/serio/serio.c
44166@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44167 */
44168 static void serio_init_port(struct serio *serio)
44169 {
44170- static atomic_t serio_no = ATOMIC_INIT(-1);
44171+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44172
44173 __module_get(THIS_MODULE);
44174
44175@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44176 mutex_init(&serio->drv_mutex);
44177 device_initialize(&serio->dev);
44178 dev_set_name(&serio->dev, "serio%lu",
44179- (unsigned long)atomic_inc_return(&serio_no));
44180+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44181 serio->dev.bus = &serio_bus;
44182 serio->dev.release = serio_release_port;
44183 serio->dev.groups = serio_device_attr_groups;
44184diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44185index 71ef5d6..93380a9 100644
44186--- a/drivers/input/serio/serio_raw.c
44187+++ b/drivers/input/serio/serio_raw.c
44188@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44189
44190 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44191 {
44192- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44193+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44194 struct serio_raw *serio_raw;
44195 int err;
44196
44197@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44198 }
44199
44200 snprintf(serio_raw->name, sizeof(serio_raw->name),
44201- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44202+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44203 kref_init(&serio_raw->kref);
44204 INIT_LIST_HEAD(&serio_raw->client_list);
44205 init_waitqueue_head(&serio_raw->wait);
44206diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44207index 92e2243..8fd9092 100644
44208--- a/drivers/input/touchscreen/htcpen.c
44209+++ b/drivers/input/touchscreen/htcpen.c
44210@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44211 }
44212 };
44213
44214-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44215+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44216 {
44217 .ident = "Shift",
44218 .matches = {
44219diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44220index 48882c1..93e0987 100644
44221--- a/drivers/iommu/amd_iommu.c
44222+++ b/drivers/iommu/amd_iommu.c
44223@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44224
44225 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44226 {
44227+ phys_addr_t physaddr;
44228 WARN_ON(address & 0x7ULL);
44229
44230 memset(cmd, 0, sizeof(*cmd));
44231- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44232- cmd->data[1] = upper_32_bits(__pa(address));
44233+
44234+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44235+ if (object_starts_on_stack((void *)address)) {
44236+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44237+ physaddr = __pa((u64)adjbuf);
44238+ } else
44239+#endif
44240+ physaddr = __pa(address);
44241+
44242+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44243+ cmd->data[1] = upper_32_bits(physaddr);
44244 cmd->data[2] = 1;
44245 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44246 }
44247diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44248index bd6252b..0716605 100644
44249--- a/drivers/iommu/arm-smmu.c
44250+++ b/drivers/iommu/arm-smmu.c
44251@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44252
44253 struct arm_smmu_domain {
44254 struct arm_smmu_device *smmu;
44255- struct io_pgtable_ops *pgtbl_ops;
44256+ struct io_pgtable *pgtbl;
44257 spinlock_t pgtbl_lock;
44258 struct arm_smmu_cfg cfg;
44259 enum arm_smmu_domain_stage stage;
44260@@ -807,7 +807,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44261 {
44262 int irq, start, ret = 0;
44263 unsigned long ias, oas;
44264- struct io_pgtable_ops *pgtbl_ops;
44265+ struct io_pgtable *pgtbl;
44266 struct io_pgtable_cfg pgtbl_cfg;
44267 enum io_pgtable_fmt fmt;
44268 struct arm_smmu_domain *smmu_domain = domain->priv;
44269@@ -892,14 +892,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44270 };
44271
44272 smmu_domain->smmu = smmu;
44273- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44274- if (!pgtbl_ops) {
44275+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44276+ if (!pgtbl) {
44277 ret = -ENOMEM;
44278 goto out_clear_smmu;
44279 }
44280
44281 /* Update our support page sizes to reflect the page table format */
44282- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44283+ pax_open_kernel();
44284+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44285+ pax_close_kernel();
44286
44287 /* Initialise the context bank with our page table cfg */
44288 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44289@@ -920,7 +922,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44290 mutex_unlock(&smmu_domain->init_mutex);
44291
44292 /* Publish page table ops for map/unmap */
44293- smmu_domain->pgtbl_ops = pgtbl_ops;
44294+ smmu_domain->pgtbl = pgtbl;
44295 return 0;
44296
44297 out_clear_smmu:
44298@@ -953,8 +955,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44299 free_irq(irq, domain);
44300 }
44301
44302- if (smmu_domain->pgtbl_ops)
44303- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44304+ free_io_pgtable(smmu_domain->pgtbl);
44305
44306 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44307 }
44308@@ -1178,13 +1179,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44309 int ret;
44310 unsigned long flags;
44311 struct arm_smmu_domain *smmu_domain = domain->priv;
44312- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44313+ struct io_pgtable *iop = smmu_domain->pgtbl;
44314
44315- if (!ops)
44316+ if (!iop)
44317 return -ENODEV;
44318
44319 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44320- ret = ops->map(ops, iova, paddr, size, prot);
44321+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44322 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44323 return ret;
44324 }
44325@@ -1195,13 +1196,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44326 size_t ret;
44327 unsigned long flags;
44328 struct arm_smmu_domain *smmu_domain = domain->priv;
44329- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44330+ struct io_pgtable *iop = smmu_domain->pgtbl;
44331
44332- if (!ops)
44333+ if (!iop)
44334 return 0;
44335
44336 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44337- ret = ops->unmap(ops, iova, size);
44338+ ret = iop->ops->unmap(iop, iova, size);
44339 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44340 return ret;
44341 }
44342@@ -1212,7 +1213,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44343 struct arm_smmu_domain *smmu_domain = domain->priv;
44344 struct arm_smmu_device *smmu = smmu_domain->smmu;
44345 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44346- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44347+ struct io_pgtable *iop = smmu_domain->pgtbl;
44348 struct device *dev = smmu->dev;
44349 void __iomem *cb_base;
44350 u32 tmp;
44351@@ -1235,7 +1236,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44352 dev_err(dev,
44353 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44354 &iova);
44355- return ops->iova_to_phys(ops, iova);
44356+ return iop->ops->iova_to_phys(iop, iova);
44357 }
44358
44359 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44360@@ -1256,9 +1257,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44361 phys_addr_t ret;
44362 unsigned long flags;
44363 struct arm_smmu_domain *smmu_domain = domain->priv;
44364- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44365+ struct io_pgtable *iop = smmu_domain->pgtbl;
44366
44367- if (!ops)
44368+ if (!iop)
44369 return 0;
44370
44371 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44372@@ -1266,7 +1267,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44373 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44374 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44375 } else {
44376- ret = ops->iova_to_phys(ops, iova);
44377+ ret = iop->ops->iova_to_phys(iop, iova);
44378 }
44379
44380 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44381@@ -1625,7 +1626,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44382 size |= SZ_64K | SZ_512M;
44383 }
44384
44385- arm_smmu_ops.pgsize_bitmap &= size;
44386+ pax_open_kernel();
44387+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44388+ pax_close_kernel();
44389 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44390
44391 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44392diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44393index b610a8d..08eb879 100644
44394--- a/drivers/iommu/io-pgtable-arm.c
44395+++ b/drivers/iommu/io-pgtable-arm.c
44396@@ -36,12 +36,6 @@
44397 #define io_pgtable_to_data(x) \
44398 container_of((x), struct arm_lpae_io_pgtable, iop)
44399
44400-#define io_pgtable_ops_to_pgtable(x) \
44401- container_of((x), struct io_pgtable, ops)
44402-
44403-#define io_pgtable_ops_to_data(x) \
44404- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44405-
44406 /*
44407 * For consistency with the architecture, we always consider
44408 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44409@@ -302,10 +296,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44410 return pte;
44411 }
44412
44413-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44414+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44415 phys_addr_t paddr, size_t size, int iommu_prot)
44416 {
44417- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44418+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44419 arm_lpae_iopte *ptep = data->pgd;
44420 int lvl = ARM_LPAE_START_LVL(data);
44421 arm_lpae_iopte prot;
44422@@ -445,12 +439,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44423 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44424 }
44425
44426-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44427+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44428 size_t size)
44429 {
44430 size_t unmapped;
44431- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44432- struct io_pgtable *iop = &data->iop;
44433+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44434 arm_lpae_iopte *ptep = data->pgd;
44435 int lvl = ARM_LPAE_START_LVL(data);
44436
44437@@ -461,10 +454,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44438 return unmapped;
44439 }
44440
44441-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44442+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44443 unsigned long iova)
44444 {
44445- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44446+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44447 arm_lpae_iopte pte, *ptep = data->pgd;
44448 int lvl = ARM_LPAE_START_LVL(data);
44449
44450@@ -531,6 +524,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44451 }
44452 }
44453
44454+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44455+ .map = arm_lpae_map,
44456+ .unmap = arm_lpae_unmap,
44457+ .iova_to_phys = arm_lpae_iova_to_phys,
44458+};
44459+
44460 static struct arm_lpae_io_pgtable *
44461 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44462 {
44463@@ -562,11 +561,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44464 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44465 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44466
44467- data->iop.ops = (struct io_pgtable_ops) {
44468- .map = arm_lpae_map,
44469- .unmap = arm_lpae_unmap,
44470- .iova_to_phys = arm_lpae_iova_to_phys,
44471- };
44472+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44473
44474 return data;
44475 }
44476@@ -825,9 +820,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44477 .flush_pgtable = dummy_flush_pgtable,
44478 };
44479
44480-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44481+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44482 {
44483- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44484+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44485 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44486
44487 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44488@@ -837,9 +832,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44489 data->bits_per_level, data->pgd);
44490 }
44491
44492-#define __FAIL(ops, i) ({ \
44493+#define __FAIL(iop, i) ({ \
44494 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44495- arm_lpae_dump_ops(ops); \
44496+ arm_lpae_dump_ops(iop); \
44497 selftest_running = false; \
44498 -EFAULT; \
44499 })
44500@@ -854,30 +849,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44501 int i, j;
44502 unsigned long iova;
44503 size_t size;
44504- struct io_pgtable_ops *ops;
44505+ struct io_pgtable *iop;
44506+ const struct io_pgtable_ops *ops;
44507
44508 selftest_running = true;
44509
44510 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44511 cfg_cookie = cfg;
44512- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44513- if (!ops) {
44514+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44515+ if (!iop) {
44516 pr_err("selftest: failed to allocate io pgtable ops\n");
44517 return -ENOMEM;
44518 }
44519+ ops = iop->ops;
44520
44521 /*
44522 * Initial sanity checks.
44523 * Empty page tables shouldn't provide any translations.
44524 */
44525- if (ops->iova_to_phys(ops, 42))
44526- return __FAIL(ops, i);
44527+ if (ops->iova_to_phys(iop, 42))
44528+ return __FAIL(iop, i);
44529
44530- if (ops->iova_to_phys(ops, SZ_1G + 42))
44531- return __FAIL(ops, i);
44532+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44533+ return __FAIL(iop, i);
44534
44535- if (ops->iova_to_phys(ops, SZ_2G + 42))
44536- return __FAIL(ops, i);
44537+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44538+ return __FAIL(iop, i);
44539
44540 /*
44541 * Distinct mappings of different granule sizes.
44542@@ -887,19 +884,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44543 while (j != BITS_PER_LONG) {
44544 size = 1UL << j;
44545
44546- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44547+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44548 IOMMU_WRITE |
44549 IOMMU_NOEXEC |
44550 IOMMU_CACHE))
44551- return __FAIL(ops, i);
44552+ return __FAIL(iop, i);
44553
44554 /* Overlapping mappings */
44555- if (!ops->map(ops, iova, iova + size, size,
44556+ if (!ops->map(iop, iova, iova + size, size,
44557 IOMMU_READ | IOMMU_NOEXEC))
44558- return __FAIL(ops, i);
44559+ return __FAIL(iop, i);
44560
44561- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44562- return __FAIL(ops, i);
44563+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44564+ return __FAIL(iop, i);
44565
44566 iova += SZ_1G;
44567 j++;
44568@@ -908,15 +905,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44569
44570 /* Partial unmap */
44571 size = 1UL << __ffs(cfg->pgsize_bitmap);
44572- if (ops->unmap(ops, SZ_1G + size, size) != size)
44573- return __FAIL(ops, i);
44574+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44575+ return __FAIL(iop, i);
44576
44577 /* Remap of partial unmap */
44578- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44579- return __FAIL(ops, i);
44580+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44581+ return __FAIL(iop, i);
44582
44583- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44584- return __FAIL(ops, i);
44585+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44586+ return __FAIL(iop, i);
44587
44588 /* Full unmap */
44589 iova = 0;
44590@@ -924,25 +921,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44591 while (j != BITS_PER_LONG) {
44592 size = 1UL << j;
44593
44594- if (ops->unmap(ops, iova, size) != size)
44595- return __FAIL(ops, i);
44596+ if (ops->unmap(iop, iova, size) != size)
44597+ return __FAIL(iop, i);
44598
44599- if (ops->iova_to_phys(ops, iova + 42))
44600- return __FAIL(ops, i);
44601+ if (ops->iova_to_phys(iop, iova + 42))
44602+ return __FAIL(iop, i);
44603
44604 /* Remap full block */
44605- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44606- return __FAIL(ops, i);
44607+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44608+ return __FAIL(iop, i);
44609
44610- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44611- return __FAIL(ops, i);
44612+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44613+ return __FAIL(iop, i);
44614
44615 iova += SZ_1G;
44616 j++;
44617 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44618 }
44619
44620- free_io_pgtable_ops(ops);
44621+ free_io_pgtable(iop);
44622 }
44623
44624 selftest_running = false;
44625diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44626index 6436fe2..088c965 100644
44627--- a/drivers/iommu/io-pgtable.c
44628+++ b/drivers/iommu/io-pgtable.c
44629@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44630 #endif
44631 };
44632
44633-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44634+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44635 struct io_pgtable_cfg *cfg,
44636 void *cookie)
44637 {
44638@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44639 iop->cookie = cookie;
44640 iop->cfg = *cfg;
44641
44642- return &iop->ops;
44643+ return iop;
44644 }
44645
44646 /*
44647 * It is the IOMMU driver's responsibility to ensure that the page table
44648 * is no longer accessible to the walker by this point.
44649 */
44650-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44651+void free_io_pgtable(struct io_pgtable *iop)
44652 {
44653- struct io_pgtable *iop;
44654-
44655- if (!ops)
44656+ if (!iop)
44657 return;
44658
44659- iop = container_of(ops, struct io_pgtable, ops);
44660 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44661 io_pgtable_init_table[iop->fmt]->free(iop);
44662 }
44663diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44664index 10e32f6..0b276c8 100644
44665--- a/drivers/iommu/io-pgtable.h
44666+++ b/drivers/iommu/io-pgtable.h
44667@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44668 * These functions map directly onto the iommu_ops member functions with
44669 * the same names.
44670 */
44671+struct io_pgtable;
44672 struct io_pgtable_ops {
44673- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44674+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44675 phys_addr_t paddr, size_t size, int prot);
44676- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44677+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44678 size_t size);
44679- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44680+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44681 unsigned long iova);
44682 };
44683
44684 /**
44685- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44686+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44687 *
44688 * @fmt: The page table format.
44689 * @cfg: The page table configuration. This will be modified to represent
44690@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44691 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44692 * the callback routines in cfg->tlb.
44693 */
44694-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44695- struct io_pgtable_cfg *cfg,
44696- void *cookie);
44697+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44698+ struct io_pgtable_cfg *cfg,
44699+ void *cookie);
44700
44701 /**
44702 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44703@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44704 *
44705 * @ops: The ops returned from alloc_io_pgtable_ops.
44706 */
44707-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44708+void free_io_pgtable(struct io_pgtable *iop);
44709
44710
44711 /*
44712@@ -125,7 +126,7 @@ struct io_pgtable {
44713 enum io_pgtable_fmt fmt;
44714 void *cookie;
44715 struct io_pgtable_cfg cfg;
44716- struct io_pgtable_ops ops;
44717+ const struct io_pgtable_ops *ops;
44718 };
44719
44720 /**
44721diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44722index 72e683d..c9db262 100644
44723--- a/drivers/iommu/iommu.c
44724+++ b/drivers/iommu/iommu.c
44725@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44726 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44727 {
44728 int err;
44729- struct notifier_block *nb;
44730+ notifier_block_no_const *nb;
44731 struct iommu_callback_data cb = {
44732 .ops = ops,
44733 };
44734diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44735index bc39bdf..e2de272 100644
44736--- a/drivers/iommu/ipmmu-vmsa.c
44737+++ b/drivers/iommu/ipmmu-vmsa.c
44738@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44739 struct iommu_domain *io_domain;
44740
44741 struct io_pgtable_cfg cfg;
44742- struct io_pgtable_ops *iop;
44743+ struct io_pgtable *iop;
44744
44745 unsigned int context_id;
44746 spinlock_t lock; /* Protects mappings */
44747@@ -323,8 +323,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44748 domain->cfg.oas = 40;
44749 domain->cfg.tlb = &ipmmu_gather_ops;
44750
44751- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44752- domain);
44753+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44754 if (!domain->iop)
44755 return -EINVAL;
44756
44757@@ -482,7 +481,7 @@ static void ipmmu_domain_destroy(struct iommu_domain *io_domain)
44758 * been detached.
44759 */
44760 ipmmu_domain_destroy_context(domain);
44761- free_io_pgtable_ops(domain->iop);
44762+ free_io_pgtable(domain->iop);
44763 kfree(domain);
44764 }
44765
44766@@ -551,7 +550,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44767 if (!domain)
44768 return -ENODEV;
44769
44770- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44771+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44772 }
44773
44774 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44775@@ -559,7 +558,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44776 {
44777 struct ipmmu_vmsa_domain *domain = io_domain->priv;
44778
44779- return domain->iop->unmap(domain->iop, iova, size);
44780+ return domain->iop->ops->unmap(domain->iop, iova, size);
44781 }
44782
44783 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44784@@ -569,7 +568,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44785
44786 /* TODO: Is locking needed ? */
44787
44788- return domain->iop->iova_to_phys(domain->iop, iova);
44789+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44790 }
44791
44792 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44793diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44794index 390079e..1da9d6c 100644
44795--- a/drivers/iommu/irq_remapping.c
44796+++ b/drivers/iommu/irq_remapping.c
44797@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44798 void panic_if_irq_remap(const char *msg)
44799 {
44800 if (irq_remapping_enabled)
44801- panic(msg);
44802+ panic("%s", msg);
44803 }
44804
44805 static void ir_ack_apic_edge(struct irq_data *data)
44806@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44807
44808 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44809 {
44810- chip->irq_print_chip = ir_print_prefix;
44811- chip->irq_ack = ir_ack_apic_edge;
44812- chip->irq_eoi = ir_ack_apic_level;
44813- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44814+ pax_open_kernel();
44815+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44816+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44817+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44818+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44819+ pax_close_kernel();
44820 }
44821
44822 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44823diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44824index 471e1cd..b53b870 100644
44825--- a/drivers/irqchip/irq-gic.c
44826+++ b/drivers/irqchip/irq-gic.c
44827@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
44828 * Supported arch specific GIC irq extension.
44829 * Default make them NULL.
44830 */
44831-struct irq_chip gic_arch_extn = {
44832+irq_chip_no_const gic_arch_extn = {
44833 .irq_eoi = NULL,
44834 .irq_mask = NULL,
44835 .irq_unmask = NULL,
44836@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44837 chained_irq_exit(chip, desc);
44838 }
44839
44840-static struct irq_chip gic_chip = {
44841+static irq_chip_no_const gic_chip __read_only = {
44842 .name = "GIC",
44843 .irq_mask = gic_mask_irq,
44844 .irq_unmask = gic_unmask_irq,
44845diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44846index 9a0767b..5e5f86f 100644
44847--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44848+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44849@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44850 struct intc_irqpin_iomem *i;
44851 struct resource *io[INTC_IRQPIN_REG_NR];
44852 struct resource *irq;
44853- struct irq_chip *irq_chip;
44854+ irq_chip_no_const *irq_chip;
44855 void (*enable_fn)(struct irq_data *d);
44856 void (*disable_fn)(struct irq_data *d);
44857 const char *name = dev_name(dev);
44858diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44859index 384e6ed..7a771b2 100644
44860--- a/drivers/irqchip/irq-renesas-irqc.c
44861+++ b/drivers/irqchip/irq-renesas-irqc.c
44862@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
44863 struct irqc_priv *p;
44864 struct resource *io;
44865 struct resource *irq;
44866- struct irq_chip *irq_chip;
44867+ irq_chip_no_const *irq_chip;
44868 const char *name = dev_name(&pdev->dev);
44869 int ret;
44870 int k;
44871diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44872index 6a2df32..dc962f1 100644
44873--- a/drivers/isdn/capi/capi.c
44874+++ b/drivers/isdn/capi/capi.c
44875@@ -81,8 +81,8 @@ struct capiminor {
44876
44877 struct capi20_appl *ap;
44878 u32 ncci;
44879- atomic_t datahandle;
44880- atomic_t msgid;
44881+ atomic_unchecked_t datahandle;
44882+ atomic_unchecked_t msgid;
44883
44884 struct tty_port port;
44885 int ttyinstop;
44886@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44887 capimsg_setu16(s, 2, mp->ap->applid);
44888 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44889 capimsg_setu8 (s, 5, CAPI_RESP);
44890- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44891+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44892 capimsg_setu32(s, 8, mp->ncci);
44893 capimsg_setu16(s, 12, datahandle);
44894 }
44895@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44896 mp->outbytes -= len;
44897 spin_unlock_bh(&mp->outlock);
44898
44899- datahandle = atomic_inc_return(&mp->datahandle);
44900+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44901 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44902 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44903 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44904 capimsg_setu16(skb->data, 2, mp->ap->applid);
44905 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44906 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44907- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44908+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44909 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44910 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44911 capimsg_setu16(skb->data, 16, len); /* Data length */
44912diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44913index aecec6d..11e13c5 100644
44914--- a/drivers/isdn/gigaset/bas-gigaset.c
44915+++ b/drivers/isdn/gigaset/bas-gigaset.c
44916@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44917
44918
44919 static const struct gigaset_ops gigops = {
44920- gigaset_write_cmd,
44921- gigaset_write_room,
44922- gigaset_chars_in_buffer,
44923- gigaset_brkchars,
44924- gigaset_init_bchannel,
44925- gigaset_close_bchannel,
44926- gigaset_initbcshw,
44927- gigaset_freebcshw,
44928- gigaset_reinitbcshw,
44929- gigaset_initcshw,
44930- gigaset_freecshw,
44931- gigaset_set_modem_ctrl,
44932- gigaset_baud_rate,
44933- gigaset_set_line_ctrl,
44934- gigaset_isoc_send_skb,
44935- gigaset_isoc_input,
44936+ .write_cmd = gigaset_write_cmd,
44937+ .write_room = gigaset_write_room,
44938+ .chars_in_buffer = gigaset_chars_in_buffer,
44939+ .brkchars = gigaset_brkchars,
44940+ .init_bchannel = gigaset_init_bchannel,
44941+ .close_bchannel = gigaset_close_bchannel,
44942+ .initbcshw = gigaset_initbcshw,
44943+ .freebcshw = gigaset_freebcshw,
44944+ .reinitbcshw = gigaset_reinitbcshw,
44945+ .initcshw = gigaset_initcshw,
44946+ .freecshw = gigaset_freecshw,
44947+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44948+ .baud_rate = gigaset_baud_rate,
44949+ .set_line_ctrl = gigaset_set_line_ctrl,
44950+ .send_skb = gigaset_isoc_send_skb,
44951+ .handle_input = gigaset_isoc_input,
44952 };
44953
44954 /* bas_gigaset_init
44955diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44956index 600c79b..3752bab 100644
44957--- a/drivers/isdn/gigaset/interface.c
44958+++ b/drivers/isdn/gigaset/interface.c
44959@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44960 }
44961 tty->driver_data = cs;
44962
44963- ++cs->port.count;
44964+ atomic_inc(&cs->port.count);
44965
44966- if (cs->port.count == 1) {
44967+ if (atomic_read(&cs->port.count) == 1) {
44968 tty_port_tty_set(&cs->port, tty);
44969 cs->port.low_latency = 1;
44970 }
44971@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44972
44973 if (!cs->connected)
44974 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44975- else if (!cs->port.count)
44976+ else if (!atomic_read(&cs->port.count))
44977 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44978- else if (!--cs->port.count)
44979+ else if (!atomic_dec_return(&cs->port.count))
44980 tty_port_tty_set(&cs->port, NULL);
44981
44982 mutex_unlock(&cs->mutex);
44983diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44984index 8c91fd5..14f13ce 100644
44985--- a/drivers/isdn/gigaset/ser-gigaset.c
44986+++ b/drivers/isdn/gigaset/ser-gigaset.c
44987@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44988 }
44989
44990 static const struct gigaset_ops ops = {
44991- gigaset_write_cmd,
44992- gigaset_write_room,
44993- gigaset_chars_in_buffer,
44994- gigaset_brkchars,
44995- gigaset_init_bchannel,
44996- gigaset_close_bchannel,
44997- gigaset_initbcshw,
44998- gigaset_freebcshw,
44999- gigaset_reinitbcshw,
45000- gigaset_initcshw,
45001- gigaset_freecshw,
45002- gigaset_set_modem_ctrl,
45003- gigaset_baud_rate,
45004- gigaset_set_line_ctrl,
45005- gigaset_m10x_send_skb, /* asyncdata.c */
45006- gigaset_m10x_input, /* asyncdata.c */
45007+ .write_cmd = gigaset_write_cmd,
45008+ .write_room = gigaset_write_room,
45009+ .chars_in_buffer = gigaset_chars_in_buffer,
45010+ .brkchars = gigaset_brkchars,
45011+ .init_bchannel = gigaset_init_bchannel,
45012+ .close_bchannel = gigaset_close_bchannel,
45013+ .initbcshw = gigaset_initbcshw,
45014+ .freebcshw = gigaset_freebcshw,
45015+ .reinitbcshw = gigaset_reinitbcshw,
45016+ .initcshw = gigaset_initcshw,
45017+ .freecshw = gigaset_freecshw,
45018+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45019+ .baud_rate = gigaset_baud_rate,
45020+ .set_line_ctrl = gigaset_set_line_ctrl,
45021+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45022+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45023 };
45024
45025
45026diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45027index 5f306e2..5342f88 100644
45028--- a/drivers/isdn/gigaset/usb-gigaset.c
45029+++ b/drivers/isdn/gigaset/usb-gigaset.c
45030@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45031 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45032 memcpy(cs->hw.usb->bchars, buf, 6);
45033 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45034- 0, 0, &buf, 6, 2000);
45035+ 0, 0, buf, 6, 2000);
45036 }
45037
45038 static void gigaset_freebcshw(struct bc_state *bcs)
45039@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45040 }
45041
45042 static const struct gigaset_ops ops = {
45043- gigaset_write_cmd,
45044- gigaset_write_room,
45045- gigaset_chars_in_buffer,
45046- gigaset_brkchars,
45047- gigaset_init_bchannel,
45048- gigaset_close_bchannel,
45049- gigaset_initbcshw,
45050- gigaset_freebcshw,
45051- gigaset_reinitbcshw,
45052- gigaset_initcshw,
45053- gigaset_freecshw,
45054- gigaset_set_modem_ctrl,
45055- gigaset_baud_rate,
45056- gigaset_set_line_ctrl,
45057- gigaset_m10x_send_skb,
45058- gigaset_m10x_input,
45059+ .write_cmd = gigaset_write_cmd,
45060+ .write_room = gigaset_write_room,
45061+ .chars_in_buffer = gigaset_chars_in_buffer,
45062+ .brkchars = gigaset_brkchars,
45063+ .init_bchannel = gigaset_init_bchannel,
45064+ .close_bchannel = gigaset_close_bchannel,
45065+ .initbcshw = gigaset_initbcshw,
45066+ .freebcshw = gigaset_freebcshw,
45067+ .reinitbcshw = gigaset_reinitbcshw,
45068+ .initcshw = gigaset_initcshw,
45069+ .freecshw = gigaset_freecshw,
45070+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45071+ .baud_rate = gigaset_baud_rate,
45072+ .set_line_ctrl = gigaset_set_line_ctrl,
45073+ .send_skb = gigaset_m10x_send_skb,
45074+ .handle_input = gigaset_m10x_input,
45075 };
45076
45077 /*
45078diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45079index 4d9b195..455075c 100644
45080--- a/drivers/isdn/hardware/avm/b1.c
45081+++ b/drivers/isdn/hardware/avm/b1.c
45082@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45083 }
45084 if (left) {
45085 if (t4file->user) {
45086- if (copy_from_user(buf, dp, left))
45087+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45088 return -EFAULT;
45089 } else {
45090 memcpy(buf, dp, left);
45091@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45092 }
45093 if (left) {
45094 if (config->user) {
45095- if (copy_from_user(buf, dp, left))
45096+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45097 return -EFAULT;
45098 } else {
45099 memcpy(buf, dp, left);
45100diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45101index 9b856e1..fa03c92 100644
45102--- a/drivers/isdn/i4l/isdn_common.c
45103+++ b/drivers/isdn/i4l/isdn_common.c
45104@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45105 } else
45106 return -EINVAL;
45107 case IIOCDBGVAR:
45108+ if (!capable(CAP_SYS_RAWIO))
45109+ return -EPERM;
45110 if (arg) {
45111 if (copy_to_user(argp, &dev, sizeof(ulong)))
45112 return -EFAULT;
45113diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45114index 91d5730..336523e 100644
45115--- a/drivers/isdn/i4l/isdn_concap.c
45116+++ b/drivers/isdn/i4l/isdn_concap.c
45117@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45118 }
45119
45120 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45121- &isdn_concap_dl_data_req,
45122- &isdn_concap_dl_connect_req,
45123- &isdn_concap_dl_disconn_req
45124+ .data_req = &isdn_concap_dl_data_req,
45125+ .connect_req = &isdn_concap_dl_connect_req,
45126+ .disconn_req = &isdn_concap_dl_disconn_req
45127 };
45128
45129 /* The following should better go into a dedicated source file such that
45130diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45131index bc91261..2ef7e36 100644
45132--- a/drivers/isdn/i4l/isdn_tty.c
45133+++ b/drivers/isdn/i4l/isdn_tty.c
45134@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45135
45136 #ifdef ISDN_DEBUG_MODEM_OPEN
45137 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45138- port->count);
45139+ atomic_read(&port->count));
45140 #endif
45141- port->count++;
45142+ atomic_inc(&port->count);
45143 port->tty = tty;
45144 /*
45145 * Start up serial port
45146@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45147 #endif
45148 return;
45149 }
45150- if ((tty->count == 1) && (port->count != 1)) {
45151+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45152 /*
45153 * Uh, oh. tty->count is 1, which means that the tty
45154 * structure will be freed. Info->count should always
45155@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45156 * serial port won't be shutdown.
45157 */
45158 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45159- "info->count is %d\n", port->count);
45160- port->count = 1;
45161+ "info->count is %d\n", atomic_read(&port->count));
45162+ atomic_set(&port->count, 1);
45163 }
45164- if (--port->count < 0) {
45165+ if (atomic_dec_return(&port->count) < 0) {
45166 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45167- info->line, port->count);
45168- port->count = 0;
45169+ info->line, atomic_read(&port->count));
45170+ atomic_set(&port->count, 0);
45171 }
45172- if (port->count) {
45173+ if (atomic_read(&port->count)) {
45174 #ifdef ISDN_DEBUG_MODEM_OPEN
45175 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45176 #endif
45177@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45178 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45179 return;
45180 isdn_tty_shutdown(info);
45181- port->count = 0;
45182+ atomic_set(&port->count, 0);
45183 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45184 port->tty = NULL;
45185 wake_up_interruptible(&port->open_wait);
45186@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45187 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45188 modem_info *info = &dev->mdm.info[i];
45189
45190- if (info->port.count == 0)
45191+ if (atomic_read(&info->port.count) == 0)
45192 continue;
45193 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45194 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45195diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45196index e2d4e58..40cd045 100644
45197--- a/drivers/isdn/i4l/isdn_x25iface.c
45198+++ b/drivers/isdn/i4l/isdn_x25iface.c
45199@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45200
45201
45202 static struct concap_proto_ops ix25_pops = {
45203- &isdn_x25iface_proto_new,
45204- &isdn_x25iface_proto_del,
45205- &isdn_x25iface_proto_restart,
45206- &isdn_x25iface_proto_close,
45207- &isdn_x25iface_xmit,
45208- &isdn_x25iface_receive,
45209- &isdn_x25iface_connect_ind,
45210- &isdn_x25iface_disconn_ind
45211+ .proto_new = &isdn_x25iface_proto_new,
45212+ .proto_del = &isdn_x25iface_proto_del,
45213+ .restart = &isdn_x25iface_proto_restart,
45214+ .close = &isdn_x25iface_proto_close,
45215+ .encap_and_xmit = &isdn_x25iface_xmit,
45216+ .data_ind = &isdn_x25iface_receive,
45217+ .connect_ind = &isdn_x25iface_connect_ind,
45218+ .disconn_ind = &isdn_x25iface_disconn_ind
45219 };
45220
45221 /* error message helper function */
45222diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45223index 358a574..b4987ea 100644
45224--- a/drivers/isdn/icn/icn.c
45225+++ b/drivers/isdn/icn/icn.c
45226@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45227 if (count > len)
45228 count = len;
45229 if (user) {
45230- if (copy_from_user(msg, buf, count))
45231+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45232 return -EFAULT;
45233 } else
45234 memcpy(msg, buf, count);
45235diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45236index 87f7dff..7300125 100644
45237--- a/drivers/isdn/mISDN/dsp_cmx.c
45238+++ b/drivers/isdn/mISDN/dsp_cmx.c
45239@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45240 static u16 dsp_count; /* last sample count */
45241 static int dsp_count_valid; /* if we have last sample count */
45242
45243-void
45244+void __intentional_overflow(-1)
45245 dsp_cmx_send(void *arg)
45246 {
45247 struct dsp_conf *conf;
45248diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45249index 312ffd3..9263d05 100644
45250--- a/drivers/lguest/core.c
45251+++ b/drivers/lguest/core.c
45252@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45253 * The end address needs +1 because __get_vm_area allocates an
45254 * extra guard page, so we need space for that.
45255 */
45256+
45257+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45258+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45259+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45260+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45261+#else
45262 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45263 VM_ALLOC, switcher_addr, switcher_addr
45264 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45265+#endif
45266+
45267 if (!switcher_vma) {
45268 err = -ENOMEM;
45269 printk("lguest: could not map switcher pages high\n");
45270@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45271 * Now the Switcher is mapped at the right address, we can't fail!
45272 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45273 */
45274- memcpy(switcher_vma->addr, start_switcher_text,
45275+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45276 end_switcher_text - start_switcher_text);
45277
45278 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45279diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45280index e3abebc9..6a35328 100644
45281--- a/drivers/lguest/page_tables.c
45282+++ b/drivers/lguest/page_tables.c
45283@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45284 /*:*/
45285
45286 #ifdef CONFIG_X86_PAE
45287-static void release_pmd(pmd_t *spmd)
45288+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45289 {
45290 /* If the entry's not present, there's nothing to release. */
45291 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45292diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45293index 30f2aef..391c748 100644
45294--- a/drivers/lguest/x86/core.c
45295+++ b/drivers/lguest/x86/core.c
45296@@ -60,7 +60,7 @@ static struct {
45297 /* Offset from where switcher.S was compiled to where we've copied it */
45298 static unsigned long switcher_offset(void)
45299 {
45300- return switcher_addr - (unsigned long)start_switcher_text;
45301+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45302 }
45303
45304 /* This cpu's struct lguest_pages (after the Switcher text page) */
45305@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45306 * These copies are pretty cheap, so we do them unconditionally: */
45307 /* Save the current Host top-level page directory.
45308 */
45309+
45310+#ifdef CONFIG_PAX_PER_CPU_PGD
45311+ pages->state.host_cr3 = read_cr3();
45312+#else
45313 pages->state.host_cr3 = __pa(current->mm->pgd);
45314+#endif
45315+
45316 /*
45317 * Set up the Guest's page tables to see this CPU's pages (and no
45318 * other CPU's pages).
45319@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45320 * compiled-in switcher code and the high-mapped copy we just made.
45321 */
45322 for (i = 0; i < IDT_ENTRIES; i++)
45323- default_idt_entries[i] += switcher_offset();
45324+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45325
45326 /*
45327 * Set up the Switcher's per-cpu areas.
45328@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45329 * it will be undisturbed when we switch. To change %cs and jump we
45330 * need this structure to feed to Intel's "lcall" instruction.
45331 */
45332- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45333+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45334 lguest_entry.segment = LGUEST_CS;
45335
45336 /*
45337diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45338index 40634b0..4f5855e 100644
45339--- a/drivers/lguest/x86/switcher_32.S
45340+++ b/drivers/lguest/x86/switcher_32.S
45341@@ -87,6 +87,7 @@
45342 #include <asm/page.h>
45343 #include <asm/segment.h>
45344 #include <asm/lguest.h>
45345+#include <asm/processor-flags.h>
45346
45347 // We mark the start of the code to copy
45348 // It's placed in .text tho it's never run here
45349@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45350 // Changes type when we load it: damn Intel!
45351 // For after we switch over our page tables
45352 // That entry will be read-only: we'd crash.
45353+
45354+#ifdef CONFIG_PAX_KERNEXEC
45355+ mov %cr0, %edx
45356+ xor $X86_CR0_WP, %edx
45357+ mov %edx, %cr0
45358+#endif
45359+
45360 movl $(GDT_ENTRY_TSS*8), %edx
45361 ltr %dx
45362
45363@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45364 // Let's clear it again for our return.
45365 // The GDT descriptor of the Host
45366 // Points to the table after two "size" bytes
45367- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45368+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45369 // Clear "used" from type field (byte 5, bit 2)
45370- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45371+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45372+
45373+#ifdef CONFIG_PAX_KERNEXEC
45374+ mov %cr0, %eax
45375+ xor $X86_CR0_WP, %eax
45376+ mov %eax, %cr0
45377+#endif
45378
45379 // Once our page table's switched, the Guest is live!
45380 // The Host fades as we run this final step.
45381@@ -295,13 +309,12 @@ deliver_to_host:
45382 // I consulted gcc, and it gave
45383 // These instructions, which I gladly credit:
45384 leal (%edx,%ebx,8), %eax
45385- movzwl (%eax),%edx
45386- movl 4(%eax), %eax
45387- xorw %ax, %ax
45388- orl %eax, %edx
45389+ movl 4(%eax), %edx
45390+ movw (%eax), %dx
45391 // Now the address of the handler's in %edx
45392 // We call it now: its "iret" drops us home.
45393- jmp *%edx
45394+ ljmp $__KERNEL_CS, $1f
45395+1: jmp *%edx
45396
45397 // Every interrupt can come to us here
45398 // But we must truly tell each apart.
45399diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45400index a08e3ee..df8ade2 100644
45401--- a/drivers/md/bcache/closure.h
45402+++ b/drivers/md/bcache/closure.h
45403@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45404 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45405 struct workqueue_struct *wq)
45406 {
45407- BUG_ON(object_is_on_stack(cl));
45408+ BUG_ON(object_starts_on_stack(cl));
45409 closure_set_ip(cl);
45410 cl->fn = fn;
45411 cl->wq = wq;
45412diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45413index 3a57679..c58cdaf 100644
45414--- a/drivers/md/bitmap.c
45415+++ b/drivers/md/bitmap.c
45416@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45417 chunk_kb ? "KB" : "B");
45418 if (bitmap->storage.file) {
45419 seq_printf(seq, ", file: ");
45420- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45421+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45422 }
45423
45424 seq_printf(seq, "\n");
45425diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45426index c8a18e4..0ab43e5 100644
45427--- a/drivers/md/dm-ioctl.c
45428+++ b/drivers/md/dm-ioctl.c
45429@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45430 cmd == DM_LIST_VERSIONS_CMD)
45431 return 0;
45432
45433- if ((cmd == DM_DEV_CREATE_CMD)) {
45434+ if (cmd == DM_DEV_CREATE_CMD) {
45435 if (!*param->name) {
45436 DMWARN("name not supplied when creating device");
45437 return -EINVAL;
45438diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45439index 089d627..ef7352e 100644
45440--- a/drivers/md/dm-raid1.c
45441+++ b/drivers/md/dm-raid1.c
45442@@ -40,7 +40,7 @@ enum dm_raid1_error {
45443
45444 struct mirror {
45445 struct mirror_set *ms;
45446- atomic_t error_count;
45447+ atomic_unchecked_t error_count;
45448 unsigned long error_type;
45449 struct dm_dev *dev;
45450 sector_t offset;
45451@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45452 struct mirror *m;
45453
45454 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45455- if (!atomic_read(&m->error_count))
45456+ if (!atomic_read_unchecked(&m->error_count))
45457 return m;
45458
45459 return NULL;
45460@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45461 * simple way to tell if a device has encountered
45462 * errors.
45463 */
45464- atomic_inc(&m->error_count);
45465+ atomic_inc_unchecked(&m->error_count);
45466
45467 if (test_and_set_bit(error_type, &m->error_type))
45468 return;
45469@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45470 struct mirror *m = get_default_mirror(ms);
45471
45472 do {
45473- if (likely(!atomic_read(&m->error_count)))
45474+ if (likely(!atomic_read_unchecked(&m->error_count)))
45475 return m;
45476
45477 if (m-- == ms->mirror)
45478@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45479 {
45480 struct mirror *default_mirror = get_default_mirror(m->ms);
45481
45482- return !atomic_read(&default_mirror->error_count);
45483+ return !atomic_read_unchecked(&default_mirror->error_count);
45484 }
45485
45486 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45487@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45488 */
45489 if (likely(region_in_sync(ms, region, 1)))
45490 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45491- else if (m && atomic_read(&m->error_count))
45492+ else if (m && atomic_read_unchecked(&m->error_count))
45493 m = NULL;
45494
45495 if (likely(m))
45496@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45497 }
45498
45499 ms->mirror[mirror].ms = ms;
45500- atomic_set(&(ms->mirror[mirror].error_count), 0);
45501+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45502 ms->mirror[mirror].error_type = 0;
45503 ms->mirror[mirror].offset = offset;
45504
45505@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45506 */
45507 static char device_status_char(struct mirror *m)
45508 {
45509- if (!atomic_read(&(m->error_count)))
45510+ if (!atomic_read_unchecked(&(m->error_count)))
45511 return 'A';
45512
45513 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45514diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45515index f478a4c..4b8e5ef 100644
45516--- a/drivers/md/dm-stats.c
45517+++ b/drivers/md/dm-stats.c
45518@@ -382,7 +382,7 @@ do_sync_free:
45519 synchronize_rcu_expedited();
45520 dm_stat_free(&s->rcu_head);
45521 } else {
45522- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45523+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45524 call_rcu(&s->rcu_head, dm_stat_free);
45525 }
45526 return 0;
45527@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45528 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45529 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45530 ));
45531- ACCESS_ONCE(last->last_sector) = end_sector;
45532- ACCESS_ONCE(last->last_rw) = bi_rw;
45533+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45534+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45535 }
45536
45537 rcu_read_lock();
45538diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45539index f8b37d4..5c5cafd 100644
45540--- a/drivers/md/dm-stripe.c
45541+++ b/drivers/md/dm-stripe.c
45542@@ -21,7 +21,7 @@ struct stripe {
45543 struct dm_dev *dev;
45544 sector_t physical_start;
45545
45546- atomic_t error_count;
45547+ atomic_unchecked_t error_count;
45548 };
45549
45550 struct stripe_c {
45551@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45552 kfree(sc);
45553 return r;
45554 }
45555- atomic_set(&(sc->stripe[i].error_count), 0);
45556+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45557 }
45558
45559 ti->private = sc;
45560@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45561 DMEMIT("%d ", sc->stripes);
45562 for (i = 0; i < sc->stripes; i++) {
45563 DMEMIT("%s ", sc->stripe[i].dev->name);
45564- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45565+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45566 'D' : 'A';
45567 }
45568 buffer[i] = '\0';
45569@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45570 */
45571 for (i = 0; i < sc->stripes; i++)
45572 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45573- atomic_inc(&(sc->stripe[i].error_count));
45574- if (atomic_read(&(sc->stripe[i].error_count)) <
45575+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45576+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45577 DM_IO_ERROR_THRESHOLD)
45578 schedule_work(&sc->trigger_event);
45579 }
45580diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45581index 757f1ba..bf9ec8f 100644
45582--- a/drivers/md/dm-table.c
45583+++ b/drivers/md/dm-table.c
45584@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45585 if (!dev_size)
45586 return 0;
45587
45588- if ((start >= dev_size) || (start + len > dev_size)) {
45589+ if ((start >= dev_size) || (len > dev_size - start)) {
45590 DMWARN("%s: %s too small for target: "
45591 "start=%llu, len=%llu, dev_size=%llu",
45592 dm_device_name(ti->table->md), bdevname(bdev, b),
45593diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45594index 79f6941..b33b4e0 100644
45595--- a/drivers/md/dm-thin-metadata.c
45596+++ b/drivers/md/dm-thin-metadata.c
45597@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45598 {
45599 pmd->info.tm = pmd->tm;
45600 pmd->info.levels = 2;
45601- pmd->info.value_type.context = pmd->data_sm;
45602+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45603 pmd->info.value_type.size = sizeof(__le64);
45604 pmd->info.value_type.inc = data_block_inc;
45605 pmd->info.value_type.dec = data_block_dec;
45606@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45607
45608 pmd->bl_info.tm = pmd->tm;
45609 pmd->bl_info.levels = 1;
45610- pmd->bl_info.value_type.context = pmd->data_sm;
45611+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45612 pmd->bl_info.value_type.size = sizeof(__le64);
45613 pmd->bl_info.value_type.inc = data_block_inc;
45614 pmd->bl_info.value_type.dec = data_block_dec;
45615diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45616index 9b4e30a..83c927d 100644
45617--- a/drivers/md/dm.c
45618+++ b/drivers/md/dm.c
45619@@ -188,9 +188,9 @@ struct mapped_device {
45620 /*
45621 * Event handling.
45622 */
45623- atomic_t event_nr;
45624+ atomic_unchecked_t event_nr;
45625 wait_queue_head_t eventq;
45626- atomic_t uevent_seq;
45627+ atomic_unchecked_t uevent_seq;
45628 struct list_head uevent_list;
45629 spinlock_t uevent_lock; /* Protect access to uevent_list */
45630
45631@@ -2170,8 +2170,8 @@ static struct mapped_device *alloc_dev(int minor)
45632 spin_lock_init(&md->deferred_lock);
45633 atomic_set(&md->holders, 1);
45634 atomic_set(&md->open_count, 0);
45635- atomic_set(&md->event_nr, 0);
45636- atomic_set(&md->uevent_seq, 0);
45637+ atomic_set_unchecked(&md->event_nr, 0);
45638+ atomic_set_unchecked(&md->uevent_seq, 0);
45639 INIT_LIST_HEAD(&md->uevent_list);
45640 INIT_LIST_HEAD(&md->table_devices);
45641 spin_lock_init(&md->uevent_lock);
45642@@ -2336,7 +2336,7 @@ static void event_callback(void *context)
45643
45644 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45645
45646- atomic_inc(&md->event_nr);
45647+ atomic_inc_unchecked(&md->event_nr);
45648 wake_up(&md->eventq);
45649 }
45650
45651@@ -3182,18 +3182,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45652
45653 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45654 {
45655- return atomic_add_return(1, &md->uevent_seq);
45656+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45657 }
45658
45659 uint32_t dm_get_event_nr(struct mapped_device *md)
45660 {
45661- return atomic_read(&md->event_nr);
45662+ return atomic_read_unchecked(&md->event_nr);
45663 }
45664
45665 int dm_wait_event(struct mapped_device *md, int event_nr)
45666 {
45667 return wait_event_interruptible(md->eventq,
45668- (event_nr != atomic_read(&md->event_nr)));
45669+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45670 }
45671
45672 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45673diff --git a/drivers/md/md.c b/drivers/md/md.c
45674index 907534b..8b3554e 100644
45675--- a/drivers/md/md.c
45676+++ b/drivers/md/md.c
45677@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45678 * start build, activate spare
45679 */
45680 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45681-static atomic_t md_event_count;
45682+static atomic_unchecked_t md_event_count;
45683 void md_new_event(struct mddev *mddev)
45684 {
45685- atomic_inc(&md_event_count);
45686+ atomic_inc_unchecked(&md_event_count);
45687 wake_up(&md_event_waiters);
45688 }
45689 EXPORT_SYMBOL_GPL(md_new_event);
45690@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45691 */
45692 static void md_new_event_inintr(struct mddev *mddev)
45693 {
45694- atomic_inc(&md_event_count);
45695+ atomic_inc_unchecked(&md_event_count);
45696 wake_up(&md_event_waiters);
45697 }
45698
45699@@ -1442,7 +1442,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45700 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45701 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45702 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45703- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45704+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45705
45706 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45707 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45708@@ -1693,7 +1693,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45709 else
45710 sb->resync_offset = cpu_to_le64(0);
45711
45712- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45713+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45714
45715 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45716 sb->size = cpu_to_le64(mddev->dev_sectors);
45717@@ -2564,7 +2564,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45718 static ssize_t
45719 errors_show(struct md_rdev *rdev, char *page)
45720 {
45721- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45722+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45723 }
45724
45725 static ssize_t
45726@@ -2573,7 +2573,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45727 char *e;
45728 unsigned long n = simple_strtoul(buf, &e, 10);
45729 if (*buf && (*e == 0 || *e == '\n')) {
45730- atomic_set(&rdev->corrected_errors, n);
45731+ atomic_set_unchecked(&rdev->corrected_errors, n);
45732 return len;
45733 }
45734 return -EINVAL;
45735@@ -3009,8 +3009,8 @@ int md_rdev_init(struct md_rdev *rdev)
45736 rdev->sb_loaded = 0;
45737 rdev->bb_page = NULL;
45738 atomic_set(&rdev->nr_pending, 0);
45739- atomic_set(&rdev->read_errors, 0);
45740- atomic_set(&rdev->corrected_errors, 0);
45741+ atomic_set_unchecked(&rdev->read_errors, 0);
45742+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45743
45744 INIT_LIST_HEAD(&rdev->same_set);
45745 init_waitqueue_head(&rdev->blocked_wait);
45746@@ -7085,7 +7085,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45747
45748 spin_unlock(&pers_lock);
45749 seq_printf(seq, "\n");
45750- seq->poll_event = atomic_read(&md_event_count);
45751+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45752 return 0;
45753 }
45754 if (v == (void*)2) {
45755@@ -7188,7 +7188,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45756 return error;
45757
45758 seq = file->private_data;
45759- seq->poll_event = atomic_read(&md_event_count);
45760+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45761 return error;
45762 }
45763
45764@@ -7205,7 +7205,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45765 /* always allow read */
45766 mask = POLLIN | POLLRDNORM;
45767
45768- if (seq->poll_event != atomic_read(&md_event_count))
45769+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45770 mask |= POLLERR | POLLPRI;
45771 return mask;
45772 }
45773@@ -7252,7 +7252,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45774 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45775 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45776 (int)part_stat_read(&disk->part0, sectors[1]) -
45777- atomic_read(&disk->sync_io);
45778+ atomic_read_unchecked(&disk->sync_io);
45779 /* sync IO will cause sync_io to increase before the disk_stats
45780 * as sync_io is counted when a request starts, and
45781 * disk_stats is counted when it completes.
45782diff --git a/drivers/md/md.h b/drivers/md/md.h
45783index 318ca8f..31e4478 100644
45784--- a/drivers/md/md.h
45785+++ b/drivers/md/md.h
45786@@ -94,13 +94,13 @@ struct md_rdev {
45787 * only maintained for arrays that
45788 * support hot removal
45789 */
45790- atomic_t read_errors; /* number of consecutive read errors that
45791+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45792 * we have tried to ignore.
45793 */
45794 struct timespec last_read_error; /* monotonic time since our
45795 * last read error
45796 */
45797- atomic_t corrected_errors; /* number of corrected read errors,
45798+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45799 * for reporting to userspace and storing
45800 * in superblock.
45801 */
45802@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
45803
45804 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45805 {
45806- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45807+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45808 }
45809
45810 struct md_personality
45811diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45812index e8a9042..35bd145 100644
45813--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45814+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45815@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45816 * Flick into a mode where all blocks get allocated in the new area.
45817 */
45818 smm->begin = old_len;
45819- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45820+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45821
45822 /*
45823 * Extend.
45824@@ -714,7 +714,7 @@ out:
45825 /*
45826 * Switch back to normal behaviour.
45827 */
45828- memcpy(sm, &ops, sizeof(*sm));
45829+ memcpy((void *)sm, &ops, sizeof(*sm));
45830 return r;
45831 }
45832
45833diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45834index 3e6d115..ffecdeb 100644
45835--- a/drivers/md/persistent-data/dm-space-map.h
45836+++ b/drivers/md/persistent-data/dm-space-map.h
45837@@ -71,6 +71,7 @@ struct dm_space_map {
45838 dm_sm_threshold_fn fn,
45839 void *context);
45840 };
45841+typedef struct dm_space_map __no_const dm_space_map_no_const;
45842
45843 /*----------------------------------------------------------------*/
45844
45845diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45846index d34e238..34f8d98 100644
45847--- a/drivers/md/raid1.c
45848+++ b/drivers/md/raid1.c
45849@@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45850 if (r1_sync_page_io(rdev, sect, s,
45851 bio->bi_io_vec[idx].bv_page,
45852 READ) != 0)
45853- atomic_add(s, &rdev->corrected_errors);
45854+ atomic_add_unchecked(s, &rdev->corrected_errors);
45855 }
45856 sectors -= s;
45857 sect += s;
45858@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45859 !test_bit(Faulty, &rdev->flags)) {
45860 if (r1_sync_page_io(rdev, sect, s,
45861 conf->tmppage, READ)) {
45862- atomic_add(s, &rdev->corrected_errors);
45863+ atomic_add_unchecked(s, &rdev->corrected_errors);
45864 printk(KERN_INFO
45865 "md/raid1:%s: read error corrected "
45866 "(%d sectors at %llu on %s)\n",
45867diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45868index a7196c4..439f012 100644
45869--- a/drivers/md/raid10.c
45870+++ b/drivers/md/raid10.c
45871@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45872 /* The write handler will notice the lack of
45873 * R10BIO_Uptodate and record any errors etc
45874 */
45875- atomic_add(r10_bio->sectors,
45876+ atomic_add_unchecked(r10_bio->sectors,
45877 &conf->mirrors[d].rdev->corrected_errors);
45878
45879 /* for reconstruct, we always reschedule after a read.
45880@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45881 {
45882 struct timespec cur_time_mon;
45883 unsigned long hours_since_last;
45884- unsigned int read_errors = atomic_read(&rdev->read_errors);
45885+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45886
45887 ktime_get_ts(&cur_time_mon);
45888
45889@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45890 * overflowing the shift of read_errors by hours_since_last.
45891 */
45892 if (hours_since_last >= 8 * sizeof(read_errors))
45893- atomic_set(&rdev->read_errors, 0);
45894+ atomic_set_unchecked(&rdev->read_errors, 0);
45895 else
45896- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45897+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45898 }
45899
45900 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45901@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45902 return;
45903
45904 check_decay_read_errors(mddev, rdev);
45905- atomic_inc(&rdev->read_errors);
45906- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45907+ atomic_inc_unchecked(&rdev->read_errors);
45908+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45909 char b[BDEVNAME_SIZE];
45910 bdevname(rdev->bdev, b);
45911
45912@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45913 "md/raid10:%s: %s: Raid device exceeded "
45914 "read_error threshold [cur %d:max %d]\n",
45915 mdname(mddev), b,
45916- atomic_read(&rdev->read_errors), max_read_errors);
45917+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45918 printk(KERN_NOTICE
45919 "md/raid10:%s: %s: Failing raid device\n",
45920 mdname(mddev), b);
45921@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45922 sect +
45923 choose_data_offset(r10_bio, rdev)),
45924 bdevname(rdev->bdev, b));
45925- atomic_add(s, &rdev->corrected_errors);
45926+ atomic_add_unchecked(s, &rdev->corrected_errors);
45927 }
45928
45929 rdev_dec_pending(rdev, mddev);
45930diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45931index 007ab86..d11593d 100644
45932--- a/drivers/md/raid5.c
45933+++ b/drivers/md/raid5.c
45934@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45935 struct bio_vec bvl;
45936 struct bvec_iter iter;
45937 struct page *bio_page;
45938- int page_offset;
45939+ s64 page_offset;
45940 struct async_submit_ctl submit;
45941 enum async_tx_flags flags = 0;
45942
45943 if (bio->bi_iter.bi_sector >= sector)
45944- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45945+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45946 else
45947- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45948+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45949
45950 if (frombio)
45951 flags |= ASYNC_TX_FENCE;
45952 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45953
45954 bio_for_each_segment(bvl, bio, iter) {
45955- int len = bvl.bv_len;
45956- int clen;
45957- int b_offset = 0;
45958+ s64 len = bvl.bv_len;
45959+ s64 clen;
45960+ s64 b_offset = 0;
45961
45962 if (page_offset < 0) {
45963 b_offset = -page_offset;
45964@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
45965 return 1;
45966 }
45967
45968+#ifdef CONFIG_GRKERNSEC_HIDESYM
45969+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45970+#endif
45971+
45972 static int grow_stripes(struct r5conf *conf, int num)
45973 {
45974 struct kmem_cache *sc;
45975@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45976 "raid%d-%s", conf->level, mdname(conf->mddev));
45977 else
45978 sprintf(conf->cache_name[0],
45979+#ifdef CONFIG_GRKERNSEC_HIDESYM
45980+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45981+#else
45982 "raid%d-%p", conf->level, conf->mddev);
45983+#endif
45984 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45985
45986 conf->active_name = 0;
45987@@ -2015,21 +2023,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45988 mdname(conf->mddev), STRIPE_SECTORS,
45989 (unsigned long long)s,
45990 bdevname(rdev->bdev, b));
45991- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45992+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45993 clear_bit(R5_ReadError, &sh->dev[i].flags);
45994 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45995 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45996 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45997
45998- if (atomic_read(&rdev->read_errors))
45999- atomic_set(&rdev->read_errors, 0);
46000+ if (atomic_read_unchecked(&rdev->read_errors))
46001+ atomic_set_unchecked(&rdev->read_errors, 0);
46002 } else {
46003 const char *bdn = bdevname(rdev->bdev, b);
46004 int retry = 0;
46005 int set_bad = 0;
46006
46007 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
46008- atomic_inc(&rdev->read_errors);
46009+ atomic_inc_unchecked(&rdev->read_errors);
46010 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
46011 printk_ratelimited(
46012 KERN_WARNING
46013@@ -2057,7 +2065,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46014 mdname(conf->mddev),
46015 (unsigned long long)s,
46016 bdn);
46017- } else if (atomic_read(&rdev->read_errors)
46018+ } else if (atomic_read_unchecked(&rdev->read_errors)
46019 > conf->max_nr_stripes)
46020 printk(KERN_WARNING
46021 "md/raid:%s: Too many read errors, failing device %s.\n",
46022diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46023index 983db75..ef9248c 100644
46024--- a/drivers/media/dvb-core/dvbdev.c
46025+++ b/drivers/media/dvb-core/dvbdev.c
46026@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46027 const struct dvb_device *template, void *priv, int type)
46028 {
46029 struct dvb_device *dvbdev;
46030- struct file_operations *dvbdevfops;
46031+ file_operations_no_const *dvbdevfops;
46032 struct device *clsdev;
46033 int minor;
46034 int id;
46035diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46036index 6ad22b6..6e90e2a 100644
46037--- a/drivers/media/dvb-frontends/af9033.h
46038+++ b/drivers/media/dvb-frontends/af9033.h
46039@@ -96,6 +96,6 @@ struct af9033_ops {
46040 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46041 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46042 int onoff);
46043-};
46044+} __no_const;
46045
46046 #endif /* AF9033_H */
46047diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46048index 9b6c3bb..baeb5c7 100644
46049--- a/drivers/media/dvb-frontends/dib3000.h
46050+++ b/drivers/media/dvb-frontends/dib3000.h
46051@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46052 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46053 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46054 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46055-};
46056+} __no_const;
46057
46058 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
46059 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46060diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46061index 1fea0e9..321ce8f 100644
46062--- a/drivers/media/dvb-frontends/dib7000p.h
46063+++ b/drivers/media/dvb-frontends/dib7000p.h
46064@@ -64,7 +64,7 @@ struct dib7000p_ops {
46065 int (*get_adc_power)(struct dvb_frontend *fe);
46066 int (*slave_reset)(struct dvb_frontend *fe);
46067 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46068-};
46069+} __no_const;
46070
46071 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
46072 void *dib7000p_attach(struct dib7000p_ops *ops);
46073diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46074index 84cc103..5780c54 100644
46075--- a/drivers/media/dvb-frontends/dib8000.h
46076+++ b/drivers/media/dvb-frontends/dib8000.h
46077@@ -61,7 +61,7 @@ struct dib8000_ops {
46078 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46079 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46080 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46081-};
46082+} __no_const;
46083
46084 #if IS_ENABLED(CONFIG_DVB_DIB8000)
46085 void *dib8000_attach(struct dib8000_ops *ops);
46086diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46087index 860c98fc..497fa25 100644
46088--- a/drivers/media/pci/cx88/cx88-video.c
46089+++ b/drivers/media/pci/cx88/cx88-video.c
46090@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46091
46092 /* ------------------------------------------------------------------ */
46093
46094-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46095-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46096-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46097+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46098+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46099+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46100
46101 module_param_array(video_nr, int, NULL, 0444);
46102 module_param_array(vbi_nr, int, NULL, 0444);
46103diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46104index 802642d..5534900 100644
46105--- a/drivers/media/pci/ivtv/ivtv-driver.c
46106+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46107@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46108 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46109
46110 /* ivtv instance counter */
46111-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46112+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46113
46114 /* Parameter declarations */
46115 static int cardtype[IVTV_MAX_CARDS];
46116diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46117index 570d119..ed25830 100644
46118--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46119+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46120@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46121
46122 static int solo_sysfs_init(struct solo_dev *solo_dev)
46123 {
46124- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46125+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46126 struct device *dev = &solo_dev->dev;
46127 const char *driver;
46128 int i;
46129diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46130index 7ddc767..1c24361 100644
46131--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46132+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46133@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46134
46135 int solo_g723_init(struct solo_dev *solo_dev)
46136 {
46137- static struct snd_device_ops ops = { NULL };
46138+ static struct snd_device_ops ops = { };
46139 struct snd_card *card;
46140 struct snd_kcontrol_new kctl;
46141 char name[32];
46142diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46143index 8c84846..27b4f83 100644
46144--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46145+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46146@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46147
46148 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46149 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46150- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46151+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46152 if (p2m_id < 0)
46153 p2m_id = -p2m_id;
46154 }
46155diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46156index 1ca54b0..7d7cb9a 100644
46157--- a/drivers/media/pci/solo6x10/solo6x10.h
46158+++ b/drivers/media/pci/solo6x10/solo6x10.h
46159@@ -218,7 +218,7 @@ struct solo_dev {
46160
46161 /* P2M DMA Engine */
46162 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46163- atomic_t p2m_count;
46164+ atomic_unchecked_t p2m_count;
46165 int p2m_jiffies;
46166 unsigned int p2m_timeouts;
46167
46168diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46169index c135165..dc69499 100644
46170--- a/drivers/media/pci/tw68/tw68-core.c
46171+++ b/drivers/media/pci/tw68/tw68-core.c
46172@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46173 module_param_array(card, int, NULL, 0444);
46174 MODULE_PARM_DESC(card, "card type");
46175
46176-static atomic_t tw68_instance = ATOMIC_INIT(0);
46177+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46178
46179 /* ------------------------------------------------------------------ */
46180
46181diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46182index ba2d8f9..1566684 100644
46183--- a/drivers/media/platform/omap/omap_vout.c
46184+++ b/drivers/media/platform/omap/omap_vout.c
46185@@ -63,7 +63,6 @@ enum omap_vout_channels {
46186 OMAP_VIDEO2,
46187 };
46188
46189-static struct videobuf_queue_ops video_vbq_ops;
46190 /* Variables configurable through module params*/
46191 static u32 video1_numbuffers = 3;
46192 static u32 video2_numbuffers = 3;
46193@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46194 {
46195 struct videobuf_queue *q;
46196 struct omap_vout_device *vout = NULL;
46197+ static struct videobuf_queue_ops video_vbq_ops = {
46198+ .buf_setup = omap_vout_buffer_setup,
46199+ .buf_prepare = omap_vout_buffer_prepare,
46200+ .buf_release = omap_vout_buffer_release,
46201+ .buf_queue = omap_vout_buffer_queue,
46202+ };
46203
46204 vout = video_drvdata(file);
46205 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46206@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46207 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46208
46209 q = &vout->vbq;
46210- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46211- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46212- video_vbq_ops.buf_release = omap_vout_buffer_release;
46213- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46214 spin_lock_init(&vout->vbq_lock);
46215
46216 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46217diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46218index fb2acc5..a2fcbdc4 100644
46219--- a/drivers/media/platform/s5p-tv/mixer.h
46220+++ b/drivers/media/platform/s5p-tv/mixer.h
46221@@ -156,7 +156,7 @@ struct mxr_layer {
46222 /** layer index (unique identifier) */
46223 int idx;
46224 /** callbacks for layer methods */
46225- struct mxr_layer_ops ops;
46226+ struct mxr_layer_ops *ops;
46227 /** format array */
46228 const struct mxr_format **fmt_array;
46229 /** size of format array */
46230diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46231index 74344c7..a39e70e 100644
46232--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46233+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46234@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46235 {
46236 struct mxr_layer *layer;
46237 int ret;
46238- struct mxr_layer_ops ops = {
46239+ static struct mxr_layer_ops ops = {
46240 .release = mxr_graph_layer_release,
46241 .buffer_set = mxr_graph_buffer_set,
46242 .stream_set = mxr_graph_stream_set,
46243diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46244index b713403..53cb5ad 100644
46245--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46246+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46247@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46248 layer->update_buf = next;
46249 }
46250
46251- layer->ops.buffer_set(layer, layer->update_buf);
46252+ layer->ops->buffer_set(layer, layer->update_buf);
46253
46254 if (done && done != layer->shadow_buf)
46255 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46256diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46257index 72d4f2e..4b2ea0d 100644
46258--- a/drivers/media/platform/s5p-tv/mixer_video.c
46259+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46260@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46261 layer->geo.src.height = layer->geo.src.full_height;
46262
46263 mxr_geometry_dump(mdev, &layer->geo);
46264- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46265+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46266 mxr_geometry_dump(mdev, &layer->geo);
46267 }
46268
46269@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46270 layer->geo.dst.full_width = mbus_fmt.width;
46271 layer->geo.dst.full_height = mbus_fmt.height;
46272 layer->geo.dst.field = mbus_fmt.field;
46273- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46274+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46275
46276 mxr_geometry_dump(mdev, &layer->geo);
46277 }
46278@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46279 /* set source size to highest accepted value */
46280 geo->src.full_width = max(geo->dst.full_width, pix->width);
46281 geo->src.full_height = max(geo->dst.full_height, pix->height);
46282- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46283+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46284 mxr_geometry_dump(mdev, &layer->geo);
46285 /* set cropping to total visible screen */
46286 geo->src.width = pix->width;
46287@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46288 geo->src.x_offset = 0;
46289 geo->src.y_offset = 0;
46290 /* assure consistency of geometry */
46291- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46292+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46293 mxr_geometry_dump(mdev, &layer->geo);
46294 /* set full size to lowest possible value */
46295 geo->src.full_width = 0;
46296 geo->src.full_height = 0;
46297- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46298+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46299 mxr_geometry_dump(mdev, &layer->geo);
46300
46301 /* returning results */
46302@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46303 target->width = s->r.width;
46304 target->height = s->r.height;
46305
46306- layer->ops.fix_geometry(layer, stage, s->flags);
46307+ layer->ops->fix_geometry(layer, stage, s->flags);
46308
46309 /* retrieve update selection rectangle */
46310 res.left = target->x_offset;
46311@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46312 mxr_output_get(mdev);
46313
46314 mxr_layer_update_output(layer);
46315- layer->ops.format_set(layer);
46316+ layer->ops->format_set(layer);
46317 /* enabling layer in hardware */
46318 spin_lock_irqsave(&layer->enq_slock, flags);
46319 layer->state = MXR_LAYER_STREAMING;
46320 spin_unlock_irqrestore(&layer->enq_slock, flags);
46321
46322- layer->ops.stream_set(layer, MXR_ENABLE);
46323+ layer->ops->stream_set(layer, MXR_ENABLE);
46324 mxr_streamer_get(mdev);
46325
46326 return 0;
46327@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46328 spin_unlock_irqrestore(&layer->enq_slock, flags);
46329
46330 /* disabling layer in hardware */
46331- layer->ops.stream_set(layer, MXR_DISABLE);
46332+ layer->ops->stream_set(layer, MXR_DISABLE);
46333 /* remove one streamer */
46334 mxr_streamer_put(mdev);
46335 /* allow changes in output configuration */
46336@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46337
46338 void mxr_layer_release(struct mxr_layer *layer)
46339 {
46340- if (layer->ops.release)
46341- layer->ops.release(layer);
46342+ if (layer->ops->release)
46343+ layer->ops->release(layer);
46344 }
46345
46346 void mxr_base_layer_release(struct mxr_layer *layer)
46347@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46348
46349 layer->mdev = mdev;
46350 layer->idx = idx;
46351- layer->ops = *ops;
46352+ layer->ops = ops;
46353
46354 spin_lock_init(&layer->enq_slock);
46355 INIT_LIST_HEAD(&layer->enq_list);
46356diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46357index c9388c4..ce71ece 100644
46358--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46359+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46360@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46361 {
46362 struct mxr_layer *layer;
46363 int ret;
46364- struct mxr_layer_ops ops = {
46365+ static struct mxr_layer_ops ops = {
46366 .release = mxr_vp_layer_release,
46367 .buffer_set = mxr_vp_buffer_set,
46368 .stream_set = mxr_vp_stream_set,
46369diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46370index 82affae..42833ec 100644
46371--- a/drivers/media/radio/radio-cadet.c
46372+++ b/drivers/media/radio/radio-cadet.c
46373@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46374 unsigned char readbuf[RDS_BUFFER];
46375 int i = 0;
46376
46377+ if (count > RDS_BUFFER)
46378+ return -EFAULT;
46379 mutex_lock(&dev->lock);
46380 if (dev->rdsstat == 0)
46381 cadet_start_rds(dev);
46382@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46383 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46384 mutex_unlock(&dev->lock);
46385
46386- if (i && copy_to_user(data, readbuf, i))
46387- return -EFAULT;
46388+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46389+ i = -EFAULT;
46390+
46391 return i;
46392 }
46393
46394diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46395index 5236035..c622c74 100644
46396--- a/drivers/media/radio/radio-maxiradio.c
46397+++ b/drivers/media/radio/radio-maxiradio.c
46398@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46399 /* TEA5757 pin mappings */
46400 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46401
46402-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46403+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46404
46405 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46406 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46407diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46408index 050b3bb..79f62b9 100644
46409--- a/drivers/media/radio/radio-shark.c
46410+++ b/drivers/media/radio/radio-shark.c
46411@@ -79,7 +79,7 @@ struct shark_device {
46412 u32 last_val;
46413 };
46414
46415-static atomic_t shark_instance = ATOMIC_INIT(0);
46416+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46417
46418 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46419 {
46420diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46421index 8654e0d..0608a64 100644
46422--- a/drivers/media/radio/radio-shark2.c
46423+++ b/drivers/media/radio/radio-shark2.c
46424@@ -74,7 +74,7 @@ struct shark_device {
46425 u8 *transfer_buffer;
46426 };
46427
46428-static atomic_t shark_instance = ATOMIC_INIT(0);
46429+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46430
46431 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46432 {
46433diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46434index dccf586..d5db411 100644
46435--- a/drivers/media/radio/radio-si476x.c
46436+++ b/drivers/media/radio/radio-si476x.c
46437@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46438 struct si476x_radio *radio;
46439 struct v4l2_ctrl *ctrl;
46440
46441- static atomic_t instance = ATOMIC_INIT(0);
46442+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46443
46444 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46445 if (!radio)
46446diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46447index 704397f..4d05977 100644
46448--- a/drivers/media/radio/wl128x/fmdrv_common.c
46449+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46450@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46451 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46452
46453 /* Radio Nr */
46454-static u32 radio_nr = -1;
46455+static int radio_nr = -1;
46456 module_param(radio_nr, int, 0444);
46457 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46458
46459diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46460index 9fd1527..8927230 100644
46461--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46462+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46463@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46464
46465 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46466 {
46467- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46468- char result[64];
46469- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46470- sizeof(result), 0);
46471+ char *buf;
46472+ char *result;
46473+ int retval;
46474+
46475+ buf = kmalloc(2, GFP_KERNEL);
46476+ if (buf == NULL)
46477+ return -ENOMEM;
46478+ result = kmalloc(64, GFP_KERNEL);
46479+ if (result == NULL) {
46480+ kfree(buf);
46481+ return -ENOMEM;
46482+ }
46483+
46484+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46485+ buf[1] = enable ? 1 : 0;
46486+
46487+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46488+
46489+ kfree(buf);
46490+ kfree(result);
46491+ return retval;
46492 }
46493
46494 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46495 {
46496- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46497- char state[3];
46498- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46499+ char *buf;
46500+ char *state;
46501+ int retval;
46502+
46503+ buf = kmalloc(2, GFP_KERNEL);
46504+ if (buf == NULL)
46505+ return -ENOMEM;
46506+ state = kmalloc(3, GFP_KERNEL);
46507+ if (state == NULL) {
46508+ kfree(buf);
46509+ return -ENOMEM;
46510+ }
46511+
46512+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46513+ buf[1] = enable ? 1 : 0;
46514+
46515+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46516+
46517+ kfree(buf);
46518+ kfree(state);
46519+ return retval;
46520 }
46521
46522 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46523 {
46524- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46525- char state[3];
46526+ char *query;
46527+ char *state;
46528 int ret;
46529+ query = kmalloc(1, GFP_KERNEL);
46530+ if (query == NULL)
46531+ return -ENOMEM;
46532+ state = kmalloc(3, GFP_KERNEL);
46533+ if (state == NULL) {
46534+ kfree(query);
46535+ return -ENOMEM;
46536+ }
46537+
46538+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46539
46540 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46541
46542- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46543- sizeof(state), 0);
46544+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46545 if (ret < 0) {
46546 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46547 "state info\n");
46548@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46549
46550 /* Copy this pointer as we are gonna need it in the release phase */
46551 cinergyt2_usb_device = adap->dev;
46552-
46553+ kfree(query);
46554+ kfree(state);
46555 return 0;
46556 }
46557
46558@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46559 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46560 {
46561 struct cinergyt2_state *st = d->priv;
46562- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46563+ u8 *key, *cmd;
46564 int i;
46565
46566+ cmd = kmalloc(1, GFP_KERNEL);
46567+ if (cmd == NULL)
46568+ return -EINVAL;
46569+ key = kzalloc(5, GFP_KERNEL);
46570+ if (key == NULL) {
46571+ kfree(cmd);
46572+ return -EINVAL;
46573+ }
46574+
46575+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46576+
46577 *state = REMOTE_NO_KEY_PRESSED;
46578
46579- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46580+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46581 if (key[4] == 0xff) {
46582 /* key repeat */
46583 st->rc_counter++;
46584@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46585 *event = d->last_event;
46586 deb_rc("repeat key, event %x\n",
46587 *event);
46588- return 0;
46589+ goto out;
46590 }
46591 }
46592 deb_rc("repeated key (non repeatable)\n");
46593 }
46594- return 0;
46595+ goto out;
46596 }
46597
46598 /* hack to pass checksum on the custom field */
46599@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46600
46601 deb_rc("key: %*ph\n", 5, key);
46602 }
46603+out:
46604+ kfree(cmd);
46605+ kfree(key);
46606 return 0;
46607 }
46608
46609diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46610index c890fe4..f9b2ae6 100644
46611--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46612+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46613@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46614 fe_status_t *status)
46615 {
46616 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46617- struct dvbt_get_status_msg result;
46618- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46619+ struct dvbt_get_status_msg *result;
46620+ u8 *cmd;
46621 int ret;
46622
46623- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46624- sizeof(result), 0);
46625+ cmd = kmalloc(1, GFP_KERNEL);
46626+ if (cmd == NULL)
46627+ return -ENOMEM;
46628+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46629+ if (result == NULL) {
46630+ kfree(cmd);
46631+ return -ENOMEM;
46632+ }
46633+
46634+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46635+
46636+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46637+ sizeof(*result), 0);
46638 if (ret < 0)
46639- return ret;
46640+ goto out;
46641
46642 *status = 0;
46643
46644- if (0xffff - le16_to_cpu(result.gain) > 30)
46645+ if (0xffff - le16_to_cpu(result->gain) > 30)
46646 *status |= FE_HAS_SIGNAL;
46647- if (result.lock_bits & (1 << 6))
46648+ if (result->lock_bits & (1 << 6))
46649 *status |= FE_HAS_LOCK;
46650- if (result.lock_bits & (1 << 5))
46651+ if (result->lock_bits & (1 << 5))
46652 *status |= FE_HAS_SYNC;
46653- if (result.lock_bits & (1 << 4))
46654+ if (result->lock_bits & (1 << 4))
46655 *status |= FE_HAS_CARRIER;
46656- if (result.lock_bits & (1 << 1))
46657+ if (result->lock_bits & (1 << 1))
46658 *status |= FE_HAS_VITERBI;
46659
46660 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46661 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46662 *status &= ~FE_HAS_LOCK;
46663
46664- return 0;
46665+out:
46666+ kfree(cmd);
46667+ kfree(result);
46668+ return ret;
46669 }
46670
46671 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46672 {
46673 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46674- struct dvbt_get_status_msg status;
46675- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46676+ struct dvbt_get_status_msg *status;
46677+ char *cmd;
46678 int ret;
46679
46680- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46681- sizeof(status), 0);
46682+ cmd = kmalloc(1, GFP_KERNEL);
46683+ if (cmd == NULL)
46684+ return -ENOMEM;
46685+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46686+ if (status == NULL) {
46687+ kfree(cmd);
46688+ return -ENOMEM;
46689+ }
46690+
46691+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46692+
46693+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46694+ sizeof(*status), 0);
46695 if (ret < 0)
46696- return ret;
46697+ goto out;
46698
46699- *ber = le32_to_cpu(status.viterbi_error_rate);
46700+ *ber = le32_to_cpu(status->viterbi_error_rate);
46701+out:
46702+ kfree(cmd);
46703+ kfree(status);
46704 return 0;
46705 }
46706
46707 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46708 {
46709 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46710- struct dvbt_get_status_msg status;
46711- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46712+ struct dvbt_get_status_msg *status;
46713+ u8 *cmd;
46714 int ret;
46715
46716- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46717- sizeof(status), 0);
46718+ cmd = kmalloc(1, GFP_KERNEL);
46719+ if (cmd == NULL)
46720+ return -ENOMEM;
46721+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46722+ if (status == NULL) {
46723+ kfree(cmd);
46724+ return -ENOMEM;
46725+ }
46726+
46727+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46728+
46729+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46730+ sizeof(*status), 0);
46731 if (ret < 0) {
46732 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46733 ret);
46734- return ret;
46735+ goto out;
46736 }
46737- *unc = le32_to_cpu(status.uncorrected_block_count);
46738- return 0;
46739+ *unc = le32_to_cpu(status->uncorrected_block_count);
46740+
46741+out:
46742+ kfree(cmd);
46743+ kfree(status);
46744+ return ret;
46745 }
46746
46747 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46748 u16 *strength)
46749 {
46750 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46751- struct dvbt_get_status_msg status;
46752- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46753+ struct dvbt_get_status_msg *status;
46754+ char *cmd;
46755 int ret;
46756
46757- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46758- sizeof(status), 0);
46759+ cmd = kmalloc(1, GFP_KERNEL);
46760+ if (cmd == NULL)
46761+ return -ENOMEM;
46762+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46763+ if (status == NULL) {
46764+ kfree(cmd);
46765+ return -ENOMEM;
46766+ }
46767+
46768+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46769+
46770+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46771+ sizeof(*status), 0);
46772 if (ret < 0) {
46773 err("cinergyt2_fe_read_signal_strength() Failed!"
46774 " (Error=%d)\n", ret);
46775- return ret;
46776+ goto out;
46777 }
46778- *strength = (0xffff - le16_to_cpu(status.gain));
46779+ *strength = (0xffff - le16_to_cpu(status->gain));
46780+
46781+out:
46782+ kfree(cmd);
46783+ kfree(status);
46784 return 0;
46785 }
46786
46787 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46788 {
46789 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46790- struct dvbt_get_status_msg status;
46791- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46792+ struct dvbt_get_status_msg *status;
46793+ char *cmd;
46794 int ret;
46795
46796- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46797- sizeof(status), 0);
46798+ cmd = kmalloc(1, GFP_KERNEL);
46799+ if (cmd == NULL)
46800+ return -ENOMEM;
46801+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46802+ if (status == NULL) {
46803+ kfree(cmd);
46804+ return -ENOMEM;
46805+ }
46806+
46807+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46808+
46809+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46810+ sizeof(*status), 0);
46811 if (ret < 0) {
46812 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46813- return ret;
46814+ goto out;
46815 }
46816- *snr = (status.snr << 8) | status.snr;
46817- return 0;
46818+ *snr = (status->snr << 8) | status->snr;
46819+
46820+out:
46821+ kfree(cmd);
46822+ kfree(status);
46823+ return ret;
46824 }
46825
46826 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46827@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46828 {
46829 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46830 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46831- struct dvbt_set_parameters_msg param;
46832- char result[2];
46833+ struct dvbt_set_parameters_msg *param;
46834+ char *result;
46835 int err;
46836
46837- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46838- param.tps = cpu_to_le16(compute_tps(fep));
46839- param.freq = cpu_to_le32(fep->frequency / 1000);
46840- param.flags = 0;
46841+ result = kmalloc(2, GFP_KERNEL);
46842+ if (result == NULL)
46843+ return -ENOMEM;
46844+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46845+ if (param == NULL) {
46846+ kfree(result);
46847+ return -ENOMEM;
46848+ }
46849+
46850+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46851+ param->tps = cpu_to_le16(compute_tps(fep));
46852+ param->freq = cpu_to_le32(fep->frequency / 1000);
46853+ param->flags = 0;
46854
46855 switch (fep->bandwidth_hz) {
46856 default:
46857 case 8000000:
46858- param.bandwidth = 8;
46859+ param->bandwidth = 8;
46860 break;
46861 case 7000000:
46862- param.bandwidth = 7;
46863+ param->bandwidth = 7;
46864 break;
46865 case 6000000:
46866- param.bandwidth = 6;
46867+ param->bandwidth = 6;
46868 break;
46869 }
46870
46871 err = dvb_usb_generic_rw(state->d,
46872- (char *)&param, sizeof(param),
46873- result, sizeof(result), 0);
46874+ (char *)param, sizeof(*param),
46875+ result, 2, 0);
46876 if (err < 0)
46877 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46878
46879- return (err < 0) ? err : 0;
46880+ kfree(result);
46881+ kfree(param);
46882+ return err;
46883 }
46884
46885 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46886diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46887index 733a7ff..f8b52e3 100644
46888--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46889+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46890@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46891
46892 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46893 {
46894- struct hexline hx;
46895- u8 reset;
46896+ struct hexline *hx;
46897+ u8 *reset;
46898 int ret,pos=0;
46899
46900+ reset = kmalloc(1, GFP_KERNEL);
46901+ if (reset == NULL)
46902+ return -ENOMEM;
46903+
46904+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46905+ if (hx == NULL) {
46906+ kfree(reset);
46907+ return -ENOMEM;
46908+ }
46909+
46910 /* stop the CPU */
46911- reset = 1;
46912- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46913+ reset[0] = 1;
46914+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46915 err("could not stop the USB controller CPU.");
46916
46917- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46918- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46919- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46920+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46921+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46922+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46923
46924- if (ret != hx.len) {
46925+ if (ret != hx->len) {
46926 err("error while transferring firmware "
46927 "(transferred size: %d, block size: %d)",
46928- ret,hx.len);
46929+ ret,hx->len);
46930 ret = -EINVAL;
46931 break;
46932 }
46933 }
46934 if (ret < 0) {
46935 err("firmware download failed at %d with %d",pos,ret);
46936+ kfree(reset);
46937+ kfree(hx);
46938 return ret;
46939 }
46940
46941 if (ret == 0) {
46942 /* restart the CPU */
46943- reset = 0;
46944- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46945+ reset[0] = 0;
46946+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46947 err("could not restart the USB controller CPU.");
46948 ret = -EINVAL;
46949 }
46950 } else
46951 ret = -EIO;
46952
46953+ kfree(reset);
46954+ kfree(hx);
46955+
46956 return ret;
46957 }
46958 EXPORT_SYMBOL(usb_cypress_load_firmware);
46959diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
46960index 1a3df10..57997a5 100644
46961--- a/drivers/media/usb/dvb-usb/dw2102.c
46962+++ b/drivers/media/usb/dvb-usb/dw2102.c
46963@@ -118,7 +118,7 @@ struct su3000_state {
46964
46965 struct s6x0_state {
46966 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
46967-};
46968+} __no_const;
46969
46970 /* debug */
46971 static int dvb_usb_dw2102_debug;
46972diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46973index 5801ae7..83f71fa 100644
46974--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46975+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46976@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46977 static int technisat_usb2_i2c_access(struct usb_device *udev,
46978 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46979 {
46980- u8 b[64];
46981- int ret, actual_length;
46982+ u8 *b = kmalloc(64, GFP_KERNEL);
46983+ int ret, actual_length, error = 0;
46984+
46985+ if (b == NULL)
46986+ return -ENOMEM;
46987
46988 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46989 debug_dump(tx, txlen, deb_i2c);
46990@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46991
46992 if (ret < 0) {
46993 err("i2c-error: out failed %02x = %d", device_addr, ret);
46994- return -ENODEV;
46995+ error = -ENODEV;
46996+ goto out;
46997 }
46998
46999 ret = usb_bulk_msg(udev,
47000@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47001 b, 64, &actual_length, 1000);
47002 if (ret < 0) {
47003 err("i2c-error: in failed %02x = %d", device_addr, ret);
47004- return -ENODEV;
47005+ error = -ENODEV;
47006+ goto out;
47007 }
47008
47009 if (b[0] != I2C_STATUS_OK) {
47010@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47011 /* handle tuner-i2c-nak */
47012 if (!(b[0] == I2C_STATUS_NAK &&
47013 device_addr == 0x60
47014- /* && device_is_technisat_usb2 */))
47015- return -ENODEV;
47016+ /* && device_is_technisat_usb2 */)) {
47017+ error = -ENODEV;
47018+ goto out;
47019+ }
47020 }
47021
47022 deb_i2c("status: %d, ", b[0]);
47023@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47024
47025 deb_i2c("\n");
47026
47027- return 0;
47028+out:
47029+ kfree(b);
47030+ return error;
47031 }
47032
47033 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47034@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47035 {
47036 int ret;
47037
47038- u8 led[8] = {
47039- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47040- 0
47041- };
47042+ u8 *led = kzalloc(8, GFP_KERNEL);
47043+
47044+ if (led == NULL)
47045+ return -ENOMEM;
47046
47047 if (disable_led_control && state != TECH_LED_OFF)
47048 return 0;
47049
47050+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47051+
47052 switch (state) {
47053 case TECH_LED_ON:
47054 led[1] = 0x82;
47055@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47056 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47057 USB_TYPE_VENDOR | USB_DIR_OUT,
47058 0, 0,
47059- led, sizeof(led), 500);
47060+ led, 8, 500);
47061
47062 mutex_unlock(&d->i2c_mutex);
47063+
47064+ kfree(led);
47065+
47066 return ret;
47067 }
47068
47069 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47070 {
47071 int ret;
47072- u8 b = 0;
47073+ u8 *b = kzalloc(1, GFP_KERNEL);
47074+
47075+ if (b == NULL)
47076+ return -ENOMEM;
47077
47078 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47079 return -EAGAIN;
47080@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47081 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47082 USB_TYPE_VENDOR | USB_DIR_OUT,
47083 (red << 8) | green, 0,
47084- &b, 1, 500);
47085+ b, 1, 500);
47086
47087 mutex_unlock(&d->i2c_mutex);
47088
47089+ kfree(b);
47090+
47091 return ret;
47092 }
47093
47094@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47095 struct dvb_usb_device_description **desc, int *cold)
47096 {
47097 int ret;
47098- u8 version[3];
47099+ u8 *version = kmalloc(3, GFP_KERNEL);
47100
47101 /* first select the interface */
47102 if (usb_set_interface(udev, 0, 1) != 0)
47103@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47104
47105 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47106
47107+ if (version == NULL)
47108+ return 0;
47109+
47110 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47111 GET_VERSION_INFO_VENDOR_REQUEST,
47112 USB_TYPE_VENDOR | USB_DIR_IN,
47113 0, 0,
47114- version, sizeof(version), 500);
47115+ version, 3, 500);
47116
47117 if (ret < 0)
47118 *cold = 1;
47119@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47120 *cold = 0;
47121 }
47122
47123+ kfree(version);
47124+
47125 return 0;
47126 }
47127
47128@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47129
47130 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47131 {
47132- u8 buf[62], *b;
47133+ u8 *buf, *b;
47134 int ret;
47135 struct ir_raw_event ev;
47136
47137+ buf = kmalloc(62, GFP_KERNEL);
47138+
47139+ if (buf == NULL)
47140+ return -ENOMEM;
47141+
47142 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47143 buf[1] = 0x08;
47144 buf[2] = 0x8f;
47145@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47146 GET_IR_DATA_VENDOR_REQUEST,
47147 USB_TYPE_VENDOR | USB_DIR_IN,
47148 0x8080, 0,
47149- buf, sizeof(buf), 500);
47150+ buf, 62, 500);
47151
47152 unlock:
47153 mutex_unlock(&d->i2c_mutex);
47154
47155- if (ret < 0)
47156+ if (ret < 0) {
47157+ kfree(buf);
47158 return ret;
47159+ }
47160
47161- if (ret == 1)
47162+ if (ret == 1) {
47163+ kfree(buf);
47164 return 0; /* no key pressed */
47165+ }
47166
47167 /* decoding */
47168 b = buf+1;
47169@@ -656,6 +689,8 @@ unlock:
47170
47171 ir_raw_event_handle(d->rc_dev);
47172
47173+ kfree(buf);
47174+
47175 return 1;
47176 }
47177
47178diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47179index af63543..0436f20 100644
47180--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47181+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47182@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47183 * by passing a very big num_planes value */
47184 uplane = compat_alloc_user_space(num_planes *
47185 sizeof(struct v4l2_plane));
47186- kp->m.planes = (__force struct v4l2_plane *)uplane;
47187+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47188
47189 while (--num_planes >= 0) {
47190 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47191@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47192 if (num_planes == 0)
47193 return 0;
47194
47195- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47196+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47197 if (get_user(p, &up->m.planes))
47198 return -EFAULT;
47199 uplane32 = compat_ptr(p);
47200@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47201 get_user(kp->flags, &up->flags) ||
47202 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47203 return -EFAULT;
47204- kp->base = (__force void *)compat_ptr(tmp);
47205+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47206 return 0;
47207 }
47208
47209@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47210 n * sizeof(struct v4l2_ext_control32)))
47211 return -EFAULT;
47212 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47213- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47214+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47215 while (--n >= 0) {
47216 u32 id;
47217
47218@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47219 {
47220 struct v4l2_ext_control32 __user *ucontrols;
47221 struct v4l2_ext_control __user *kcontrols =
47222- (__force struct v4l2_ext_control __user *)kp->controls;
47223+ (struct v4l2_ext_control __force_user *)kp->controls;
47224 int n = kp->count;
47225 compat_caddr_t p;
47226
47227@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47228 get_user(tmp, &up->edid) ||
47229 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47230 return -EFAULT;
47231- kp->edid = (__force u8 *)compat_ptr(tmp);
47232+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47233 return 0;
47234 }
47235
47236diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47237index 015f92a..59e311e 100644
47238--- a/drivers/media/v4l2-core/v4l2-device.c
47239+++ b/drivers/media/v4l2-core/v4l2-device.c
47240@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47241 EXPORT_SYMBOL_GPL(v4l2_device_put);
47242
47243 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47244- atomic_t *instance)
47245+ atomic_unchecked_t *instance)
47246 {
47247- int num = atomic_inc_return(instance) - 1;
47248+ int num = atomic_inc_return_unchecked(instance) - 1;
47249 int len = strlen(basename);
47250
47251 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47252diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47253index b084072..36706d7 100644
47254--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47255+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47256@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47257 struct file *file, void *fh, void *p);
47258 } u;
47259 void (*debug)(const void *arg, bool write_only);
47260-};
47261+} __do_const;
47262+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47263
47264 /* This control needs a priority check */
47265 #define INFO_FL_PRIO (1 << 0)
47266@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47267 struct video_device *vfd = video_devdata(file);
47268 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47269 bool write_only = false;
47270- struct v4l2_ioctl_info default_info;
47271+ v4l2_ioctl_info_no_const default_info;
47272 const struct v4l2_ioctl_info *info;
47273 void *fh = file->private_data;
47274 struct v4l2_fh *vfh = NULL;
47275@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47276 ret = -EINVAL;
47277 break;
47278 }
47279- *user_ptr = (void __user *)buf->m.planes;
47280+ *user_ptr = (void __force_user *)buf->m.planes;
47281 *kernel_ptr = (void **)&buf->m.planes;
47282 *array_size = sizeof(struct v4l2_plane) * buf->length;
47283 ret = 1;
47284@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47285 ret = -EINVAL;
47286 break;
47287 }
47288- *user_ptr = (void __user *)edid->edid;
47289+ *user_ptr = (void __force_user *)edid->edid;
47290 *kernel_ptr = (void **)&edid->edid;
47291 *array_size = edid->blocks * 128;
47292 ret = 1;
47293@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47294 ret = -EINVAL;
47295 break;
47296 }
47297- *user_ptr = (void __user *)ctrls->controls;
47298+ *user_ptr = (void __force_user *)ctrls->controls;
47299 *kernel_ptr = (void **)&ctrls->controls;
47300 *array_size = sizeof(struct v4l2_ext_control)
47301 * ctrls->count;
47302@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47303 }
47304
47305 if (has_array_args) {
47306- *kernel_ptr = (void __force *)user_ptr;
47307+ *kernel_ptr = (void __force_kernel *)user_ptr;
47308 if (copy_to_user(user_ptr, mbuf, array_size))
47309 err = -EFAULT;
47310 goto out_array_args;
47311diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47312index 24696f5..3637780 100644
47313--- a/drivers/memory/omap-gpmc.c
47314+++ b/drivers/memory/omap-gpmc.c
47315@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
47316 };
47317
47318 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47319-static struct irq_chip gpmc_irq_chip;
47320 static int gpmc_irq_start;
47321
47322 static struct resource gpmc_mem_root;
47323@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47324
47325 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47326
47327+static struct irq_chip gpmc_irq_chip = {
47328+ .name = "gpmc",
47329+ .irq_startup = gpmc_irq_noop_ret,
47330+ .irq_enable = gpmc_irq_enable,
47331+ .irq_disable = gpmc_irq_disable,
47332+ .irq_shutdown = gpmc_irq_noop,
47333+ .irq_ack = gpmc_irq_noop,
47334+ .irq_mask = gpmc_irq_noop,
47335+ .irq_unmask = gpmc_irq_noop,
47336+};
47337+
47338 static int gpmc_setup_irq(void)
47339 {
47340 int i;
47341@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
47342 return gpmc_irq_start;
47343 }
47344
47345- gpmc_irq_chip.name = "gpmc";
47346- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47347- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47348- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47349- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47350- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47351- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47352- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47353-
47354 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47355 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47356
47357diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47358index 187f836..679544b 100644
47359--- a/drivers/message/fusion/mptbase.c
47360+++ b/drivers/message/fusion/mptbase.c
47361@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47362 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47363 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47364
47365+#ifdef CONFIG_GRKERNSEC_HIDESYM
47366+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47367+#else
47368 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47369 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47370+#endif
47371+
47372 /*
47373 * Rounding UP to nearest 4-kB boundary here...
47374 */
47375@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47376 ioc->facts.GlobalCredits);
47377
47378 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47379+#ifdef CONFIG_GRKERNSEC_HIDESYM
47380+ NULL, NULL);
47381+#else
47382 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47383+#endif
47384 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47385 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47386 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47387diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47388index 5bdaae1..eced16f 100644
47389--- a/drivers/message/fusion/mptsas.c
47390+++ b/drivers/message/fusion/mptsas.c
47391@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47392 return 0;
47393 }
47394
47395+static inline void
47396+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47397+{
47398+ if (phy_info->port_details) {
47399+ phy_info->port_details->rphy = rphy;
47400+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47401+ ioc->name, rphy));
47402+ }
47403+
47404+ if (rphy) {
47405+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47406+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47407+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47408+ ioc->name, rphy, rphy->dev.release));
47409+ }
47410+}
47411+
47412 /* no mutex */
47413 static void
47414 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47415@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47416 return NULL;
47417 }
47418
47419-static inline void
47420-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47421-{
47422- if (phy_info->port_details) {
47423- phy_info->port_details->rphy = rphy;
47424- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47425- ioc->name, rphy));
47426- }
47427-
47428- if (rphy) {
47429- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47430- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47431- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47432- ioc->name, rphy, rphy->dev.release));
47433- }
47434-}
47435-
47436 static inline struct sas_port *
47437 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47438 {
47439diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47440index 9a8e185..27ff17d 100644
47441--- a/drivers/mfd/ab8500-debugfs.c
47442+++ b/drivers/mfd/ab8500-debugfs.c
47443@@ -100,7 +100,7 @@ static int irq_last;
47444 static u32 *irq_count;
47445 static int num_irqs;
47446
47447-static struct device_attribute **dev_attr;
47448+static device_attribute_no_const **dev_attr;
47449 static char **event_name;
47450
47451 static u8 avg_sample = SAMPLE_16;
47452diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47453index 5615522..1eb6f3dc 100644
47454--- a/drivers/mfd/kempld-core.c
47455+++ b/drivers/mfd/kempld-core.c
47456@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47457 .remove = kempld_remove,
47458 };
47459
47460-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47461+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47462 {
47463 .ident = "BHL6",
47464 .matches = {
47465diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47466index c880c89..45a7c68 100644
47467--- a/drivers/mfd/max8925-i2c.c
47468+++ b/drivers/mfd/max8925-i2c.c
47469@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47470 const struct i2c_device_id *id)
47471 {
47472 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47473- static struct max8925_chip *chip;
47474+ struct max8925_chip *chip;
47475 struct device_node *node = client->dev.of_node;
47476
47477 if (node && !pdata) {
47478diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47479index 7612d89..70549c2 100644
47480--- a/drivers/mfd/tps65910.c
47481+++ b/drivers/mfd/tps65910.c
47482@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47483 struct tps65910_platform_data *pdata)
47484 {
47485 int ret = 0;
47486- static struct regmap_irq_chip *tps6591x_irqs_chip;
47487+ struct regmap_irq_chip *tps6591x_irqs_chip;
47488
47489 if (!irq) {
47490 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47491diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47492index 1b772ef..01e77d33 100644
47493--- a/drivers/mfd/twl4030-irq.c
47494+++ b/drivers/mfd/twl4030-irq.c
47495@@ -34,6 +34,7 @@
47496 #include <linux/of.h>
47497 #include <linux/irqdomain.h>
47498 #include <linux/i2c/twl.h>
47499+#include <asm/pgtable.h>
47500
47501 #include "twl-core.h"
47502
47503@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47504 * Install an irq handler for each of the SIH modules;
47505 * clone dummy irq_chip since PIH can't *do* anything
47506 */
47507- twl4030_irq_chip = dummy_irq_chip;
47508- twl4030_irq_chip.name = "twl4030";
47509+ pax_open_kernel();
47510+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47511+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47512
47513- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47514+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47515+ pax_close_kernel();
47516
47517 for (i = irq_base; i < irq_end; i++) {
47518 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47519diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47520index 464419b..64bae8d 100644
47521--- a/drivers/misc/c2port/core.c
47522+++ b/drivers/misc/c2port/core.c
47523@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47524 goto error_idr_alloc;
47525 c2dev->id = ret;
47526
47527- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47528+ pax_open_kernel();
47529+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47530+ pax_close_kernel();
47531
47532 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47533 "c2port%d", c2dev->id);
47534diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47535index 8385177..2f54635 100644
47536--- a/drivers/misc/eeprom/sunxi_sid.c
47537+++ b/drivers/misc/eeprom/sunxi_sid.c
47538@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47539
47540 platform_set_drvdata(pdev, sid_data);
47541
47542- sid_bin_attr.size = sid_data->keysize;
47543+ pax_open_kernel();
47544+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47545+ pax_close_kernel();
47546 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47547 return -ENODEV;
47548
47549diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47550index 36f5d52..32311c3 100644
47551--- a/drivers/misc/kgdbts.c
47552+++ b/drivers/misc/kgdbts.c
47553@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47554 char before[BREAK_INSTR_SIZE];
47555 char after[BREAK_INSTR_SIZE];
47556
47557- probe_kernel_read(before, (char *)kgdbts_break_test,
47558+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47559 BREAK_INSTR_SIZE);
47560 init_simple_test();
47561 ts.tst = plant_and_detach_test;
47562@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47563 /* Activate test with initial breakpoint */
47564 if (!is_early)
47565 kgdb_breakpoint();
47566- probe_kernel_read(after, (char *)kgdbts_break_test,
47567+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47568 BREAK_INSTR_SIZE);
47569 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47570 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47571diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47572index 3ef4627..8d00486 100644
47573--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47574+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47575@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47576 * the lid is closed. This leads to interrupts as soon as a little move
47577 * is done.
47578 */
47579- atomic_inc(&lis3->count);
47580+ atomic_inc_unchecked(&lis3->count);
47581
47582 wake_up_interruptible(&lis3->misc_wait);
47583 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47584@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47585 if (lis3->pm_dev)
47586 pm_runtime_get_sync(lis3->pm_dev);
47587
47588- atomic_set(&lis3->count, 0);
47589+ atomic_set_unchecked(&lis3->count, 0);
47590 return 0;
47591 }
47592
47593@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47594 add_wait_queue(&lis3->misc_wait, &wait);
47595 while (true) {
47596 set_current_state(TASK_INTERRUPTIBLE);
47597- data = atomic_xchg(&lis3->count, 0);
47598+ data = atomic_xchg_unchecked(&lis3->count, 0);
47599 if (data)
47600 break;
47601
47602@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47603 struct lis3lv02d, miscdev);
47604
47605 poll_wait(file, &lis3->misc_wait, wait);
47606- if (atomic_read(&lis3->count))
47607+ if (atomic_read_unchecked(&lis3->count))
47608 return POLLIN | POLLRDNORM;
47609 return 0;
47610 }
47611diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47612index c439c82..1f20f57 100644
47613--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47614+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47615@@ -297,7 +297,7 @@ struct lis3lv02d {
47616 struct input_polled_dev *idev; /* input device */
47617 struct platform_device *pdev; /* platform device */
47618 struct regulator_bulk_data regulators[2];
47619- atomic_t count; /* interrupt count after last read */
47620+ atomic_unchecked_t count; /* interrupt count after last read */
47621 union axis_conversion ac; /* hw -> logical axis */
47622 int mapped_btns[3];
47623
47624diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47625index 2f30bad..c4c13d0 100644
47626--- a/drivers/misc/sgi-gru/gruhandles.c
47627+++ b/drivers/misc/sgi-gru/gruhandles.c
47628@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47629 unsigned long nsec;
47630
47631 nsec = CLKS2NSEC(clks);
47632- atomic_long_inc(&mcs_op_statistics[op].count);
47633- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47634+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47635+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47636 if (mcs_op_statistics[op].max < nsec)
47637 mcs_op_statistics[op].max = nsec;
47638 }
47639diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47640index 4f76359..cdfcb2e 100644
47641--- a/drivers/misc/sgi-gru/gruprocfs.c
47642+++ b/drivers/misc/sgi-gru/gruprocfs.c
47643@@ -32,9 +32,9 @@
47644
47645 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47646
47647-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47648+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47649 {
47650- unsigned long val = atomic_long_read(v);
47651+ unsigned long val = atomic_long_read_unchecked(v);
47652
47653 seq_printf(s, "%16lu %s\n", val, id);
47654 }
47655@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47656
47657 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47658 for (op = 0; op < mcsop_last; op++) {
47659- count = atomic_long_read(&mcs_op_statistics[op].count);
47660- total = atomic_long_read(&mcs_op_statistics[op].total);
47661+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47662+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47663 max = mcs_op_statistics[op].max;
47664 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47665 count ? total / count : 0, max);
47666diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47667index 5c3ce24..4915ccb 100644
47668--- a/drivers/misc/sgi-gru/grutables.h
47669+++ b/drivers/misc/sgi-gru/grutables.h
47670@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47671 * GRU statistics.
47672 */
47673 struct gru_stats_s {
47674- atomic_long_t vdata_alloc;
47675- atomic_long_t vdata_free;
47676- atomic_long_t gts_alloc;
47677- atomic_long_t gts_free;
47678- atomic_long_t gms_alloc;
47679- atomic_long_t gms_free;
47680- atomic_long_t gts_double_allocate;
47681- atomic_long_t assign_context;
47682- atomic_long_t assign_context_failed;
47683- atomic_long_t free_context;
47684- atomic_long_t load_user_context;
47685- atomic_long_t load_kernel_context;
47686- atomic_long_t lock_kernel_context;
47687- atomic_long_t unlock_kernel_context;
47688- atomic_long_t steal_user_context;
47689- atomic_long_t steal_kernel_context;
47690- atomic_long_t steal_context_failed;
47691- atomic_long_t nopfn;
47692- atomic_long_t asid_new;
47693- atomic_long_t asid_next;
47694- atomic_long_t asid_wrap;
47695- atomic_long_t asid_reuse;
47696- atomic_long_t intr;
47697- atomic_long_t intr_cbr;
47698- atomic_long_t intr_tfh;
47699- atomic_long_t intr_spurious;
47700- atomic_long_t intr_mm_lock_failed;
47701- atomic_long_t call_os;
47702- atomic_long_t call_os_wait_queue;
47703- atomic_long_t user_flush_tlb;
47704- atomic_long_t user_unload_context;
47705- atomic_long_t user_exception;
47706- atomic_long_t set_context_option;
47707- atomic_long_t check_context_retarget_intr;
47708- atomic_long_t check_context_unload;
47709- atomic_long_t tlb_dropin;
47710- atomic_long_t tlb_preload_page;
47711- atomic_long_t tlb_dropin_fail_no_asid;
47712- atomic_long_t tlb_dropin_fail_upm;
47713- atomic_long_t tlb_dropin_fail_invalid;
47714- atomic_long_t tlb_dropin_fail_range_active;
47715- atomic_long_t tlb_dropin_fail_idle;
47716- atomic_long_t tlb_dropin_fail_fmm;
47717- atomic_long_t tlb_dropin_fail_no_exception;
47718- atomic_long_t tfh_stale_on_fault;
47719- atomic_long_t mmu_invalidate_range;
47720- atomic_long_t mmu_invalidate_page;
47721- atomic_long_t flush_tlb;
47722- atomic_long_t flush_tlb_gru;
47723- atomic_long_t flush_tlb_gru_tgh;
47724- atomic_long_t flush_tlb_gru_zero_asid;
47725+ atomic_long_unchecked_t vdata_alloc;
47726+ atomic_long_unchecked_t vdata_free;
47727+ atomic_long_unchecked_t gts_alloc;
47728+ atomic_long_unchecked_t gts_free;
47729+ atomic_long_unchecked_t gms_alloc;
47730+ atomic_long_unchecked_t gms_free;
47731+ atomic_long_unchecked_t gts_double_allocate;
47732+ atomic_long_unchecked_t assign_context;
47733+ atomic_long_unchecked_t assign_context_failed;
47734+ atomic_long_unchecked_t free_context;
47735+ atomic_long_unchecked_t load_user_context;
47736+ atomic_long_unchecked_t load_kernel_context;
47737+ atomic_long_unchecked_t lock_kernel_context;
47738+ atomic_long_unchecked_t unlock_kernel_context;
47739+ atomic_long_unchecked_t steal_user_context;
47740+ atomic_long_unchecked_t steal_kernel_context;
47741+ atomic_long_unchecked_t steal_context_failed;
47742+ atomic_long_unchecked_t nopfn;
47743+ atomic_long_unchecked_t asid_new;
47744+ atomic_long_unchecked_t asid_next;
47745+ atomic_long_unchecked_t asid_wrap;
47746+ atomic_long_unchecked_t asid_reuse;
47747+ atomic_long_unchecked_t intr;
47748+ atomic_long_unchecked_t intr_cbr;
47749+ atomic_long_unchecked_t intr_tfh;
47750+ atomic_long_unchecked_t intr_spurious;
47751+ atomic_long_unchecked_t intr_mm_lock_failed;
47752+ atomic_long_unchecked_t call_os;
47753+ atomic_long_unchecked_t call_os_wait_queue;
47754+ atomic_long_unchecked_t user_flush_tlb;
47755+ atomic_long_unchecked_t user_unload_context;
47756+ atomic_long_unchecked_t user_exception;
47757+ atomic_long_unchecked_t set_context_option;
47758+ atomic_long_unchecked_t check_context_retarget_intr;
47759+ atomic_long_unchecked_t check_context_unload;
47760+ atomic_long_unchecked_t tlb_dropin;
47761+ atomic_long_unchecked_t tlb_preload_page;
47762+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47763+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47764+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47765+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47766+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47767+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47768+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47769+ atomic_long_unchecked_t tfh_stale_on_fault;
47770+ atomic_long_unchecked_t mmu_invalidate_range;
47771+ atomic_long_unchecked_t mmu_invalidate_page;
47772+ atomic_long_unchecked_t flush_tlb;
47773+ atomic_long_unchecked_t flush_tlb_gru;
47774+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47775+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47776
47777- atomic_long_t copy_gpa;
47778- atomic_long_t read_gpa;
47779+ atomic_long_unchecked_t copy_gpa;
47780+ atomic_long_unchecked_t read_gpa;
47781
47782- atomic_long_t mesq_receive;
47783- atomic_long_t mesq_receive_none;
47784- atomic_long_t mesq_send;
47785- atomic_long_t mesq_send_failed;
47786- atomic_long_t mesq_noop;
47787- atomic_long_t mesq_send_unexpected_error;
47788- atomic_long_t mesq_send_lb_overflow;
47789- atomic_long_t mesq_send_qlimit_reached;
47790- atomic_long_t mesq_send_amo_nacked;
47791- atomic_long_t mesq_send_put_nacked;
47792- atomic_long_t mesq_page_overflow;
47793- atomic_long_t mesq_qf_locked;
47794- atomic_long_t mesq_qf_noop_not_full;
47795- atomic_long_t mesq_qf_switch_head_failed;
47796- atomic_long_t mesq_qf_unexpected_error;
47797- atomic_long_t mesq_noop_unexpected_error;
47798- atomic_long_t mesq_noop_lb_overflow;
47799- atomic_long_t mesq_noop_qlimit_reached;
47800- atomic_long_t mesq_noop_amo_nacked;
47801- atomic_long_t mesq_noop_put_nacked;
47802- atomic_long_t mesq_noop_page_overflow;
47803+ atomic_long_unchecked_t mesq_receive;
47804+ atomic_long_unchecked_t mesq_receive_none;
47805+ atomic_long_unchecked_t mesq_send;
47806+ atomic_long_unchecked_t mesq_send_failed;
47807+ atomic_long_unchecked_t mesq_noop;
47808+ atomic_long_unchecked_t mesq_send_unexpected_error;
47809+ atomic_long_unchecked_t mesq_send_lb_overflow;
47810+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47811+ atomic_long_unchecked_t mesq_send_amo_nacked;
47812+ atomic_long_unchecked_t mesq_send_put_nacked;
47813+ atomic_long_unchecked_t mesq_page_overflow;
47814+ atomic_long_unchecked_t mesq_qf_locked;
47815+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47816+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47817+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47818+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47819+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47820+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47821+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47822+ atomic_long_unchecked_t mesq_noop_put_nacked;
47823+ atomic_long_unchecked_t mesq_noop_page_overflow;
47824
47825 };
47826
47827@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47828 tghop_invalidate, mcsop_last};
47829
47830 struct mcs_op_statistic {
47831- atomic_long_t count;
47832- atomic_long_t total;
47833+ atomic_long_unchecked_t count;
47834+ atomic_long_unchecked_t total;
47835 unsigned long max;
47836 };
47837
47838@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47839
47840 #define STAT(id) do { \
47841 if (gru_options & OPT_STATS) \
47842- atomic_long_inc(&gru_stats.id); \
47843+ atomic_long_inc_unchecked(&gru_stats.id); \
47844 } while (0)
47845
47846 #ifdef CONFIG_SGI_GRU_DEBUG
47847diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47848index c862cd4..0d176fe 100644
47849--- a/drivers/misc/sgi-xp/xp.h
47850+++ b/drivers/misc/sgi-xp/xp.h
47851@@ -288,7 +288,7 @@ struct xpc_interface {
47852 xpc_notify_func, void *);
47853 void (*received) (short, int, void *);
47854 enum xp_retval (*partid_to_nasids) (short, void *);
47855-};
47856+} __no_const;
47857
47858 extern struct xpc_interface xpc_interface;
47859
47860diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47861index 01be66d..e3a0c7e 100644
47862--- a/drivers/misc/sgi-xp/xp_main.c
47863+++ b/drivers/misc/sgi-xp/xp_main.c
47864@@ -78,13 +78,13 @@ xpc_notloaded(void)
47865 }
47866
47867 struct xpc_interface xpc_interface = {
47868- (void (*)(int))xpc_notloaded,
47869- (void (*)(int))xpc_notloaded,
47870- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47871- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47872+ .connect = (void (*)(int))xpc_notloaded,
47873+ .disconnect = (void (*)(int))xpc_notloaded,
47874+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47875+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47876 void *))xpc_notloaded,
47877- (void (*)(short, int, void *))xpc_notloaded,
47878- (enum xp_retval(*)(short, void *))xpc_notloaded
47879+ .received = (void (*)(short, int, void *))xpc_notloaded,
47880+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47881 };
47882 EXPORT_SYMBOL_GPL(xpc_interface);
47883
47884diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47885index b94d5f7..7f494c5 100644
47886--- a/drivers/misc/sgi-xp/xpc.h
47887+++ b/drivers/misc/sgi-xp/xpc.h
47888@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47889 void (*received_payload) (struct xpc_channel *, void *);
47890 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47891 };
47892+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47893
47894 /* struct xpc_partition act_state values (for XPC HB) */
47895
47896@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47897 /* found in xpc_main.c */
47898 extern struct device *xpc_part;
47899 extern struct device *xpc_chan;
47900-extern struct xpc_arch_operations xpc_arch_ops;
47901+extern xpc_arch_operations_no_const xpc_arch_ops;
47902 extern int xpc_disengage_timelimit;
47903 extern int xpc_disengage_timedout;
47904 extern int xpc_activate_IRQ_rcvd;
47905diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47906index 82dc574..8539ab2 100644
47907--- a/drivers/misc/sgi-xp/xpc_main.c
47908+++ b/drivers/misc/sgi-xp/xpc_main.c
47909@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47910 .notifier_call = xpc_system_die,
47911 };
47912
47913-struct xpc_arch_operations xpc_arch_ops;
47914+xpc_arch_operations_no_const xpc_arch_ops;
47915
47916 /*
47917 * Timer function to enforce the timelimit on the partition disengage.
47918@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47919
47920 if (((die_args->trapnr == X86_TRAP_MF) ||
47921 (die_args->trapnr == X86_TRAP_XF)) &&
47922- !user_mode_vm(die_args->regs))
47923+ !user_mode(die_args->regs))
47924 xpc_die_deactivate();
47925
47926 break;
47927diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47928index ed2e71a..54c498e 100644
47929--- a/drivers/mmc/card/block.c
47930+++ b/drivers/mmc/card/block.c
47931@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47932 if (idata->ic.postsleep_min_us)
47933 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47934
47935- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47936+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47937 err = -EFAULT;
47938 goto cmd_rel_host;
47939 }
47940diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47941index 18c4afe..43be71e 100644
47942--- a/drivers/mmc/host/dw_mmc.h
47943+++ b/drivers/mmc/host/dw_mmc.h
47944@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
47945 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
47946 int (*parse_dt)(struct dw_mci *host);
47947 int (*execute_tuning)(struct dw_mci_slot *slot);
47948-};
47949+} __do_const;
47950 #endif /* _DW_MMC_H_ */
47951diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47952index 7fe1619..ae0781b 100644
47953--- a/drivers/mmc/host/mmci.c
47954+++ b/drivers/mmc/host/mmci.c
47955@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
47956 mmc->caps |= MMC_CAP_CMD23;
47957
47958 if (variant->busy_detect) {
47959- mmci_ops.card_busy = mmci_card_busy;
47960+ pax_open_kernel();
47961+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47962+ pax_close_kernel();
47963 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47964 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47965 mmc->max_busy_timeout = 0;
47966diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47967index f84cfb0..aebe5d6 100644
47968--- a/drivers/mmc/host/omap_hsmmc.c
47969+++ b/drivers/mmc/host/omap_hsmmc.c
47970@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47971
47972 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47973 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47974- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47975+ pax_open_kernel();
47976+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47977+ pax_close_kernel();
47978 }
47979
47980 pm_runtime_enable(host->dev);
47981diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47982index 10ef824..88461a2 100644
47983--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47984+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47985@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47986 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47987 }
47988
47989- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47990- sdhci_esdhc_ops.platform_execute_tuning =
47991+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47992+ pax_open_kernel();
47993+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47994 esdhc_executing_tuning;
47995+ pax_close_kernel();
47996+ }
47997
47998 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47999 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
48000diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
48001index c6d2dd7..81b1ca3 100644
48002--- a/drivers/mmc/host/sdhci-s3c.c
48003+++ b/drivers/mmc/host/sdhci-s3c.c
48004@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
48005 * we can use overriding functions instead of default.
48006 */
48007 if (sc->no_divider) {
48008- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48009- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48010- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48011+ pax_open_kernel();
48012+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48013+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48014+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48015+ pax_close_kernel();
48016 }
48017
48018 /* It supports additional host capabilities if needed */
48019diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
48020index 423666b..81ff5eb 100644
48021--- a/drivers/mtd/chips/cfi_cmdset_0020.c
48022+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
48023@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
48024 size_t totlen = 0, thislen;
48025 int ret = 0;
48026 size_t buflen = 0;
48027- static char *buffer;
48028+ char *buffer;
48029
48030 if (!ECCBUF_SIZE) {
48031 /* We should fall back to a general writev implementation.
48032diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
48033index f44c606..aa4e804 100644
48034--- a/drivers/mtd/nand/denali.c
48035+++ b/drivers/mtd/nand/denali.c
48036@@ -24,6 +24,7 @@
48037 #include <linux/slab.h>
48038 #include <linux/mtd/mtd.h>
48039 #include <linux/module.h>
48040+#include <linux/slab.h>
48041
48042 #include "denali.h"
48043
48044diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48045index 33f3c3c..d6bbe6a 100644
48046--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48047+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48048@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48049
48050 /* first try to map the upper buffer directly */
48051 if (virt_addr_valid(this->upper_buf) &&
48052- !object_is_on_stack(this->upper_buf)) {
48053+ !object_starts_on_stack(this->upper_buf)) {
48054 sg_init_one(sgl, this->upper_buf, this->upper_len);
48055 ret = dma_map_sg(this->dev, sgl, 1, dr);
48056 if (ret == 0)
48057diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48058index a5dfbfb..8042ab4 100644
48059--- a/drivers/mtd/nftlmount.c
48060+++ b/drivers/mtd/nftlmount.c
48061@@ -24,6 +24,7 @@
48062 #include <asm/errno.h>
48063 #include <linux/delay.h>
48064 #include <linux/slab.h>
48065+#include <linux/sched.h>
48066 #include <linux/mtd/mtd.h>
48067 #include <linux/mtd/nand.h>
48068 #include <linux/mtd/nftl.h>
48069diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48070index c23184a..4115c41 100644
48071--- a/drivers/mtd/sm_ftl.c
48072+++ b/drivers/mtd/sm_ftl.c
48073@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48074 #define SM_CIS_VENDOR_OFFSET 0x59
48075 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48076 {
48077- struct attribute_group *attr_group;
48078+ attribute_group_no_const *attr_group;
48079 struct attribute **attributes;
48080 struct sm_sysfs_attribute *vendor_attribute;
48081 char *vendor;
48082diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48083index 7b11243..b3278a3 100644
48084--- a/drivers/net/bonding/bond_netlink.c
48085+++ b/drivers/net/bonding/bond_netlink.c
48086@@ -585,7 +585,7 @@ nla_put_failure:
48087 return -EMSGSIZE;
48088 }
48089
48090-struct rtnl_link_ops bond_link_ops __read_mostly = {
48091+struct rtnl_link_ops bond_link_ops = {
48092 .kind = "bond",
48093 .priv_size = sizeof(struct bonding),
48094 .setup = bond_setup,
48095diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48096index b3b922a..80bba38 100644
48097--- a/drivers/net/caif/caif_hsi.c
48098+++ b/drivers/net/caif/caif_hsi.c
48099@@ -1444,7 +1444,7 @@ err:
48100 return -ENODEV;
48101 }
48102
48103-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48104+static struct rtnl_link_ops caif_hsi_link_ops = {
48105 .kind = "cfhsi",
48106 .priv_size = sizeof(struct cfhsi),
48107 .setup = cfhsi_setup,
48108diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48109index 58808f65..0bdc7b3 100644
48110--- a/drivers/net/can/Kconfig
48111+++ b/drivers/net/can/Kconfig
48112@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48113
48114 config CAN_FLEXCAN
48115 tristate "Support for Freescale FLEXCAN based chips"
48116- depends on ARM || PPC
48117+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48118 ---help---
48119 Say Y here if you want to support for Freescale FlexCAN.
48120
48121diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48122index b0f6924..59e9640 100644
48123--- a/drivers/net/can/dev.c
48124+++ b/drivers/net/can/dev.c
48125@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48126 return -EOPNOTSUPP;
48127 }
48128
48129-static struct rtnl_link_ops can_link_ops __read_mostly = {
48130+static struct rtnl_link_ops can_link_ops = {
48131 .kind = "can",
48132 .maxtype = IFLA_CAN_MAX,
48133 .policy = can_policy,
48134diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48135index 674f367..ec3a31f 100644
48136--- a/drivers/net/can/vcan.c
48137+++ b/drivers/net/can/vcan.c
48138@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
48139 dev->destructor = free_netdev;
48140 }
48141
48142-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48143+static struct rtnl_link_ops vcan_link_ops = {
48144 .kind = "vcan",
48145 .setup = vcan_setup,
48146 };
48147diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48148index 49adbf1..fff7ff8 100644
48149--- a/drivers/net/dummy.c
48150+++ b/drivers/net/dummy.c
48151@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48152 return 0;
48153 }
48154
48155-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48156+static struct rtnl_link_ops dummy_link_ops = {
48157 .kind = DRV_NAME,
48158 .setup = dummy_setup,
48159 .validate = dummy_validate,
48160diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48161index 0443654..4f0aa18 100644
48162--- a/drivers/net/ethernet/8390/ax88796.c
48163+++ b/drivers/net/ethernet/8390/ax88796.c
48164@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48165 if (ax->plat->reg_offsets)
48166 ei_local->reg_offset = ax->plat->reg_offsets;
48167 else {
48168+ resource_size_t _mem_size = mem_size;
48169+ do_div(_mem_size, 0x18);
48170 ei_local->reg_offset = ax->reg_offsets;
48171 for (ret = 0; ret < 0x18; ret++)
48172- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48173+ ax->reg_offsets[ret] = _mem_size * ret;
48174 }
48175
48176 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48177diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48178index 6725dc0..163549c 100644
48179--- a/drivers/net/ethernet/altera/altera_tse_main.c
48180+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48181@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
48182 return 0;
48183 }
48184
48185-static struct net_device_ops altera_tse_netdev_ops = {
48186+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48187 .ndo_open = tse_open,
48188 .ndo_stop = tse_shutdown,
48189 .ndo_start_xmit = tse_start_xmit,
48190@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48191 ndev->netdev_ops = &altera_tse_netdev_ops;
48192 altera_tse_set_ethtool_ops(ndev);
48193
48194+ pax_open_kernel();
48195 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48196
48197 if (priv->hash_filter)
48198 altera_tse_netdev_ops.ndo_set_rx_mode =
48199 tse_set_rx_mode_hashfilter;
48200+ pax_close_kernel();
48201
48202 /* Scatter/gather IO is not supported,
48203 * so it is turned off
48204diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48205index 29a0927..5a348e24 100644
48206--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48207+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48208@@ -1122,14 +1122,14 @@ do { \
48209 * operations, everything works on mask values.
48210 */
48211 #define XMDIO_READ(_pdata, _mmd, _reg) \
48212- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48213+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48214 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48215
48216 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48217 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48218
48219 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48220- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48221+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48222 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48223
48224 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48225diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48226index 8a50b01..39c1ad0 100644
48227--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48228+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48229@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48230
48231 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48232
48233- pdata->hw_if.config_dcb_tc(pdata);
48234+ pdata->hw_if->config_dcb_tc(pdata);
48235
48236 return 0;
48237 }
48238@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48239
48240 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48241
48242- pdata->hw_if.config_dcb_pfc(pdata);
48243+ pdata->hw_if->config_dcb_pfc(pdata);
48244
48245 return 0;
48246 }
48247diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48248index d81fc6b..6f8ab25 100644
48249--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48250+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48251@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48252
48253 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48254 {
48255- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48256+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48257 struct xgbe_channel *channel;
48258 struct xgbe_ring *ring;
48259 struct xgbe_ring_data *rdata;
48260@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48261
48262 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48263 {
48264- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48265+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48266 struct xgbe_channel *channel;
48267 struct xgbe_ring *ring;
48268 struct xgbe_ring_desc *rdesc;
48269@@ -620,17 +620,12 @@ err_out:
48270 return 0;
48271 }
48272
48273-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48274-{
48275- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48276-
48277- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48278- desc_if->free_ring_resources = xgbe_free_ring_resources;
48279- desc_if->map_tx_skb = xgbe_map_tx_skb;
48280- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48281- desc_if->unmap_rdata = xgbe_unmap_rdata;
48282- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48283- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48284-
48285- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48286-}
48287+const struct xgbe_desc_if default_xgbe_desc_if = {
48288+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48289+ .free_ring_resources = xgbe_free_ring_resources,
48290+ .map_tx_skb = xgbe_map_tx_skb,
48291+ .map_rx_buffer = xgbe_map_rx_buffer,
48292+ .unmap_rdata = xgbe_unmap_rdata,
48293+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48294+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48295+};
48296diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48297index 400757b..d8c53f6 100644
48298--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48299+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48300@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48301
48302 static int xgbe_init(struct xgbe_prv_data *pdata)
48303 {
48304- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48305+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48306 int ret;
48307
48308 DBGPR("-->xgbe_init\n");
48309@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48310 return 0;
48311 }
48312
48313-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48314-{
48315- DBGPR("-->xgbe_init_function_ptrs\n");
48316-
48317- hw_if->tx_complete = xgbe_tx_complete;
48318-
48319- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
48320- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
48321- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
48322- hw_if->set_mac_address = xgbe_set_mac_address;
48323-
48324- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48325- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48326-
48327- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48328- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48329- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48330- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48331- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48332-
48333- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48334- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48335-
48336- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48337- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48338- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48339-
48340- hw_if->enable_tx = xgbe_enable_tx;
48341- hw_if->disable_tx = xgbe_disable_tx;
48342- hw_if->enable_rx = xgbe_enable_rx;
48343- hw_if->disable_rx = xgbe_disable_rx;
48344-
48345- hw_if->powerup_tx = xgbe_powerup_tx;
48346- hw_if->powerdown_tx = xgbe_powerdown_tx;
48347- hw_if->powerup_rx = xgbe_powerup_rx;
48348- hw_if->powerdown_rx = xgbe_powerdown_rx;
48349-
48350- hw_if->dev_xmit = xgbe_dev_xmit;
48351- hw_if->dev_read = xgbe_dev_read;
48352- hw_if->enable_int = xgbe_enable_int;
48353- hw_if->disable_int = xgbe_disable_int;
48354- hw_if->init = xgbe_init;
48355- hw_if->exit = xgbe_exit;
48356+const struct xgbe_hw_if default_xgbe_hw_if = {
48357+ .tx_complete = xgbe_tx_complete,
48358+
48359+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
48360+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
48361+ .add_mac_addresses = xgbe_add_mac_addresses,
48362+ .set_mac_address = xgbe_set_mac_address,
48363+
48364+ .enable_rx_csum = xgbe_enable_rx_csum,
48365+ .disable_rx_csum = xgbe_disable_rx_csum,
48366+
48367+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48368+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48369+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48370+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48371+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48372+
48373+ .read_mmd_regs = xgbe_read_mmd_regs,
48374+ .write_mmd_regs = xgbe_write_mmd_regs,
48375+
48376+ .set_gmii_speed = xgbe_set_gmii_speed,
48377+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48378+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48379+
48380+ .enable_tx = xgbe_enable_tx,
48381+ .disable_tx = xgbe_disable_tx,
48382+ .enable_rx = xgbe_enable_rx,
48383+ .disable_rx = xgbe_disable_rx,
48384+
48385+ .powerup_tx = xgbe_powerup_tx,
48386+ .powerdown_tx = xgbe_powerdown_tx,
48387+ .powerup_rx = xgbe_powerup_rx,
48388+ .powerdown_rx = xgbe_powerdown_rx,
48389+
48390+ .dev_xmit = xgbe_dev_xmit,
48391+ .dev_read = xgbe_dev_read,
48392+ .enable_int = xgbe_enable_int,
48393+ .disable_int = xgbe_disable_int,
48394+ .init = xgbe_init,
48395+ .exit = xgbe_exit,
48396
48397 /* Descriptor related Sequences have to be initialized here */
48398- hw_if->tx_desc_init = xgbe_tx_desc_init;
48399- hw_if->rx_desc_init = xgbe_rx_desc_init;
48400- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48401- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48402- hw_if->is_last_desc = xgbe_is_last_desc;
48403- hw_if->is_context_desc = xgbe_is_context_desc;
48404- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48405+ .tx_desc_init = xgbe_tx_desc_init,
48406+ .rx_desc_init = xgbe_rx_desc_init,
48407+ .tx_desc_reset = xgbe_tx_desc_reset,
48408+ .rx_desc_reset = xgbe_rx_desc_reset,
48409+ .is_last_desc = xgbe_is_last_desc,
48410+ .is_context_desc = xgbe_is_context_desc,
48411+ .tx_start_xmit = xgbe_tx_start_xmit,
48412
48413 /* For FLOW ctrl */
48414- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48415- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48416+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48417+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48418
48419 /* For RX coalescing */
48420- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48421- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48422- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48423- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48424+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48425+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48426+ .usec_to_riwt = xgbe_usec_to_riwt,
48427+ .riwt_to_usec = xgbe_riwt_to_usec,
48428
48429 /* For RX and TX threshold config */
48430- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48431- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48432+ .config_rx_threshold = xgbe_config_rx_threshold,
48433+ .config_tx_threshold = xgbe_config_tx_threshold,
48434
48435 /* For RX and TX Store and Forward Mode config */
48436- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48437- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48438+ .config_rsf_mode = xgbe_config_rsf_mode,
48439+ .config_tsf_mode = xgbe_config_tsf_mode,
48440
48441 /* For TX DMA Operating on Second Frame config */
48442- hw_if->config_osp_mode = xgbe_config_osp_mode;
48443+ .config_osp_mode = xgbe_config_osp_mode,
48444
48445 /* For RX and TX PBL config */
48446- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48447- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48448- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48449- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48450- hw_if->config_pblx8 = xgbe_config_pblx8;
48451+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48452+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48453+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48454+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48455+ .config_pblx8 = xgbe_config_pblx8,
48456
48457 /* For MMC statistics support */
48458- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48459- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48460- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48461+ .tx_mmc_int = xgbe_tx_mmc_int,
48462+ .rx_mmc_int = xgbe_rx_mmc_int,
48463+ .read_mmc_stats = xgbe_read_mmc_stats,
48464
48465 /* For PTP config */
48466- hw_if->config_tstamp = xgbe_config_tstamp;
48467- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48468- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48469- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48470- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48471+ .config_tstamp = xgbe_config_tstamp,
48472+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48473+ .set_tstamp_time = xgbe_set_tstamp_time,
48474+ .get_tstamp_time = xgbe_get_tstamp_time,
48475+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48476
48477 /* For Data Center Bridging config */
48478- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48479- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48480+ .config_dcb_tc = xgbe_config_dcb_tc,
48481+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48482
48483 /* For Receive Side Scaling */
48484- hw_if->enable_rss = xgbe_enable_rss;
48485- hw_if->disable_rss = xgbe_disable_rss;
48486- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48487- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48488-
48489- DBGPR("<--xgbe_init_function_ptrs\n");
48490-}
48491+ .enable_rss = xgbe_enable_rss,
48492+ .disable_rss = xgbe_disable_rss,
48493+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48494+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48495+};
48496diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48497index 885b02b..4b31a4c 100644
48498--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48499+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48500@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48501 * support, tell it now
48502 */
48503 if (ring->tx.xmit_more)
48504- pdata->hw_if.tx_start_xmit(channel, ring);
48505+ pdata->hw_if->tx_start_xmit(channel, ring);
48506
48507 return NETDEV_TX_BUSY;
48508 }
48509@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48510
48511 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48512 {
48513- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48514+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48515 struct xgbe_channel *channel;
48516 enum xgbe_int int_id;
48517 unsigned int i;
48518@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48519
48520 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48521 {
48522- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48523+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48524 struct xgbe_channel *channel;
48525 enum xgbe_int int_id;
48526 unsigned int i;
48527@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48528 static irqreturn_t xgbe_isr(int irq, void *data)
48529 {
48530 struct xgbe_prv_data *pdata = data;
48531- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48532+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48533 struct xgbe_channel *channel;
48534 unsigned int dma_isr, dma_ch_isr;
48535 unsigned int mac_isr, mac_tssr;
48536@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48537
48538 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48539 {
48540- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48541+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48542
48543 DBGPR("-->xgbe_init_tx_coalesce\n");
48544
48545@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48546
48547 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48548 {
48549- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48550+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48551
48552 DBGPR("-->xgbe_init_rx_coalesce\n");
48553
48554@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48555
48556 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48557 {
48558- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48559+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48560 struct xgbe_channel *channel;
48561 struct xgbe_ring *ring;
48562 struct xgbe_ring_data *rdata;
48563@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48564
48565 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48566 {
48567- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48568+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48569 struct xgbe_channel *channel;
48570 struct xgbe_ring *ring;
48571 struct xgbe_ring_data *rdata;
48572@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48573 static void xgbe_adjust_link(struct net_device *netdev)
48574 {
48575 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48576- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48577+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48578 struct phy_device *phydev = pdata->phydev;
48579 int new_state = 0;
48580
48581@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48582 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48583 {
48584 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48585- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48586+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48587 unsigned long flags;
48588
48589 DBGPR("-->xgbe_powerdown\n");
48590@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48591 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48592 {
48593 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48594- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48595+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48596 unsigned long flags;
48597
48598 DBGPR("-->xgbe_powerup\n");
48599@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48600
48601 static int xgbe_start(struct xgbe_prv_data *pdata)
48602 {
48603- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48604+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48605 struct net_device *netdev = pdata->netdev;
48606 int ret;
48607
48608@@ -976,7 +976,7 @@ err_napi:
48609
48610 static void xgbe_stop(struct xgbe_prv_data *pdata)
48611 {
48612- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48613+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48614 struct xgbe_channel *channel;
48615 struct net_device *netdev = pdata->netdev;
48616 struct netdev_queue *txq;
48617@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48618 return -ERANGE;
48619 }
48620
48621- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48622+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48623
48624 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48625
48626@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48627 static int xgbe_open(struct net_device *netdev)
48628 {
48629 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48630- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48631+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48632 int ret;
48633
48634 DBGPR("-->xgbe_open\n");
48635@@ -1424,7 +1424,7 @@ err_phy_init:
48636 static int xgbe_close(struct net_device *netdev)
48637 {
48638 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48639- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48640+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48641
48642 DBGPR("-->xgbe_close\n");
48643
48644@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
48645 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48646 {
48647 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48648- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48649- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48650+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48651+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48652 struct xgbe_channel *channel;
48653 struct xgbe_ring *ring;
48654 struct xgbe_packet_data *packet;
48655@@ -1521,7 +1521,7 @@ tx_netdev_return:
48656 static void xgbe_set_rx_mode(struct net_device *netdev)
48657 {
48658 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48659- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48660+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48661 unsigned int pr_mode, am_mode;
48662
48663 DBGPR("-->xgbe_set_rx_mode\n");
48664@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48665 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48666 {
48667 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48668- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48669+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48670 struct sockaddr *saddr = addr;
48671
48672 DBGPR("-->xgbe_set_mac_address\n");
48673@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48674
48675 DBGPR("-->%s\n", __func__);
48676
48677- pdata->hw_if.read_mmc_stats(pdata);
48678+ pdata->hw_if->read_mmc_stats(pdata);
48679
48680 s->rx_packets = pstats->rxframecount_gb;
48681 s->rx_bytes = pstats->rxoctetcount_gb;
48682@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48683 u16 vid)
48684 {
48685 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48686- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48687+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48688
48689 DBGPR("-->%s\n", __func__);
48690
48691@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48692 u16 vid)
48693 {
48694 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48695- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48696+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48697
48698 DBGPR("-->%s\n", __func__);
48699
48700@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
48701 netdev_features_t features)
48702 {
48703 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48704- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48705+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48706 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48707 int ret = 0;
48708
48709@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48710 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48711 {
48712 struct xgbe_prv_data *pdata = channel->pdata;
48713- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48714- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48715+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48716+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48717 struct xgbe_ring *ring = channel->rx_ring;
48718 struct xgbe_ring_data *rdata;
48719
48720@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48721 static int xgbe_tx_poll(struct xgbe_channel *channel)
48722 {
48723 struct xgbe_prv_data *pdata = channel->pdata;
48724- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48725- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48726+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48727+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48728 struct xgbe_ring *ring = channel->tx_ring;
48729 struct xgbe_ring_data *rdata;
48730 struct xgbe_ring_desc *rdesc;
48731@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48732 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48733 {
48734 struct xgbe_prv_data *pdata = channel->pdata;
48735- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48736+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48737 struct xgbe_ring *ring = channel->rx_ring;
48738 struct xgbe_ring_data *rdata;
48739 struct xgbe_packet_data *packet;
48740diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48741index ebf4893..a8f51c6 100644
48742--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48743+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48744@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48745
48746 DBGPR("-->%s\n", __func__);
48747
48748- pdata->hw_if.read_mmc_stats(pdata);
48749+ pdata->hw_if->read_mmc_stats(pdata);
48750 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48751 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48752 *data++ = *(u64 *)stat;
48753@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48754 struct ethtool_coalesce *ec)
48755 {
48756 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48757- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48758+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48759 unsigned int riwt;
48760
48761 DBGPR("-->xgbe_get_coalesce\n");
48762@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48763 struct ethtool_coalesce *ec)
48764 {
48765 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48766- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48767+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48768 unsigned int rx_frames, rx_riwt, rx_usecs;
48769 unsigned int tx_frames, tx_usecs;
48770
48771@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48772 const u8 *key, const u8 hfunc)
48773 {
48774 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48775- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48776+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48777 unsigned int ret;
48778
48779 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48780diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48781index 32dd651..225cca3 100644
48782--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48783+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48784@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48785 DBGPR("<--xgbe_default_config\n");
48786 }
48787
48788-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48789-{
48790- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48791- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48792-}
48793-
48794 #ifdef CONFIG_ACPI
48795 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48796 {
48797@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
48798 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48799
48800 /* Set all the function pointers */
48801- xgbe_init_all_fptrs(pdata);
48802- hw_if = &pdata->hw_if;
48803- desc_if = &pdata->desc_if;
48804+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48805+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48806
48807 /* Issue software reset to device */
48808 hw_if->exit(pdata);
48809diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48810index 59e267f..0842a88 100644
48811--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48812+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48813@@ -126,7 +126,7 @@
48814 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48815 {
48816 struct xgbe_prv_data *pdata = mii->priv;
48817- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48818+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48819 int mmd_data;
48820
48821 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48822@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48823 u16 mmd_val)
48824 {
48825 struct xgbe_prv_data *pdata = mii->priv;
48826- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48827+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48828 int mmd_data = mmd_val;
48829
48830 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48831diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48832index f326178..8bd7daf 100644
48833--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48834+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48835@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48836 tstamp_cc);
48837 u64 nsec;
48838
48839- nsec = pdata->hw_if.get_tstamp_time(pdata);
48840+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48841
48842 return nsec;
48843 }
48844@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48845
48846 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48847
48848- pdata->hw_if.update_tstamp_addend(pdata, addend);
48849+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48850
48851 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48852
48853diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48854index 13e8f95..1d8beef 100644
48855--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48856+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48857@@ -675,8 +675,8 @@ struct xgbe_prv_data {
48858 int dev_irq;
48859 unsigned int per_channel_irq;
48860
48861- struct xgbe_hw_if hw_if;
48862- struct xgbe_desc_if desc_if;
48863+ struct xgbe_hw_if *hw_if;
48864+ struct xgbe_desc_if *desc_if;
48865
48866 /* AXI DMA settings */
48867 unsigned int coherent;
48868@@ -798,6 +798,9 @@ struct xgbe_prv_data {
48869 #endif
48870 };
48871
48872+extern const struct xgbe_hw_if default_xgbe_hw_if;
48873+extern const struct xgbe_desc_if default_xgbe_desc_if;
48874+
48875 /* Function prototypes*/
48876
48877 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48878diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48879index adcacda..fa6e0ae 100644
48880--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48881+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48882@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48883 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48884 {
48885 /* RX_MODE controlling object */
48886- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48887+ bnx2x_init_rx_mode_obj(bp);
48888
48889 /* multicast configuration controlling object */
48890 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48891diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48892index 07cdf9b..b08ecc7 100644
48893--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48894+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48895@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48896 return rc;
48897 }
48898
48899-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48900- struct bnx2x_rx_mode_obj *o)
48901+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48902 {
48903 if (CHIP_IS_E1x(bp)) {
48904- o->wait_comp = bnx2x_empty_rx_mode_wait;
48905- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48906+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48907+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48908 } else {
48909- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48910- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48911+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48912+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48913 }
48914 }
48915
48916diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48917index 86baecb..ff3bb46 100644
48918--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48919+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48920@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48921
48922 /********************* RX MODE ****************/
48923
48924-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48925- struct bnx2x_rx_mode_obj *o);
48926+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48927
48928 /**
48929 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48930diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48931index 31c9f82..e65e986 100644
48932--- a/drivers/net/ethernet/broadcom/tg3.h
48933+++ b/drivers/net/ethernet/broadcom/tg3.h
48934@@ -150,6 +150,7 @@
48935 #define CHIPREV_ID_5750_A0 0x4000
48936 #define CHIPREV_ID_5750_A1 0x4001
48937 #define CHIPREV_ID_5750_A3 0x4003
48938+#define CHIPREV_ID_5750_C1 0x4201
48939 #define CHIPREV_ID_5750_C2 0x4202
48940 #define CHIPREV_ID_5752_A0_HW 0x5000
48941 #define CHIPREV_ID_5752_A0 0x6000
48942diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48943index 903466e..b285864 100644
48944--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48945+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48946@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
48947 }
48948
48949 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48950- bna_cb_ioceth_enable,
48951- bna_cb_ioceth_disable,
48952- bna_cb_ioceth_hbfail,
48953- bna_cb_ioceth_reset
48954+ .enable_cbfn = bna_cb_ioceth_enable,
48955+ .disable_cbfn = bna_cb_ioceth_disable,
48956+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48957+ .reset_cbfn = bna_cb_ioceth_reset
48958 };
48959
48960 static void bna_attr_init(struct bna_ioceth *ioceth)
48961diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48962index 8cffcdf..aadf043 100644
48963--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48964+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48965@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48966 */
48967 struct l2t_skb_cb {
48968 arp_failure_handler_func arp_failure_handler;
48969-};
48970+} __no_const;
48971
48972 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48973
48974diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48975index d929951..a2c23f5 100644
48976--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48977+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48978@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48979
48980 int i;
48981 struct adapter *ap = netdev2adap(dev);
48982- static const unsigned int *reg_ranges;
48983+ const unsigned int *reg_ranges;
48984 int arr_size = 0, buf_size = 0;
48985
48986 if (is_t4(ap->params.chip)) {
48987diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48988index badff18..e15c4ec 100644
48989--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48990+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48991@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48992 for (i=0; i<ETH_ALEN; i++) {
48993 tmp.addr[i] = dev->dev_addr[i];
48994 }
48995- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48996+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48997 break;
48998
48999 case DE4X5_SET_HWADDR: /* Set the hardware address */
49000@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49001 spin_lock_irqsave(&lp->lock, flags);
49002 memcpy(&statbuf, &lp->pktStats, ioc->len);
49003 spin_unlock_irqrestore(&lp->lock, flags);
49004- if (copy_to_user(ioc->data, &statbuf, ioc->len))
49005+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
49006 return -EFAULT;
49007 break;
49008 }
49009diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
49010index e6b790f..051ba2d 100644
49011--- a/drivers/net/ethernet/emulex/benet/be_main.c
49012+++ b/drivers/net/ethernet/emulex/benet/be_main.c
49013@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
49014
49015 if (wrapped)
49016 newacc += 65536;
49017- ACCESS_ONCE(*acc) = newacc;
49018+ ACCESS_ONCE_RW(*acc) = newacc;
49019 }
49020
49021 static void populate_erx_stats(struct be_adapter *adapter,
49022diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
49023index 6d0c5d5..55be363 100644
49024--- a/drivers/net/ethernet/faraday/ftgmac100.c
49025+++ b/drivers/net/ethernet/faraday/ftgmac100.c
49026@@ -30,6 +30,8 @@
49027 #include <linux/netdevice.h>
49028 #include <linux/phy.h>
49029 #include <linux/platform_device.h>
49030+#include <linux/interrupt.h>
49031+#include <linux/irqreturn.h>
49032 #include <net/ip.h>
49033
49034 #include "ftgmac100.h"
49035diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
49036index dce5f7b..2433466 100644
49037--- a/drivers/net/ethernet/faraday/ftmac100.c
49038+++ b/drivers/net/ethernet/faraday/ftmac100.c
49039@@ -31,6 +31,8 @@
49040 #include <linux/module.h>
49041 #include <linux/netdevice.h>
49042 #include <linux/platform_device.h>
49043+#include <linux/interrupt.h>
49044+#include <linux/irqreturn.h>
49045
49046 #include "ftmac100.h"
49047
49048diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49049index fabcfa1..188fd22 100644
49050--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49051+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49052@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49053 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49054
49055 /* Update the base adjustement value. */
49056- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49057+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49058 smp_mb(); /* Force the above update. */
49059 }
49060
49061diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49062index 79c00f5..8da39f6 100644
49063--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49064+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49065@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49066 }
49067
49068 /* update the base incval used to calculate frequency adjustment */
49069- ACCESS_ONCE(adapter->base_incval) = incval;
49070+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49071 smp_mb();
49072
49073 /* need lock to prevent incorrect read while modifying cyclecounter */
49074diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49075index 8c234ec..757331f 100644
49076--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49077+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49078@@ -468,8 +468,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49079 wmb();
49080
49081 /* we want to dirty this cache line once */
49082- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49083- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49084+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49085+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49086
49087 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49088
49089diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49090index 6223930..975033d 100644
49091--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49092+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49093@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49094 struct __vxge_hw_fifo *fifo;
49095 struct vxge_hw_fifo_config *config;
49096 u32 txdl_size, txdl_per_memblock;
49097- struct vxge_hw_mempool_cbs fifo_mp_callback;
49098+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49099+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49100+ };
49101+
49102 struct __vxge_hw_virtualpath *vpath;
49103
49104 if ((vp == NULL) || (attr == NULL)) {
49105@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49106 goto exit;
49107 }
49108
49109- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49110-
49111 fifo->mempool =
49112 __vxge_hw_mempool_create(vpath->hldev,
49113 fifo->config->memblock_size,
49114diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49115index 2bb48d5..d1a865d 100644
49116--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49117+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49118@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49119 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49120 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49121 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49122- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49123+ pax_open_kernel();
49124+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49125+ pax_close_kernel();
49126 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49127 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49128 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49129diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49130index be7d7a6..a8983f8 100644
49131--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49132+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49133@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49134 case QLCNIC_NON_PRIV_FUNC:
49135 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49136 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49137- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49138+ pax_open_kernel();
49139+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49140+ pax_close_kernel();
49141 break;
49142 case QLCNIC_PRIV_FUNC:
49143 ahw->op_mode = QLCNIC_PRIV_FUNC;
49144 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49145- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49146+ pax_open_kernel();
49147+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49148+ pax_close_kernel();
49149 break;
49150 case QLCNIC_MGMT_FUNC:
49151 ahw->op_mode = QLCNIC_MGMT_FUNC;
49152 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49153- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49154+ pax_open_kernel();
49155+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49156+ pax_close_kernel();
49157 break;
49158 default:
49159 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49160diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49161index 332bb8a..e6adcd1 100644
49162--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49163+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49164@@ -1285,7 +1285,7 @@ flash_temp:
49165 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49166 {
49167 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49168- static const struct qlcnic_dump_operations *fw_dump_ops;
49169+ const struct qlcnic_dump_operations *fw_dump_ops;
49170 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49171 u32 entry_offset, dump, no_entries, buf_offset = 0;
49172 int i, k, ops_cnt, ops_index, dump_size = 0;
49173diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49174index c70ab40..00b28e0 100644
49175--- a/drivers/net/ethernet/realtek/r8169.c
49176+++ b/drivers/net/ethernet/realtek/r8169.c
49177@@ -788,22 +788,22 @@ struct rtl8169_private {
49178 struct mdio_ops {
49179 void (*write)(struct rtl8169_private *, int, int);
49180 int (*read)(struct rtl8169_private *, int);
49181- } mdio_ops;
49182+ } __no_const mdio_ops;
49183
49184 struct pll_power_ops {
49185 void (*down)(struct rtl8169_private *);
49186 void (*up)(struct rtl8169_private *);
49187- } pll_power_ops;
49188+ } __no_const pll_power_ops;
49189
49190 struct jumbo_ops {
49191 void (*enable)(struct rtl8169_private *);
49192 void (*disable)(struct rtl8169_private *);
49193- } jumbo_ops;
49194+ } __no_const jumbo_ops;
49195
49196 struct csi_ops {
49197 void (*write)(struct rtl8169_private *, int, int);
49198 u32 (*read)(struct rtl8169_private *, int);
49199- } csi_ops;
49200+ } __no_const csi_ops;
49201
49202 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49203 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49204diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49205index 6b861e3..204ac86 100644
49206--- a/drivers/net/ethernet/sfc/ptp.c
49207+++ b/drivers/net/ethernet/sfc/ptp.c
49208@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49209 ptp->start.dma_addr);
49210
49211 /* Clear flag that signals MC ready */
49212- ACCESS_ONCE(*start) = 0;
49213+ ACCESS_ONCE_RW(*start) = 0;
49214 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49215 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49216 EFX_BUG_ON_PARANOID(rc);
49217diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
49218index 10b6173..b605dfd5 100644
49219--- a/drivers/net/ethernet/sfc/selftest.c
49220+++ b/drivers/net/ethernet/sfc/selftest.c
49221@@ -46,7 +46,7 @@ struct efx_loopback_payload {
49222 struct iphdr ip;
49223 struct udphdr udp;
49224 __be16 iteration;
49225- const char msg[64];
49226+ char msg[64];
49227 } __packed;
49228
49229 /* Loopback test source MAC address */
49230diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49231index 08c483b..2c4a553 100644
49232--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49233+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49234@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49235
49236 writel(value, ioaddr + MMC_CNTRL);
49237
49238- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49239- MMC_CNTRL, value);
49240+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49241+// MMC_CNTRL, value);
49242 }
49243
49244 /* To mask all all interrupts.*/
49245diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49246index 17e2766..c332f1e 100644
49247--- a/drivers/net/ethernet/via/via-rhine.c
49248+++ b/drivers/net/ethernet/via/via-rhine.c
49249@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
49250 }
49251 };
49252
49253-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49254+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49255 {
49256 .ident = "EPIA-M",
49257 .matches = {
49258diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49259index 384ca4f..dd7d4f9 100644
49260--- a/drivers/net/hyperv/hyperv_net.h
49261+++ b/drivers/net/hyperv/hyperv_net.h
49262@@ -171,7 +171,7 @@ struct rndis_device {
49263 enum rndis_device_state state;
49264 bool link_state;
49265 bool link_change;
49266- atomic_t new_req_id;
49267+ atomic_unchecked_t new_req_id;
49268
49269 spinlock_t request_lock;
49270 struct list_head req_list;
49271diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49272index 7816d98..7890614 100644
49273--- a/drivers/net/hyperv/rndis_filter.c
49274+++ b/drivers/net/hyperv/rndis_filter.c
49275@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49276 * template
49277 */
49278 set = &rndis_msg->msg.set_req;
49279- set->req_id = atomic_inc_return(&dev->new_req_id);
49280+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49281
49282 /* Add to the request list */
49283 spin_lock_irqsave(&dev->request_lock, flags);
49284@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49285
49286 /* Setup the rndis set */
49287 halt = &request->request_msg.msg.halt_req;
49288- halt->req_id = atomic_inc_return(&dev->new_req_id);
49289+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49290
49291 /* Ignore return since this msg is optional. */
49292 rndis_filter_send_request(dev, request);
49293diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49294index 34f846b..4a0d5b1 100644
49295--- a/drivers/net/ifb.c
49296+++ b/drivers/net/ifb.c
49297@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49298 return 0;
49299 }
49300
49301-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49302+static struct rtnl_link_ops ifb_link_ops = {
49303 .kind = "ifb",
49304 .priv_size = sizeof(struct ifb_private),
49305 .setup = ifb_setup,
49306diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49307index 1df38bd..4bc20b0 100644
49308--- a/drivers/net/macvlan.c
49309+++ b/drivers/net/macvlan.c
49310@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49311 free_nskb:
49312 kfree_skb(nskb);
49313 err:
49314- atomic_long_inc(&skb->dev->rx_dropped);
49315+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49316 }
49317
49318 static void macvlan_flush_sources(struct macvlan_port *port,
49319@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49320 int macvlan_link_register(struct rtnl_link_ops *ops)
49321 {
49322 /* common fields */
49323- ops->priv_size = sizeof(struct macvlan_dev);
49324- ops->validate = macvlan_validate;
49325- ops->maxtype = IFLA_MACVLAN_MAX;
49326- ops->policy = macvlan_policy;
49327- ops->changelink = macvlan_changelink;
49328- ops->get_size = macvlan_get_size;
49329- ops->fill_info = macvlan_fill_info;
49330+ pax_open_kernel();
49331+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49332+ *(void **)&ops->validate = macvlan_validate;
49333+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49334+ *(const void **)&ops->policy = macvlan_policy;
49335+ *(void **)&ops->changelink = macvlan_changelink;
49336+ *(void **)&ops->get_size = macvlan_get_size;
49337+ *(void **)&ops->fill_info = macvlan_fill_info;
49338+ pax_close_kernel();
49339
49340 return rtnl_link_register(ops);
49341 };
49342@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49343 return NOTIFY_DONE;
49344 }
49345
49346-static struct notifier_block macvlan_notifier_block __read_mostly = {
49347+static struct notifier_block macvlan_notifier_block = {
49348 .notifier_call = macvlan_device_event,
49349 };
49350
49351diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49352index 27ecc5c..f636328 100644
49353--- a/drivers/net/macvtap.c
49354+++ b/drivers/net/macvtap.c
49355@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49356 dev->tx_queue_len = TUN_READQ_SIZE;
49357 }
49358
49359-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49360+static struct rtnl_link_ops macvtap_link_ops = {
49361 .kind = "macvtap",
49362 .setup = macvtap_setup,
49363 .newlink = macvtap_newlink,
49364@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49365
49366 ret = 0;
49367 u = q->flags;
49368- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49369+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49370 put_user(u, &ifr->ifr_flags))
49371 ret = -EFAULT;
49372 macvtap_put_vlan(vlan);
49373@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49374 return NOTIFY_DONE;
49375 }
49376
49377-static struct notifier_block macvtap_notifier_block __read_mostly = {
49378+static struct notifier_block macvtap_notifier_block = {
49379 .notifier_call = macvtap_device_event,
49380 };
49381
49382diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49383index 34924df..a747360 100644
49384--- a/drivers/net/nlmon.c
49385+++ b/drivers/net/nlmon.c
49386@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49387 return 0;
49388 }
49389
49390-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49391+static struct rtnl_link_ops nlmon_link_ops = {
49392 .kind = "nlmon",
49393 .priv_size = sizeof(struct nlmon),
49394 .setup = nlmon_setup,
49395diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49396index bdfe51f..e7845c7 100644
49397--- a/drivers/net/phy/phy_device.c
49398+++ b/drivers/net/phy/phy_device.c
49399@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49400 * zero on success.
49401 *
49402 */
49403-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49404+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49405 struct phy_c45_device_ids *c45_ids) {
49406 int phy_reg;
49407 int i, reg_addr;
49408@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49409 * its return value is in turn returned.
49410 *
49411 */
49412-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49413+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49414 bool is_c45, struct phy_c45_device_ids *c45_ids)
49415 {
49416 int phy_reg;
49417@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49418 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49419 {
49420 struct phy_c45_device_ids c45_ids = {0};
49421- u32 phy_id = 0;
49422+ int phy_id = 0;
49423 int r;
49424
49425 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49426diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49427index 9d15566..5ad4ef6 100644
49428--- a/drivers/net/ppp/ppp_generic.c
49429+++ b/drivers/net/ppp/ppp_generic.c
49430@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49431 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49432 struct ppp_stats stats;
49433 struct ppp_comp_stats cstats;
49434- char *vers;
49435
49436 switch (cmd) {
49437 case SIOCGPPPSTATS:
49438@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49439 break;
49440
49441 case SIOCGPPPVER:
49442- vers = PPP_VERSION;
49443- if (copy_to_user(addr, vers, strlen(vers) + 1))
49444+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49445 break;
49446 err = 0;
49447 break;
49448diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49449index 079f7ad..b2a2bfa7 100644
49450--- a/drivers/net/slip/slhc.c
49451+++ b/drivers/net/slip/slhc.c
49452@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49453 register struct tcphdr *thp;
49454 register struct iphdr *ip;
49455 register struct cstate *cs;
49456- int len, hdrlen;
49457+ long len, hdrlen;
49458 unsigned char *cp = icp;
49459
49460 /* We've got a compressed packet; read the change byte */
49461diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49462index 7d39484..d58499d 100644
49463--- a/drivers/net/team/team.c
49464+++ b/drivers/net/team/team.c
49465@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
49466 return TEAM_DEFAULT_NUM_RX_QUEUES;
49467 }
49468
49469-static struct rtnl_link_ops team_link_ops __read_mostly = {
49470+static struct rtnl_link_ops team_link_ops = {
49471 .kind = DRV_NAME,
49472 .priv_size = sizeof(struct team),
49473 .setup = team_setup,
49474@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
49475 return NOTIFY_DONE;
49476 }
49477
49478-static struct notifier_block team_notifier_block __read_mostly = {
49479+static struct notifier_block team_notifier_block = {
49480 .notifier_call = team_device_event,
49481 };
49482
49483diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49484index 857dca4..642f532 100644
49485--- a/drivers/net/tun.c
49486+++ b/drivers/net/tun.c
49487@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49488 return -EINVAL;
49489 }
49490
49491-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49492+static struct rtnl_link_ops tun_link_ops = {
49493 .kind = DRV_NAME,
49494 .priv_size = sizeof(struct tun_struct),
49495 .setup = tun_setup,
49496@@ -1830,7 +1830,7 @@ unlock:
49497 }
49498
49499 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49500- unsigned long arg, int ifreq_len)
49501+ unsigned long arg, size_t ifreq_len)
49502 {
49503 struct tun_file *tfile = file->private_data;
49504 struct tun_struct *tun;
49505@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49506 int le;
49507 int ret;
49508
49509+ if (ifreq_len > sizeof ifr)
49510+ return -EFAULT;
49511+
49512 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49513 if (copy_from_user(&ifr, argp, ifreq_len))
49514 return -EFAULT;
49515diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49516index 778e915..58c4d95 100644
49517--- a/drivers/net/usb/hso.c
49518+++ b/drivers/net/usb/hso.c
49519@@ -70,7 +70,7 @@
49520 #include <asm/byteorder.h>
49521 #include <linux/serial_core.h>
49522 #include <linux/serial.h>
49523-
49524+#include <asm/local.h>
49525
49526 #define MOD_AUTHOR "Option Wireless"
49527 #define MOD_DESCRIPTION "USB High Speed Option driver"
49528@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49529 struct urb *urb;
49530
49531 urb = serial->rx_urb[0];
49532- if (serial->port.count > 0) {
49533+ if (atomic_read(&serial->port.count) > 0) {
49534 count = put_rxbuf_data(urb, serial);
49535 if (count == -1)
49536 return;
49537@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49538 DUMP1(urb->transfer_buffer, urb->actual_length);
49539
49540 /* Anyone listening? */
49541- if (serial->port.count == 0)
49542+ if (atomic_read(&serial->port.count) == 0)
49543 return;
49544
49545 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49546@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49547 tty_port_tty_set(&serial->port, tty);
49548
49549 /* check for port already opened, if not set the termios */
49550- serial->port.count++;
49551- if (serial->port.count == 1) {
49552+ if (atomic_inc_return(&serial->port.count) == 1) {
49553 serial->rx_state = RX_IDLE;
49554 /* Force default termio settings */
49555 _hso_serial_set_termios(tty, NULL);
49556@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49557 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49558 if (result) {
49559 hso_stop_serial_device(serial->parent);
49560- serial->port.count--;
49561+ atomic_dec(&serial->port.count);
49562 } else {
49563 kref_get(&serial->parent->ref);
49564 }
49565@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49566
49567 /* reset the rts and dtr */
49568 /* do the actual close */
49569- serial->port.count--;
49570+ atomic_dec(&serial->port.count);
49571
49572- if (serial->port.count <= 0) {
49573- serial->port.count = 0;
49574+ if (atomic_read(&serial->port.count) <= 0) {
49575+ atomic_set(&serial->port.count, 0);
49576 tty_port_tty_set(&serial->port, NULL);
49577 if (!usb_gone)
49578 hso_stop_serial_device(serial->parent);
49579@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49580
49581 /* the actual setup */
49582 spin_lock_irqsave(&serial->serial_lock, flags);
49583- if (serial->port.count)
49584+ if (atomic_read(&serial->port.count))
49585 _hso_serial_set_termios(tty, old);
49586 else
49587 tty->termios = *old;
49588@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
49589 D1("Pending read interrupt on port %d\n", i);
49590 spin_lock(&serial->serial_lock);
49591 if (serial->rx_state == RX_IDLE &&
49592- serial->port.count > 0) {
49593+ atomic_read(&serial->port.count) > 0) {
49594 /* Setup and send a ctrl req read on
49595 * port i */
49596 if (!serial->rx_urb_filled[0]) {
49597@@ -3053,7 +3052,7 @@ static int hso_resume(struct usb_interface *iface)
49598 /* Start all serial ports */
49599 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49600 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49601- if (dev2ser(serial_table[i])->port.count) {
49602+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49603 result =
49604 hso_start_serial_device(serial_table[i], GFP_NOIO);
49605 hso_kick_transmit(dev2ser(serial_table[i]));
49606diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49607index 9f7c0ab..1577b4a 100644
49608--- a/drivers/net/usb/r8152.c
49609+++ b/drivers/net/usb/r8152.c
49610@@ -601,7 +601,7 @@ struct r8152 {
49611 void (*unload)(struct r8152 *);
49612 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49613 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49614- } rtl_ops;
49615+ } __no_const rtl_ops;
49616
49617 int intr_interval;
49618 u32 saved_wolopts;
49619diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49620index a2515887..6d13233 100644
49621--- a/drivers/net/usb/sierra_net.c
49622+++ b/drivers/net/usb/sierra_net.c
49623@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49624 /* atomic counter partially included in MAC address to make sure 2 devices
49625 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49626 */
49627-static atomic_t iface_counter = ATOMIC_INIT(0);
49628+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49629
49630 /*
49631 * SYNC Timer Delay definition used to set the expiry time
49632@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49633 dev->net->netdev_ops = &sierra_net_device_ops;
49634
49635 /* change MAC addr to include, ifacenum, and to be unique */
49636- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49637+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49638 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49639
49640 /* we will have to manufacture ethernet headers, prepare template */
49641diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
49642index 777757a..395a767 100644
49643--- a/drivers/net/usb/usbnet.c
49644+++ b/drivers/net/usb/usbnet.c
49645@@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
49646 struct net_device *net)
49647 {
49648 struct usbnet *dev = netdev_priv(net);
49649- int length;
49650+ unsigned int length;
49651 struct urb *urb = NULL;
49652 struct skb_data *entry;
49653 struct driver_info *info = dev->driver_info;
49654@@ -1413,7 +1413,7 @@ not_drop:
49655 }
49656 } else
49657 netif_dbg(dev, tx_queued, dev->net,
49658- "> tx, len %d, type 0x%x\n", length, skb->protocol);
49659+ "> tx, len %u, type 0x%x\n", length, skb->protocol);
49660 #ifdef CONFIG_PM
49661 deferred:
49662 #endif
49663diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49664index 59b0e97..a6ed579 100644
49665--- a/drivers/net/virtio_net.c
49666+++ b/drivers/net/virtio_net.c
49667@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49668 #define RECEIVE_AVG_WEIGHT 64
49669
49670 /* Minimum alignment for mergeable packet buffers. */
49671-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49672+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49673
49674 #define VIRTNET_DRIVER_VERSION "1.0.0"
49675
49676diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49677index fceb637..37c70fd 100644
49678--- a/drivers/net/vxlan.c
49679+++ b/drivers/net/vxlan.c
49680@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49681 return vxlan->net;
49682 }
49683
49684-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49685+static struct rtnl_link_ops vxlan_link_ops = {
49686 .kind = "vxlan",
49687 .maxtype = IFLA_VXLAN_MAX,
49688 .policy = vxlan_policy,
49689@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49690 return NOTIFY_DONE;
49691 }
49692
49693-static struct notifier_block vxlan_notifier_block __read_mostly = {
49694+static struct notifier_block vxlan_notifier_block = {
49695 .notifier_call = vxlan_lowerdev_event,
49696 };
49697
49698diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49699index 5920c99..ff2e4a5 100644
49700--- a/drivers/net/wan/lmc/lmc_media.c
49701+++ b/drivers/net/wan/lmc/lmc_media.c
49702@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49703 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49704
49705 lmc_media_t lmc_ds3_media = {
49706- lmc_ds3_init, /* special media init stuff */
49707- lmc_ds3_default, /* reset to default state */
49708- lmc_ds3_set_status, /* reset status to state provided */
49709- lmc_dummy_set_1, /* set clock source */
49710- lmc_dummy_set2_1, /* set line speed */
49711- lmc_ds3_set_100ft, /* set cable length */
49712- lmc_ds3_set_scram, /* set scrambler */
49713- lmc_ds3_get_link_status, /* get link status */
49714- lmc_dummy_set_1, /* set link status */
49715- lmc_ds3_set_crc_length, /* set CRC length */
49716- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49717- lmc_ds3_watchdog
49718+ .init = lmc_ds3_init, /* special media init stuff */
49719+ .defaults = lmc_ds3_default, /* reset to default state */
49720+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49721+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49722+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49723+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49724+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49725+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49726+ .set_link_status = lmc_dummy_set_1, /* set link status */
49727+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49728+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49729+ .watchdog = lmc_ds3_watchdog
49730 };
49731
49732 lmc_media_t lmc_hssi_media = {
49733- lmc_hssi_init, /* special media init stuff */
49734- lmc_hssi_default, /* reset to default state */
49735- lmc_hssi_set_status, /* reset status to state provided */
49736- lmc_hssi_set_clock, /* set clock source */
49737- lmc_dummy_set2_1, /* set line speed */
49738- lmc_dummy_set_1, /* set cable length */
49739- lmc_dummy_set_1, /* set scrambler */
49740- lmc_hssi_get_link_status, /* get link status */
49741- lmc_hssi_set_link_status, /* set link status */
49742- lmc_hssi_set_crc_length, /* set CRC length */
49743- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49744- lmc_hssi_watchdog
49745+ .init = lmc_hssi_init, /* special media init stuff */
49746+ .defaults = lmc_hssi_default, /* reset to default state */
49747+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49748+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49749+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49750+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49751+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49752+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49753+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49754+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49755+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49756+ .watchdog = lmc_hssi_watchdog
49757 };
49758
49759-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49760- lmc_ssi_default, /* reset to default state */
49761- lmc_ssi_set_status, /* reset status to state provided */
49762- lmc_ssi_set_clock, /* set clock source */
49763- lmc_ssi_set_speed, /* set line speed */
49764- lmc_dummy_set_1, /* set cable length */
49765- lmc_dummy_set_1, /* set scrambler */
49766- lmc_ssi_get_link_status, /* get link status */
49767- lmc_ssi_set_link_status, /* set link status */
49768- lmc_ssi_set_crc_length, /* set CRC length */
49769- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49770- lmc_ssi_watchdog
49771+lmc_media_t lmc_ssi_media = {
49772+ .init = lmc_ssi_init, /* special media init stuff */
49773+ .defaults = lmc_ssi_default, /* reset to default state */
49774+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49775+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49776+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49777+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49778+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49779+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49780+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49781+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49782+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49783+ .watchdog = lmc_ssi_watchdog
49784 };
49785
49786 lmc_media_t lmc_t1_media = {
49787- lmc_t1_init, /* special media init stuff */
49788- lmc_t1_default, /* reset to default state */
49789- lmc_t1_set_status, /* reset status to state provided */
49790- lmc_t1_set_clock, /* set clock source */
49791- lmc_dummy_set2_1, /* set line speed */
49792- lmc_dummy_set_1, /* set cable length */
49793- lmc_dummy_set_1, /* set scrambler */
49794- lmc_t1_get_link_status, /* get link status */
49795- lmc_dummy_set_1, /* set link status */
49796- lmc_t1_set_crc_length, /* set CRC length */
49797- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49798- lmc_t1_watchdog
49799+ .init = lmc_t1_init, /* special media init stuff */
49800+ .defaults = lmc_t1_default, /* reset to default state */
49801+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49802+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49803+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49804+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49805+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49806+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49807+ .set_link_status = lmc_dummy_set_1, /* set link status */
49808+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49809+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49810+ .watchdog = lmc_t1_watchdog
49811 };
49812
49813 static void
49814diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49815index feacc3b..5bac0de 100644
49816--- a/drivers/net/wan/z85230.c
49817+++ b/drivers/net/wan/z85230.c
49818@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49819
49820 struct z8530_irqhandler z8530_sync =
49821 {
49822- z8530_rx,
49823- z8530_tx,
49824- z8530_status
49825+ .rx = z8530_rx,
49826+ .tx = z8530_tx,
49827+ .status = z8530_status
49828 };
49829
49830 EXPORT_SYMBOL(z8530_sync);
49831@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49832 }
49833
49834 static struct z8530_irqhandler z8530_dma_sync = {
49835- z8530_dma_rx,
49836- z8530_dma_tx,
49837- z8530_dma_status
49838+ .rx = z8530_dma_rx,
49839+ .tx = z8530_dma_tx,
49840+ .status = z8530_dma_status
49841 };
49842
49843 static struct z8530_irqhandler z8530_txdma_sync = {
49844- z8530_rx,
49845- z8530_dma_tx,
49846- z8530_dma_status
49847+ .rx = z8530_rx,
49848+ .tx = z8530_dma_tx,
49849+ .status = z8530_dma_status
49850 };
49851
49852 /**
49853@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49854
49855 struct z8530_irqhandler z8530_nop=
49856 {
49857- z8530_rx_clear,
49858- z8530_tx_clear,
49859- z8530_status_clear
49860+ .rx = z8530_rx_clear,
49861+ .tx = z8530_tx_clear,
49862+ .status = z8530_status_clear
49863 };
49864
49865
49866diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49867index 0b60295..b8bfa5b 100644
49868--- a/drivers/net/wimax/i2400m/rx.c
49869+++ b/drivers/net/wimax/i2400m/rx.c
49870@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49871 if (i2400m->rx_roq == NULL)
49872 goto error_roq_alloc;
49873
49874- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49875+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49876 GFP_KERNEL);
49877 if (rd == NULL) {
49878 result = -ENOMEM;
49879diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49880index e71a2ce..2268d61 100644
49881--- a/drivers/net/wireless/airo.c
49882+++ b/drivers/net/wireless/airo.c
49883@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49884 struct airo_info *ai = dev->ml_priv;
49885 int ridcode;
49886 int enabled;
49887- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49888+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49889 unsigned char *iobuf;
49890
49891 /* Only super-user can write RIDs */
49892diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49893index da92bfa..5a9001a 100644
49894--- a/drivers/net/wireless/at76c50x-usb.c
49895+++ b/drivers/net/wireless/at76c50x-usb.c
49896@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49897 }
49898
49899 /* Convert timeout from the DFU status to jiffies */
49900-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49901+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49902 {
49903 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49904 | (s->poll_timeout[1] << 8)
49905diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49906index 2fd9e18..3f55bdd 100644
49907--- a/drivers/net/wireless/ath/ath10k/htc.c
49908+++ b/drivers/net/wireless/ath/ath10k/htc.c
49909@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49910 /* registered target arrival callback from the HIF layer */
49911 int ath10k_htc_init(struct ath10k *ar)
49912 {
49913- struct ath10k_hif_cb htc_callbacks;
49914+ static struct ath10k_hif_cb htc_callbacks = {
49915+ .rx_completion = ath10k_htc_rx_completion_handler,
49916+ .tx_completion = ath10k_htc_tx_completion_handler,
49917+ };
49918 struct ath10k_htc_ep *ep = NULL;
49919 struct ath10k_htc *htc = &ar->htc;
49920
49921@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49922 ath10k_htc_reset_endpoint_states(htc);
49923
49924 /* setup HIF layer callbacks */
49925- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49926- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49927 htc->ar = ar;
49928
49929 /* Get HIF default pipe for HTC message exchange */
49930diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49931index 527179c..a890150 100644
49932--- a/drivers/net/wireless/ath/ath10k/htc.h
49933+++ b/drivers/net/wireless/ath/ath10k/htc.h
49934@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49935
49936 struct ath10k_htc_ops {
49937 void (*target_send_suspend_complete)(struct ath10k *ar);
49938-};
49939+} __no_const;
49940
49941 struct ath10k_htc_ep_ops {
49942 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49943 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49944 void (*ep_tx_credits)(struct ath10k *);
49945-};
49946+} __no_const;
49947
49948 /* service connection information */
49949 struct ath10k_htc_svc_conn_req {
49950diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49951index f816909..e56cd8b 100644
49952--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49953+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49954@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49955 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49956 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49957
49958- ACCESS_ONCE(ads->ds_link) = i->link;
49959- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49960+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49961+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49962
49963 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49964 ctl6 = SM(i->keytype, AR_EncrType);
49965@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49966
49967 if ((i->is_first || i->is_last) &&
49968 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49969- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49970+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49971 | set11nTries(i->rates, 1)
49972 | set11nTries(i->rates, 2)
49973 | set11nTries(i->rates, 3)
49974 | (i->dur_update ? AR_DurUpdateEna : 0)
49975 | SM(0, AR_BurstDur);
49976
49977- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49978+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49979 | set11nRate(i->rates, 1)
49980 | set11nRate(i->rates, 2)
49981 | set11nRate(i->rates, 3);
49982 } else {
49983- ACCESS_ONCE(ads->ds_ctl2) = 0;
49984- ACCESS_ONCE(ads->ds_ctl3) = 0;
49985+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49986+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49987 }
49988
49989 if (!i->is_first) {
49990- ACCESS_ONCE(ads->ds_ctl0) = 0;
49991- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49992- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49993+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49994+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49995+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49996 return;
49997 }
49998
49999@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50000 break;
50001 }
50002
50003- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50004+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50005 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50006 | SM(i->txpower[0], AR_XmitPower0)
50007 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50008@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50009 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50010 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50011
50012- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50013- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50014+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50015+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50016
50017 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50018 return;
50019
50020- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50021+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50022 | set11nPktDurRTSCTS(i->rates, 1);
50023
50024- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50025+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50026 | set11nPktDurRTSCTS(i->rates, 3);
50027
50028- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50029+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50030 | set11nRateFlags(i->rates, 1)
50031 | set11nRateFlags(i->rates, 2)
50032 | set11nRateFlags(i->rates, 3)
50033 | SM(i->rtscts_rate, AR_RTSCTSRate);
50034
50035- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50036- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50037- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50038+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50039+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50040+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50041 }
50042
50043 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50044diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50045index da84b70..83e4978 100644
50046--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50047+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50048@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50049 (i->qcu << AR_TxQcuNum_S) | desc_len;
50050
50051 checksum += val;
50052- ACCESS_ONCE(ads->info) = val;
50053+ ACCESS_ONCE_RW(ads->info) = val;
50054
50055 checksum += i->link;
50056- ACCESS_ONCE(ads->link) = i->link;
50057+ ACCESS_ONCE_RW(ads->link) = i->link;
50058
50059 checksum += i->buf_addr[0];
50060- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50061+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50062 checksum += i->buf_addr[1];
50063- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50064+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50065 checksum += i->buf_addr[2];
50066- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50067+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50068 checksum += i->buf_addr[3];
50069- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50070+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50071
50072 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50073- ACCESS_ONCE(ads->ctl3) = val;
50074+ ACCESS_ONCE_RW(ads->ctl3) = val;
50075 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50076- ACCESS_ONCE(ads->ctl5) = val;
50077+ ACCESS_ONCE_RW(ads->ctl5) = val;
50078 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50079- ACCESS_ONCE(ads->ctl7) = val;
50080+ ACCESS_ONCE_RW(ads->ctl7) = val;
50081 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50082- ACCESS_ONCE(ads->ctl9) = val;
50083+ ACCESS_ONCE_RW(ads->ctl9) = val;
50084
50085 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50086- ACCESS_ONCE(ads->ctl10) = checksum;
50087+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50088
50089 if (i->is_first || i->is_last) {
50090- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50091+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50092 | set11nTries(i->rates, 1)
50093 | set11nTries(i->rates, 2)
50094 | set11nTries(i->rates, 3)
50095 | (i->dur_update ? AR_DurUpdateEna : 0)
50096 | SM(0, AR_BurstDur);
50097
50098- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50099+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50100 | set11nRate(i->rates, 1)
50101 | set11nRate(i->rates, 2)
50102 | set11nRate(i->rates, 3);
50103 } else {
50104- ACCESS_ONCE(ads->ctl13) = 0;
50105- ACCESS_ONCE(ads->ctl14) = 0;
50106+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50107+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50108 }
50109
50110 ads->ctl20 = 0;
50111@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50112
50113 ctl17 = SM(i->keytype, AR_EncrType);
50114 if (!i->is_first) {
50115- ACCESS_ONCE(ads->ctl11) = 0;
50116- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50117- ACCESS_ONCE(ads->ctl15) = 0;
50118- ACCESS_ONCE(ads->ctl16) = 0;
50119- ACCESS_ONCE(ads->ctl17) = ctl17;
50120- ACCESS_ONCE(ads->ctl18) = 0;
50121- ACCESS_ONCE(ads->ctl19) = 0;
50122+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50123+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50124+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50125+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50126+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50127+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50128+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50129 return;
50130 }
50131
50132- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50133+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50134 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50135 | SM(i->txpower[0], AR_XmitPower0)
50136 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50137@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50138 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50139 ctl12 |= SM(val, AR_PAPRDChainMask);
50140
50141- ACCESS_ONCE(ads->ctl12) = ctl12;
50142- ACCESS_ONCE(ads->ctl17) = ctl17;
50143+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50144+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50145
50146- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50147+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50148 | set11nPktDurRTSCTS(i->rates, 1);
50149
50150- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50151+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50152 | set11nPktDurRTSCTS(i->rates, 3);
50153
50154- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50155+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50156 | set11nRateFlags(i->rates, 1)
50157 | set11nRateFlags(i->rates, 2)
50158 | set11nRateFlags(i->rates, 3)
50159 | SM(i->rtscts_rate, AR_RTSCTSRate);
50160
50161- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50162+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50163
50164- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50165- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50166- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50167+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50168+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50169+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50170 }
50171
50172 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50173diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50174index e82e570..8c3cf90 100644
50175--- a/drivers/net/wireless/ath/ath9k/hw.h
50176+++ b/drivers/net/wireless/ath/ath9k/hw.h
50177@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
50178
50179 /* ANI */
50180 void (*ani_cache_ini_regs)(struct ath_hw *ah);
50181-};
50182+} __no_const;
50183
50184 /**
50185 * struct ath_spec_scan - parameters for Atheros spectral scan
50186@@ -722,7 +722,7 @@ struct ath_hw_ops {
50187 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50188 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50189 #endif
50190-};
50191+} __no_const;
50192
50193 struct ath_nf_limits {
50194 s16 max;
50195diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50196index 9ede991..a8f08fb 100644
50197--- a/drivers/net/wireless/ath/ath9k/main.c
50198+++ b/drivers/net/wireless/ath/ath9k/main.c
50199@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
50200 if (!ath9k_is_chanctx_enabled())
50201 return;
50202
50203- ath9k_ops.hw_scan = ath9k_hw_scan;
50204- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50205- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50206- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50207- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50208- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50209- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50210- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50211- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50212- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50213+ pax_open_kernel();
50214+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50215+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50216+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50217+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50218+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50219+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50220+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50221+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50222+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50223+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50224+ pax_close_kernel();
50225 }
50226
50227 #endif
50228diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50229index 058a9f2..d5cb1ba 100644
50230--- a/drivers/net/wireless/b43/phy_lp.c
50231+++ b/drivers/net/wireless/b43/phy_lp.c
50232@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50233 {
50234 struct ssb_bus *bus = dev->dev->sdev->bus;
50235
50236- static const struct b206x_channel *chandata = NULL;
50237+ const struct b206x_channel *chandata = NULL;
50238 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50239 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50240 u16 old_comm15, scale;
50241diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50242index e566580..2c218ca 100644
50243--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50244+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50245@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50246 */
50247 if (il3945_mod_params.disable_hw_scan) {
50248 D_INFO("Disabling hw_scan\n");
50249- il3945_mac_ops.hw_scan = NULL;
50250+ pax_open_kernel();
50251+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50252+ pax_close_kernel();
50253 }
50254
50255 D_INFO("*** LOAD DRIVER ***\n");
50256diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50257index 0ffb6ff..c0b7f0e 100644
50258--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50259+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50260@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50261 {
50262 struct iwl_priv *priv = file->private_data;
50263 char buf[64];
50264- int buf_size;
50265+ size_t buf_size;
50266 u32 offset, len;
50267
50268 memset(buf, 0, sizeof(buf));
50269@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50270 struct iwl_priv *priv = file->private_data;
50271
50272 char buf[8];
50273- int buf_size;
50274+ size_t buf_size;
50275 u32 reset_flag;
50276
50277 memset(buf, 0, sizeof(buf));
50278@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50279 {
50280 struct iwl_priv *priv = file->private_data;
50281 char buf[8];
50282- int buf_size;
50283+ size_t buf_size;
50284 int ht40;
50285
50286 memset(buf, 0, sizeof(buf));
50287@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50288 {
50289 struct iwl_priv *priv = file->private_data;
50290 char buf[8];
50291- int buf_size;
50292+ size_t buf_size;
50293 int value;
50294
50295 memset(buf, 0, sizeof(buf));
50296@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50297 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50298 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50299
50300-static const char *fmt_value = " %-30s %10u\n";
50301-static const char *fmt_hex = " %-30s 0x%02X\n";
50302-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50303-static const char *fmt_header =
50304+static const char fmt_value[] = " %-30s %10u\n";
50305+static const char fmt_hex[] = " %-30s 0x%02X\n";
50306+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50307+static const char fmt_header[] =
50308 "%-32s current cumulative delta max\n";
50309
50310 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50311@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50312 {
50313 struct iwl_priv *priv = file->private_data;
50314 char buf[8];
50315- int buf_size;
50316+ size_t buf_size;
50317 int clear;
50318
50319 memset(buf, 0, sizeof(buf));
50320@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50321 {
50322 struct iwl_priv *priv = file->private_data;
50323 char buf[8];
50324- int buf_size;
50325+ size_t buf_size;
50326 int trace;
50327
50328 memset(buf, 0, sizeof(buf));
50329@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50330 {
50331 struct iwl_priv *priv = file->private_data;
50332 char buf[8];
50333- int buf_size;
50334+ size_t buf_size;
50335 int missed;
50336
50337 memset(buf, 0, sizeof(buf));
50338@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50339
50340 struct iwl_priv *priv = file->private_data;
50341 char buf[8];
50342- int buf_size;
50343+ size_t buf_size;
50344 int plcp;
50345
50346 memset(buf, 0, sizeof(buf));
50347@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50348
50349 struct iwl_priv *priv = file->private_data;
50350 char buf[8];
50351- int buf_size;
50352+ size_t buf_size;
50353 int flush;
50354
50355 memset(buf, 0, sizeof(buf));
50356@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50357
50358 struct iwl_priv *priv = file->private_data;
50359 char buf[8];
50360- int buf_size;
50361+ size_t buf_size;
50362 int rts;
50363
50364 if (!priv->cfg->ht_params)
50365@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50366 {
50367 struct iwl_priv *priv = file->private_data;
50368 char buf[8];
50369- int buf_size;
50370+ size_t buf_size;
50371
50372 memset(buf, 0, sizeof(buf));
50373 buf_size = min(count, sizeof(buf) - 1);
50374@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50375 struct iwl_priv *priv = file->private_data;
50376 u32 event_log_flag;
50377 char buf[8];
50378- int buf_size;
50379+ size_t buf_size;
50380
50381 /* check that the interface is up */
50382 if (!iwl_is_ready(priv))
50383@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50384 struct iwl_priv *priv = file->private_data;
50385 char buf[8];
50386 u32 calib_disabled;
50387- int buf_size;
50388+ size_t buf_size;
50389
50390 memset(buf, 0, sizeof(buf));
50391 buf_size = min(count, sizeof(buf) - 1);
50392diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50393index cb72edb..242b24f 100644
50394--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50395+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50396@@ -1837,7 +1837,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50397 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50398
50399 char buf[8];
50400- int buf_size;
50401+ size_t buf_size;
50402 u32 reset_flag;
50403
50404 memset(buf, 0, sizeof(buf));
50405@@ -1858,7 +1858,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50406 {
50407 struct iwl_trans *trans = file->private_data;
50408 char buf[8];
50409- int buf_size;
50410+ size_t buf_size;
50411 int csr;
50412
50413 memset(buf, 0, sizeof(buf));
50414diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50415index 8908be6..fe97ddd 100644
50416--- a/drivers/net/wireless/mac80211_hwsim.c
50417+++ b/drivers/net/wireless/mac80211_hwsim.c
50418@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
50419 if (channels < 1)
50420 return -EINVAL;
50421
50422- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50423- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50424- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50425- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50426- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50427- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50428- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50429- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50430- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50431- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50432- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50433- mac80211_hwsim_assign_vif_chanctx;
50434- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50435- mac80211_hwsim_unassign_vif_chanctx;
50436+ pax_open_kernel();
50437+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50438+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50439+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50440+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50441+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50442+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50443+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50444+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50445+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50446+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50447+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50448+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50449+ pax_close_kernel();
50450
50451 spin_lock_init(&hwsim_radio_lock);
50452 INIT_LIST_HEAD(&hwsim_radios);
50453diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50454index 60d44ce..884dd1c 100644
50455--- a/drivers/net/wireless/rndis_wlan.c
50456+++ b/drivers/net/wireless/rndis_wlan.c
50457@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50458
50459 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50460
50461- if (rts_threshold < 0 || rts_threshold > 2347)
50462+ if (rts_threshold > 2347)
50463 rts_threshold = 2347;
50464
50465 tmp = cpu_to_le32(rts_threshold);
50466diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50467index 9bb398b..b0cc047 100644
50468--- a/drivers/net/wireless/rt2x00/rt2x00.h
50469+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50470@@ -375,7 +375,7 @@ struct rt2x00_intf {
50471 * for hardware which doesn't support hardware
50472 * sequence counting.
50473 */
50474- atomic_t seqno;
50475+ atomic_unchecked_t seqno;
50476 };
50477
50478 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50479diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50480index 68b620b..92ecd9e 100644
50481--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50482+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50483@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50484 * sequence counter given by mac80211.
50485 */
50486 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50487- seqno = atomic_add_return(0x10, &intf->seqno);
50488+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50489 else
50490- seqno = atomic_read(&intf->seqno);
50491+ seqno = atomic_read_unchecked(&intf->seqno);
50492
50493 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50494 hdr->seq_ctrl |= cpu_to_le16(seqno);
50495diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50496index b661f896..ddf7d2b 100644
50497--- a/drivers/net/wireless/ti/wl1251/sdio.c
50498+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50499@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50500
50501 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50502
50503- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50504- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50505+ pax_open_kernel();
50506+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50507+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50508+ pax_close_kernel();
50509
50510 wl1251_info("using dedicated interrupt line");
50511 } else {
50512- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50513- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50514+ pax_open_kernel();
50515+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50516+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50517+ pax_close_kernel();
50518
50519 wl1251_info("using SDIO interrupt");
50520 }
50521diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50522index 144d1f8..7030936 100644
50523--- a/drivers/net/wireless/ti/wl12xx/main.c
50524+++ b/drivers/net/wireless/ti/wl12xx/main.c
50525@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50526 sizeof(wl->conf.mem));
50527
50528 /* read data preparation is only needed by wl127x */
50529- wl->ops->prepare_read = wl127x_prepare_read;
50530+ pax_open_kernel();
50531+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50532+ pax_close_kernel();
50533
50534 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50535 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50536@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50537 sizeof(wl->conf.mem));
50538
50539 /* read data preparation is only needed by wl127x */
50540- wl->ops->prepare_read = wl127x_prepare_read;
50541+ pax_open_kernel();
50542+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50543+ pax_close_kernel();
50544
50545 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50546 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50547diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50548index 717c4f5..a813aeb 100644
50549--- a/drivers/net/wireless/ti/wl18xx/main.c
50550+++ b/drivers/net/wireless/ti/wl18xx/main.c
50551@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50552 }
50553
50554 if (!checksum_param) {
50555- wl18xx_ops.set_rx_csum = NULL;
50556- wl18xx_ops.init_vif = NULL;
50557+ pax_open_kernel();
50558+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50559+ *(void **)&wl18xx_ops.init_vif = NULL;
50560+ pax_close_kernel();
50561 }
50562
50563 /* Enable 11a Band only if we have 5G antennas */
50564diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50565index a912dc0..a8225ba 100644
50566--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50567+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50568@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50569 {
50570 struct zd_usb *usb = urb->context;
50571 struct zd_usb_interrupt *intr = &usb->intr;
50572- int len;
50573+ unsigned int len;
50574 u16 int_num;
50575
50576 ZD_ASSERT(in_interrupt());
50577diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50578index ce2e2cf..f81e500 100644
50579--- a/drivers/nfc/nfcwilink.c
50580+++ b/drivers/nfc/nfcwilink.c
50581@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50582
50583 static int nfcwilink_probe(struct platform_device *pdev)
50584 {
50585- static struct nfcwilink *drv;
50586+ struct nfcwilink *drv;
50587 int rc;
50588 __u32 protocols;
50589
50590diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50591index 24d3d24..ff70d28 100644
50592--- a/drivers/nfc/st21nfca/st21nfca.c
50593+++ b/drivers/nfc/st21nfca/st21nfca.c
50594@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
50595 goto exit;
50596 }
50597
50598- gate = uid_skb->data;
50599+ memcpy(gate, uid_skb->data, uid_skb->len);
50600 *len = uid_skb->len;
50601 exit:
50602 kfree_skb(uid_skb);
50603diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50604index 3a896c9..ac7b1c8 100644
50605--- a/drivers/of/fdt.c
50606+++ b/drivers/of/fdt.c
50607@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
50608 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50609 return 0;
50610 }
50611- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50612+ pax_open_kernel();
50613+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50614+ pax_close_kernel();
50615 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50616 }
50617 late_initcall(of_fdt_raw_init);
50618diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50619index d93b2b6..ae50401 100644
50620--- a/drivers/oprofile/buffer_sync.c
50621+++ b/drivers/oprofile/buffer_sync.c
50622@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50623 if (cookie == NO_COOKIE)
50624 offset = pc;
50625 if (cookie == INVALID_COOKIE) {
50626- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50627+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50628 offset = pc;
50629 }
50630 if (cookie != last_cookie) {
50631@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50632 /* add userspace sample */
50633
50634 if (!mm) {
50635- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50636+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50637 return 0;
50638 }
50639
50640 cookie = lookup_dcookie(mm, s->eip, &offset);
50641
50642 if (cookie == INVALID_COOKIE) {
50643- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50644+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50645 return 0;
50646 }
50647
50648@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
50649 /* ignore backtraces if failed to add a sample */
50650 if (state == sb_bt_start) {
50651 state = sb_bt_ignore;
50652- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50653+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50654 }
50655 }
50656 release_mm(mm);
50657diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50658index c0cc4e7..44d4e54 100644
50659--- a/drivers/oprofile/event_buffer.c
50660+++ b/drivers/oprofile/event_buffer.c
50661@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50662 }
50663
50664 if (buffer_pos == buffer_size) {
50665- atomic_inc(&oprofile_stats.event_lost_overflow);
50666+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50667 return;
50668 }
50669
50670diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50671index ed2c3ec..deda85a 100644
50672--- a/drivers/oprofile/oprof.c
50673+++ b/drivers/oprofile/oprof.c
50674@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50675 if (oprofile_ops.switch_events())
50676 return;
50677
50678- atomic_inc(&oprofile_stats.multiplex_counter);
50679+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50680 start_switch_worker();
50681 }
50682
50683diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50684index ee2cfce..7f8f699 100644
50685--- a/drivers/oprofile/oprofile_files.c
50686+++ b/drivers/oprofile/oprofile_files.c
50687@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50688
50689 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50690
50691-static ssize_t timeout_read(struct file *file, char __user *buf,
50692+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50693 size_t count, loff_t *offset)
50694 {
50695 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50696diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50697index 59659ce..6c860a0 100644
50698--- a/drivers/oprofile/oprofile_stats.c
50699+++ b/drivers/oprofile/oprofile_stats.c
50700@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50701 cpu_buf->sample_invalid_eip = 0;
50702 }
50703
50704- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50705- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50706- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50707- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50708- atomic_set(&oprofile_stats.multiplex_counter, 0);
50709+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50710+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50711+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50712+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50713+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50714 }
50715
50716
50717diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50718index 1fc622b..8c48fc3 100644
50719--- a/drivers/oprofile/oprofile_stats.h
50720+++ b/drivers/oprofile/oprofile_stats.h
50721@@ -13,11 +13,11 @@
50722 #include <linux/atomic.h>
50723
50724 struct oprofile_stat_struct {
50725- atomic_t sample_lost_no_mm;
50726- atomic_t sample_lost_no_mapping;
50727- atomic_t bt_lost_no_mapping;
50728- atomic_t event_lost_overflow;
50729- atomic_t multiplex_counter;
50730+ atomic_unchecked_t sample_lost_no_mm;
50731+ atomic_unchecked_t sample_lost_no_mapping;
50732+ atomic_unchecked_t bt_lost_no_mapping;
50733+ atomic_unchecked_t event_lost_overflow;
50734+ atomic_unchecked_t multiplex_counter;
50735 };
50736
50737 extern struct oprofile_stat_struct oprofile_stats;
50738diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50739index 3f49345..c750d0b 100644
50740--- a/drivers/oprofile/oprofilefs.c
50741+++ b/drivers/oprofile/oprofilefs.c
50742@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50743
50744 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50745 {
50746- atomic_t *val = file->private_data;
50747- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50748+ atomic_unchecked_t *val = file->private_data;
50749+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50750 }
50751
50752
50753@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50754
50755
50756 int oprofilefs_create_ro_atomic(struct dentry *root,
50757- char const *name, atomic_t *val)
50758+ char const *name, atomic_unchecked_t *val)
50759 {
50760 return __oprofilefs_create_file(root, name,
50761 &atomic_ro_fops, 0444, val);
50762diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50763index bdef916..88c7dee 100644
50764--- a/drivers/oprofile/timer_int.c
50765+++ b/drivers/oprofile/timer_int.c
50766@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50767 return NOTIFY_OK;
50768 }
50769
50770-static struct notifier_block __refdata oprofile_cpu_notifier = {
50771+static struct notifier_block oprofile_cpu_notifier = {
50772 .notifier_call = oprofile_cpu_notify,
50773 };
50774
50775diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50776index 3b47080..6cd05dd 100644
50777--- a/drivers/parport/procfs.c
50778+++ b/drivers/parport/procfs.c
50779@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50780
50781 *ppos += len;
50782
50783- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50784+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50785 }
50786
50787 #ifdef CONFIG_PARPORT_1284
50788@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50789
50790 *ppos += len;
50791
50792- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50793+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50794 }
50795 #endif /* IEEE1284.3 support. */
50796
50797diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50798index ba46e58..90cfc24 100644
50799--- a/drivers/pci/host/pci-host-generic.c
50800+++ b/drivers/pci/host/pci-host-generic.c
50801@@ -26,9 +26,9 @@
50802 #include <linux/platform_device.h>
50803
50804 struct gen_pci_cfg_bus_ops {
50805+ struct pci_ops ops;
50806 u32 bus_shift;
50807- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50808-};
50809+} __do_const;
50810
50811 struct gen_pci_cfg_windows {
50812 struct resource res;
50813@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50814 }
50815
50816 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50817+ .ops = {
50818+ .map_bus = gen_pci_map_cfg_bus_cam,
50819+ .read = pci_generic_config_read,
50820+ .write = pci_generic_config_write,
50821+ },
50822 .bus_shift = 16,
50823- .map_bus = gen_pci_map_cfg_bus_cam,
50824 };
50825
50826 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50827@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50828 }
50829
50830 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50831+ .ops = {
50832+ .map_bus = gen_pci_map_cfg_bus_ecam,
50833+ .read = pci_generic_config_read,
50834+ .write = pci_generic_config_write,
50835+ },
50836 .bus_shift = 20,
50837- .map_bus = gen_pci_map_cfg_bus_ecam,
50838-};
50839-
50840-static struct pci_ops gen_pci_ops = {
50841- .read = pci_generic_config_read,
50842- .write = pci_generic_config_write,
50843 };
50844
50845 static const struct of_device_id gen_pci_of_match[] = {
50846@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50847 .private_data = (void **)&pci,
50848 .setup = gen_pci_setup,
50849 .map_irq = of_irq_parse_and_map_pci,
50850- .ops = &gen_pci_ops,
50851 };
50852
50853 if (!pci)
50854@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50855
50856 of_id = of_match_node(gen_pci_of_match, np);
50857 pci->cfg.ops = of_id->data;
50858- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50859+ hw.ops = &pci->cfg.ops->ops;
50860 pci->host.dev.parent = dev;
50861 INIT_LIST_HEAD(&pci->host.windows);
50862 INIT_LIST_HEAD(&pci->resources);
50863diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50864index 6ca2399..68d866b 100644
50865--- a/drivers/pci/hotplug/acpiphp_ibm.c
50866+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50867@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50868 goto init_cleanup;
50869 }
50870
50871- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50872+ pax_open_kernel();
50873+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50874+ pax_close_kernel();
50875 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50876
50877 return retval;
50878diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50879index 66b7bbe..26bee78 100644
50880--- a/drivers/pci/hotplug/cpcihp_generic.c
50881+++ b/drivers/pci/hotplug/cpcihp_generic.c
50882@@ -73,7 +73,6 @@ static u16 port;
50883 static unsigned int enum_bit;
50884 static u8 enum_mask;
50885
50886-static struct cpci_hp_controller_ops generic_hpc_ops;
50887 static struct cpci_hp_controller generic_hpc;
50888
50889 static int __init validate_parameters(void)
50890@@ -139,6 +138,10 @@ static int query_enum(void)
50891 return ((value & enum_mask) == enum_mask);
50892 }
50893
50894+static struct cpci_hp_controller_ops generic_hpc_ops = {
50895+ .query_enum = query_enum,
50896+};
50897+
50898 static int __init cpcihp_generic_init(void)
50899 {
50900 int status;
50901@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50902 pci_dev_put(dev);
50903
50904 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50905- generic_hpc_ops.query_enum = query_enum;
50906 generic_hpc.ops = &generic_hpc_ops;
50907
50908 status = cpci_hp_register_controller(&generic_hpc);
50909diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50910index 7ecf34e..effed62 100644
50911--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50912+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50913@@ -59,7 +59,6 @@
50914 /* local variables */
50915 static bool debug;
50916 static bool poll;
50917-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50918 static struct cpci_hp_controller zt5550_hpc;
50919
50920 /* Primary cPCI bus bridge device */
50921@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50922 return 0;
50923 }
50924
50925+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50926+ .query_enum = zt5550_hc_query_enum,
50927+};
50928+
50929 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50930 {
50931 int status;
50932@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50933 dbg("returned from zt5550_hc_config");
50934
50935 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50936- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50937 zt5550_hpc.ops = &zt5550_hpc_ops;
50938 if (!poll) {
50939 zt5550_hpc.irq = hc_dev->irq;
50940 zt5550_hpc.irq_flags = IRQF_SHARED;
50941 zt5550_hpc.dev_id = hc_dev;
50942
50943- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50944- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50945- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50946+ pax_open_kernel();
50947+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50948+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50949+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50950+ pax_open_kernel();
50951 } else {
50952 info("using ENUM# polling mode");
50953 }
50954diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50955index 1e08ff8c..3cd145f 100644
50956--- a/drivers/pci/hotplug/cpqphp_nvram.c
50957+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50958@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50959
50960 void compaq_nvram_init (void __iomem *rom_start)
50961 {
50962+#ifndef CONFIG_PAX_KERNEXEC
50963 if (rom_start)
50964 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50965+#endif
50966
50967 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50968
50969diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50970index 56d8486..f26113f 100644
50971--- a/drivers/pci/hotplug/pci_hotplug_core.c
50972+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50973@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50974 return -EINVAL;
50975 }
50976
50977- slot->ops->owner = owner;
50978- slot->ops->mod_name = mod_name;
50979+ pax_open_kernel();
50980+ *(struct module **)&slot->ops->owner = owner;
50981+ *(const char **)&slot->ops->mod_name = mod_name;
50982+ pax_close_kernel();
50983
50984 mutex_lock(&pci_hp_mutex);
50985 /*
50986diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50987index 07aa722..84514b4 100644
50988--- a/drivers/pci/hotplug/pciehp_core.c
50989+++ b/drivers/pci/hotplug/pciehp_core.c
50990@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50991 struct slot *slot = ctrl->slot;
50992 struct hotplug_slot *hotplug = NULL;
50993 struct hotplug_slot_info *info = NULL;
50994- struct hotplug_slot_ops *ops = NULL;
50995+ hotplug_slot_ops_no_const *ops = NULL;
50996 char name[SLOT_NAME_SIZE];
50997 int retval = -ENOMEM;
50998
50999diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51000index c3e7dfc..cbd9625 100644
51001--- a/drivers/pci/msi.c
51002+++ b/drivers/pci/msi.c
51003@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51004 {
51005 struct attribute **msi_attrs;
51006 struct attribute *msi_attr;
51007- struct device_attribute *msi_dev_attr;
51008- struct attribute_group *msi_irq_group;
51009+ device_attribute_no_const *msi_dev_attr;
51010+ attribute_group_no_const *msi_irq_group;
51011 const struct attribute_group **msi_irq_groups;
51012 struct msi_desc *entry;
51013 int ret = -ENOMEM;
51014@@ -573,7 +573,7 @@ error_attrs:
51015 count = 0;
51016 msi_attr = msi_attrs[count];
51017 while (msi_attr) {
51018- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51019+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51020 kfree(msi_attr->name);
51021 kfree(msi_dev_attr);
51022 ++count;
51023diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51024index 312f23a..d21181c 100644
51025--- a/drivers/pci/pci-sysfs.c
51026+++ b/drivers/pci/pci-sysfs.c
51027@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51028 {
51029 /* allocate attribute structure, piggyback attribute name */
51030 int name_len = write_combine ? 13 : 10;
51031- struct bin_attribute *res_attr;
51032+ bin_attribute_no_const *res_attr;
51033 int retval;
51034
51035 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51036@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51037 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51038 {
51039 int retval;
51040- struct bin_attribute *attr;
51041+ bin_attribute_no_const *attr;
51042
51043 /* If the device has VPD, try to expose it in sysfs. */
51044 if (dev->vpd) {
51045@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51046 {
51047 int retval;
51048 int rom_size = 0;
51049- struct bin_attribute *attr;
51050+ bin_attribute_no_const *attr;
51051
51052 if (!sysfs_initialized)
51053 return -EACCES;
51054diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51055index 4091f82..7d98eef 100644
51056--- a/drivers/pci/pci.h
51057+++ b/drivers/pci/pci.h
51058@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51059 struct pci_vpd {
51060 unsigned int len;
51061 const struct pci_vpd_ops *ops;
51062- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51063+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51064 };
51065
51066 int pci_vpd_pci22_init(struct pci_dev *dev);
51067diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51068index 820740a..8b1c673 100644
51069--- a/drivers/pci/pcie/aspm.c
51070+++ b/drivers/pci/pcie/aspm.c
51071@@ -27,9 +27,9 @@
51072 #define MODULE_PARAM_PREFIX "pcie_aspm."
51073
51074 /* Note: those are not register definitions */
51075-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51076-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51077-#define ASPM_STATE_L1 (4) /* L1 state */
51078+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51079+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51080+#define ASPM_STATE_L1 (4U) /* L1 state */
51081 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51082 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51083
51084diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51085index be35da2..ec16cdb 100644
51086--- a/drivers/pci/pcie/portdrv_pci.c
51087+++ b/drivers/pci/pcie/portdrv_pci.c
51088@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51089 return 0;
51090 }
51091
51092-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51093+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51094 /*
51095 * Boxes that should not use MSI for PCIe PME signaling.
51096 */
51097diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51098index 8d2f400..c97cc91 100644
51099--- a/drivers/pci/probe.c
51100+++ b/drivers/pci/probe.c
51101@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51102 u16 orig_cmd;
51103 struct pci_bus_region region, inverted_region;
51104
51105- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51106+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51107
51108 /* No printks while decoding is disabled! */
51109 if (!dev->mmio_always_on) {
51110diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51111index 3f155e7..0f4b1f0 100644
51112--- a/drivers/pci/proc.c
51113+++ b/drivers/pci/proc.c
51114@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51115 static int __init pci_proc_init(void)
51116 {
51117 struct pci_dev *dev = NULL;
51118+
51119+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51120+#ifdef CONFIG_GRKERNSEC_PROC_USER
51121+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51122+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51123+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51124+#endif
51125+#else
51126 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51127+#endif
51128 proc_create("devices", 0, proc_bus_pci_dir,
51129 &proc_bus_pci_dev_operations);
51130 proc_initialized = 1;
51131diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51132index 3474920..acc9581 100644
51133--- a/drivers/platform/chrome/chromeos_pstore.c
51134+++ b/drivers/platform/chrome/chromeos_pstore.c
51135@@ -13,7 +13,7 @@
51136 #include <linux/platform_device.h>
51137 #include <linux/pstore_ram.h>
51138
51139-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51140+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51141 {
51142 /*
51143 * Today all Chromebooks/boxes ship with Google_* as version and
51144diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51145index 1e1e594..8fe59c5 100644
51146--- a/drivers/platform/x86/alienware-wmi.c
51147+++ b/drivers/platform/x86/alienware-wmi.c
51148@@ -150,7 +150,7 @@ struct wmax_led_args {
51149 } __packed;
51150
51151 static struct platform_device *platform_device;
51152-static struct device_attribute *zone_dev_attrs;
51153+static device_attribute_no_const *zone_dev_attrs;
51154 static struct attribute **zone_attrs;
51155 static struct platform_zone *zone_data;
51156
51157@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51158 }
51159 };
51160
51161-static struct attribute_group zone_attribute_group = {
51162+static attribute_group_no_const zone_attribute_group = {
51163 .name = "rgb_zones",
51164 };
51165
51166diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51167index 7543a56..367ca8ed 100644
51168--- a/drivers/platform/x86/asus-wmi.c
51169+++ b/drivers/platform/x86/asus-wmi.c
51170@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51171 int err;
51172 u32 retval = -1;
51173
51174+#ifdef CONFIG_GRKERNSEC_KMEM
51175+ return -EPERM;
51176+#endif
51177+
51178 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51179
51180 if (err < 0)
51181@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51182 int err;
51183 u32 retval = -1;
51184
51185+#ifdef CONFIG_GRKERNSEC_KMEM
51186+ return -EPERM;
51187+#endif
51188+
51189 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51190 &retval);
51191
51192@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51193 union acpi_object *obj;
51194 acpi_status status;
51195
51196+#ifdef CONFIG_GRKERNSEC_KMEM
51197+ return -EPERM;
51198+#endif
51199+
51200 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51201 1, asus->debug.method_id,
51202 &input, &output);
51203diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51204index bceb30b..bf063d4 100644
51205--- a/drivers/platform/x86/compal-laptop.c
51206+++ b/drivers/platform/x86/compal-laptop.c
51207@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51208 return 1;
51209 }
51210
51211-static struct dmi_system_id __initdata compal_dmi_table[] = {
51212+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51213 {
51214 .ident = "FL90/IFL90",
51215 .matches = {
51216diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51217index 458e6c9..089aee7 100644
51218--- a/drivers/platform/x86/hdaps.c
51219+++ b/drivers/platform/x86/hdaps.c
51220@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51221 "ThinkPad T42p", so the order of the entries matters.
51222 If your ThinkPad is not recognized, please update to latest
51223 BIOS. This is especially the case for some R52 ThinkPads. */
51224-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51225+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51226 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51227 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51228 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51229diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51230index 97c2be1..2ee50ce 100644
51231--- a/drivers/platform/x86/ibm_rtl.c
51232+++ b/drivers/platform/x86/ibm_rtl.c
51233@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51234 }
51235
51236
51237-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51238+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51239 { \
51240 .matches = { \
51241 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51242diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51243index a4a4258..a58a04c 100644
51244--- a/drivers/platform/x86/intel_oaktrail.c
51245+++ b/drivers/platform/x86/intel_oaktrail.c
51246@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51247 return 0;
51248 }
51249
51250-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51251+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51252 {
51253 .ident = "OakTrail platform",
51254 .matches = {
51255diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51256index 0859877..59d596d 100644
51257--- a/drivers/platform/x86/msi-laptop.c
51258+++ b/drivers/platform/x86/msi-laptop.c
51259@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51260 return 1;
51261 }
51262
51263-static struct dmi_system_id __initdata msi_dmi_table[] = {
51264+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51265 {
51266 .ident = "MSI S270",
51267 .matches = {
51268@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51269
51270 if (!quirks->ec_read_only) {
51271 /* allow userland write sysfs file */
51272- dev_attr_bluetooth.store = store_bluetooth;
51273- dev_attr_wlan.store = store_wlan;
51274- dev_attr_threeg.store = store_threeg;
51275- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51276- dev_attr_wlan.attr.mode |= S_IWUSR;
51277- dev_attr_threeg.attr.mode |= S_IWUSR;
51278+ pax_open_kernel();
51279+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51280+ *(void **)&dev_attr_wlan.store = store_wlan;
51281+ *(void **)&dev_attr_threeg.store = store_threeg;
51282+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51283+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51284+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51285+ pax_close_kernel();
51286 }
51287
51288 /* disable hardware control by fn key */
51289diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51290index 6d2bac0..ec2b029 100644
51291--- a/drivers/platform/x86/msi-wmi.c
51292+++ b/drivers/platform/x86/msi-wmi.c
51293@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51294 static void msi_wmi_notify(u32 value, void *context)
51295 {
51296 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51297- static struct key_entry *key;
51298+ struct key_entry *key;
51299 union acpi_object *obj;
51300 acpi_status status;
51301
51302diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51303index 9e701b2..c68a7b5 100644
51304--- a/drivers/platform/x86/samsung-laptop.c
51305+++ b/drivers/platform/x86/samsung-laptop.c
51306@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51307 return 0;
51308 }
51309
51310-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51311+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51312 {
51313 .matches = {
51314 DMI_MATCH(DMI_SYS_VENDOR,
51315diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51316index e6aac72..e11ff24 100644
51317--- a/drivers/platform/x86/samsung-q10.c
51318+++ b/drivers/platform/x86/samsung-q10.c
51319@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51320 return 1;
51321 }
51322
51323-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51324+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51325 {
51326 .ident = "Samsung Q10",
51327 .matches = {
51328diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51329index e51c1e7..71bb385 100644
51330--- a/drivers/platform/x86/sony-laptop.c
51331+++ b/drivers/platform/x86/sony-laptop.c
51332@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51333 }
51334
51335 /* High speed charging function */
51336-static struct device_attribute *hsc_handle;
51337+static device_attribute_no_const *hsc_handle;
51338
51339 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51340 struct device_attribute *attr,
51341@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51342 }
51343
51344 /* low battery function */
51345-static struct device_attribute *lowbatt_handle;
51346+static device_attribute_no_const *lowbatt_handle;
51347
51348 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51349 struct device_attribute *attr,
51350@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51351 }
51352
51353 /* fan speed function */
51354-static struct device_attribute *fan_handle, *hsf_handle;
51355+static device_attribute_no_const *fan_handle, *hsf_handle;
51356
51357 static ssize_t sony_nc_hsfan_store(struct device *dev,
51358 struct device_attribute *attr,
51359@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51360 }
51361
51362 /* USB charge function */
51363-static struct device_attribute *uc_handle;
51364+static device_attribute_no_const *uc_handle;
51365
51366 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51367 struct device_attribute *attr,
51368@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51369 }
51370
51371 /* Panel ID function */
51372-static struct device_attribute *panel_handle;
51373+static device_attribute_no_const *panel_handle;
51374
51375 static ssize_t sony_nc_panelid_show(struct device *dev,
51376 struct device_attribute *attr, char *buffer)
51377@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51378 }
51379
51380 /* smart connect function */
51381-static struct device_attribute *sc_handle;
51382+static device_attribute_no_const *sc_handle;
51383
51384 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51385 struct device_attribute *attr,
51386@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51387 .drv.pm = &sony_pic_pm,
51388 };
51389
51390-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51391+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51392 {
51393 .ident = "Sony Vaio",
51394 .matches = {
51395diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51396index 3b8ceee..e18652c 100644
51397--- a/drivers/platform/x86/thinkpad_acpi.c
51398+++ b/drivers/platform/x86/thinkpad_acpi.c
51399@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
51400 return 0;
51401 }
51402
51403-void static hotkey_mask_warn_incomplete_mask(void)
51404+static void hotkey_mask_warn_incomplete_mask(void)
51405 {
51406 /* log only what the user can fix... */
51407 const u32 wantedmask = hotkey_driver_mask &
51408@@ -2437,10 +2437,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51409 && !tp_features.bright_unkfw)
51410 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51411 }
51412+}
51413
51414 #undef TPACPI_COMPARE_KEY
51415 #undef TPACPI_MAY_SEND_KEY
51416-}
51417
51418 /*
51419 * Polling driver
51420diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51421index 438d4c7..ca8a2fb 100644
51422--- a/drivers/pnp/pnpbios/bioscalls.c
51423+++ b/drivers/pnp/pnpbios/bioscalls.c
51424@@ -59,7 +59,7 @@ do { \
51425 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51426 } while(0)
51427
51428-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51429+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51430 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51431
51432 /*
51433@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51434
51435 cpu = get_cpu();
51436 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51437+
51438+ pax_open_kernel();
51439 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51440+ pax_close_kernel();
51441
51442 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51443 spin_lock_irqsave(&pnp_bios_lock, flags);
51444@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51445 :"memory");
51446 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51447
51448+ pax_open_kernel();
51449 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51450+ pax_close_kernel();
51451+
51452 put_cpu();
51453
51454 /* If we get here and this is set then the PnP BIOS faulted on us. */
51455@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51456 return status;
51457 }
51458
51459-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51460+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51461 {
51462 int i;
51463
51464@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51465 pnp_bios_callpoint.offset = header->fields.pm16offset;
51466 pnp_bios_callpoint.segment = PNP_CS16;
51467
51468+ pax_open_kernel();
51469+
51470 for_each_possible_cpu(i) {
51471 struct desc_struct *gdt = get_cpu_gdt_table(i);
51472 if (!gdt)
51473@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51474 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51475 (unsigned long)__va(header->fields.pm16dseg));
51476 }
51477+
51478+ pax_close_kernel();
51479 }
51480diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51481index facd43b..b291260 100644
51482--- a/drivers/pnp/pnpbios/core.c
51483+++ b/drivers/pnp/pnpbios/core.c
51484@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51485 return 0;
51486 }
51487
51488-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51489+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51490 { /* PnPBIOS GPF on boot */
51491 .callback = exploding_pnp_bios,
51492 .ident = "Higraded P14H",
51493diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51494index 0c52e2a..3421ab7 100644
51495--- a/drivers/power/pda_power.c
51496+++ b/drivers/power/pda_power.c
51497@@ -37,7 +37,11 @@ static int polling;
51498
51499 #if IS_ENABLED(CONFIG_USB_PHY)
51500 static struct usb_phy *transceiver;
51501-static struct notifier_block otg_nb;
51502+static int otg_handle_notification(struct notifier_block *nb,
51503+ unsigned long event, void *unused);
51504+static struct notifier_block otg_nb = {
51505+ .notifier_call = otg_handle_notification
51506+};
51507 #endif
51508
51509 static struct regulator *ac_draw;
51510@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
51511
51512 #if IS_ENABLED(CONFIG_USB_PHY)
51513 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51514- otg_nb.notifier_call = otg_handle_notification;
51515 ret = usb_register_notifier(transceiver, &otg_nb);
51516 if (ret) {
51517 dev_err(dev, "failure to register otg notifier\n");
51518diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51519index cc439fd..8fa30df 100644
51520--- a/drivers/power/power_supply.h
51521+++ b/drivers/power/power_supply.h
51522@@ -16,12 +16,12 @@ struct power_supply;
51523
51524 #ifdef CONFIG_SYSFS
51525
51526-extern void power_supply_init_attrs(struct device_type *dev_type);
51527+extern void power_supply_init_attrs(void);
51528 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51529
51530 #else
51531
51532-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51533+static inline void power_supply_init_attrs(void) {}
51534 #define power_supply_uevent NULL
51535
51536 #endif /* CONFIG_SYSFS */
51537diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51538index 694e8cd..9f03483 100644
51539--- a/drivers/power/power_supply_core.c
51540+++ b/drivers/power/power_supply_core.c
51541@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51542 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51543 EXPORT_SYMBOL_GPL(power_supply_notifier);
51544
51545-static struct device_type power_supply_dev_type;
51546+extern const struct attribute_group *power_supply_attr_groups[];
51547+static struct device_type power_supply_dev_type = {
51548+ .groups = power_supply_attr_groups,
51549+};
51550
51551 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
51552 struct power_supply *supply)
51553@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
51554 return PTR_ERR(power_supply_class);
51555
51556 power_supply_class->dev_uevent = power_supply_uevent;
51557- power_supply_init_attrs(&power_supply_dev_type);
51558+ power_supply_init_attrs();
51559
51560 return 0;
51561 }
51562diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51563index 62653f5..d0bb485 100644
51564--- a/drivers/power/power_supply_sysfs.c
51565+++ b/drivers/power/power_supply_sysfs.c
51566@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51567 .is_visible = power_supply_attr_is_visible,
51568 };
51569
51570-static const struct attribute_group *power_supply_attr_groups[] = {
51571+const struct attribute_group *power_supply_attr_groups[] = {
51572 &power_supply_attr_group,
51573 NULL,
51574 };
51575
51576-void power_supply_init_attrs(struct device_type *dev_type)
51577+void power_supply_init_attrs(void)
51578 {
51579 int i;
51580
51581- dev_type->groups = power_supply_attr_groups;
51582-
51583 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51584 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51585 }
51586diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51587index 84419af..268ede8 100644
51588--- a/drivers/powercap/powercap_sys.c
51589+++ b/drivers/powercap/powercap_sys.c
51590@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51591 struct device_attribute name_attr;
51592 };
51593
51594+static ssize_t show_constraint_name(struct device *dev,
51595+ struct device_attribute *dev_attr,
51596+ char *buf);
51597+
51598 static struct powercap_constraint_attr
51599- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51600+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51601+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51602+ .power_limit_attr = {
51603+ .attr = {
51604+ .name = NULL,
51605+ .mode = S_IWUSR | S_IRUGO
51606+ },
51607+ .show = show_constraint_power_limit_uw,
51608+ .store = store_constraint_power_limit_uw
51609+ },
51610+
51611+ .time_window_attr = {
51612+ .attr = {
51613+ .name = NULL,
51614+ .mode = S_IWUSR | S_IRUGO
51615+ },
51616+ .show = show_constraint_time_window_us,
51617+ .store = store_constraint_time_window_us
51618+ },
51619+
51620+ .max_power_attr = {
51621+ .attr = {
51622+ .name = NULL,
51623+ .mode = S_IRUGO
51624+ },
51625+ .show = show_constraint_max_power_uw,
51626+ .store = NULL
51627+ },
51628+
51629+ .min_power_attr = {
51630+ .attr = {
51631+ .name = NULL,
51632+ .mode = S_IRUGO
51633+ },
51634+ .show = show_constraint_min_power_uw,
51635+ .store = NULL
51636+ },
51637+
51638+ .max_time_window_attr = {
51639+ .attr = {
51640+ .name = NULL,
51641+ .mode = S_IRUGO
51642+ },
51643+ .show = show_constraint_max_time_window_us,
51644+ .store = NULL
51645+ },
51646+
51647+ .min_time_window_attr = {
51648+ .attr = {
51649+ .name = NULL,
51650+ .mode = S_IRUGO
51651+ },
51652+ .show = show_constraint_min_time_window_us,
51653+ .store = NULL
51654+ },
51655+
51656+ .name_attr = {
51657+ .attr = {
51658+ .name = NULL,
51659+ .mode = S_IRUGO
51660+ },
51661+ .show = show_constraint_name,
51662+ .store = NULL
51663+ }
51664+ }
51665+};
51666
51667 /* A list of powercap control_types */
51668 static LIST_HEAD(powercap_cntrl_list);
51669@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51670 }
51671
51672 static int create_constraint_attribute(int id, const char *name,
51673- int mode,
51674- struct device_attribute *dev_attr,
51675- ssize_t (*show)(struct device *,
51676- struct device_attribute *, char *),
51677- ssize_t (*store)(struct device *,
51678- struct device_attribute *,
51679- const char *, size_t)
51680- )
51681+ struct device_attribute *dev_attr)
51682 {
51683+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51684
51685- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51686- id, name);
51687- if (!dev_attr->attr.name)
51688+ if (!name)
51689 return -ENOMEM;
51690- dev_attr->attr.mode = mode;
51691- dev_attr->show = show;
51692- dev_attr->store = store;
51693+
51694+ pax_open_kernel();
51695+ *(const char **)&dev_attr->attr.name = name;
51696+ pax_close_kernel();
51697
51698 return 0;
51699 }
51700@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51701
51702 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51703 ret = create_constraint_attribute(i, "power_limit_uw",
51704- S_IWUSR | S_IRUGO,
51705- &constraint_attrs[i].power_limit_attr,
51706- show_constraint_power_limit_uw,
51707- store_constraint_power_limit_uw);
51708+ &constraint_attrs[i].power_limit_attr);
51709 if (ret)
51710 goto err_alloc;
51711 ret = create_constraint_attribute(i, "time_window_us",
51712- S_IWUSR | S_IRUGO,
51713- &constraint_attrs[i].time_window_attr,
51714- show_constraint_time_window_us,
51715- store_constraint_time_window_us);
51716+ &constraint_attrs[i].time_window_attr);
51717 if (ret)
51718 goto err_alloc;
51719- ret = create_constraint_attribute(i, "name", S_IRUGO,
51720- &constraint_attrs[i].name_attr,
51721- show_constraint_name,
51722- NULL);
51723+ ret = create_constraint_attribute(i, "name",
51724+ &constraint_attrs[i].name_attr);
51725 if (ret)
51726 goto err_alloc;
51727- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51728- &constraint_attrs[i].max_power_attr,
51729- show_constraint_max_power_uw,
51730- NULL);
51731+ ret = create_constraint_attribute(i, "max_power_uw",
51732+ &constraint_attrs[i].max_power_attr);
51733 if (ret)
51734 goto err_alloc;
51735- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51736- &constraint_attrs[i].min_power_attr,
51737- show_constraint_min_power_uw,
51738- NULL);
51739+ ret = create_constraint_attribute(i, "min_power_uw",
51740+ &constraint_attrs[i].min_power_attr);
51741 if (ret)
51742 goto err_alloc;
51743 ret = create_constraint_attribute(i, "max_time_window_us",
51744- S_IRUGO,
51745- &constraint_attrs[i].max_time_window_attr,
51746- show_constraint_max_time_window_us,
51747- NULL);
51748+ &constraint_attrs[i].max_time_window_attr);
51749 if (ret)
51750 goto err_alloc;
51751 ret = create_constraint_attribute(i, "min_time_window_us",
51752- S_IRUGO,
51753- &constraint_attrs[i].min_time_window_attr,
51754- show_constraint_min_time_window_us,
51755- NULL);
51756+ &constraint_attrs[i].min_time_window_attr);
51757 if (ret)
51758 goto err_alloc;
51759
51760@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51761 power_zone->zone_dev_attrs[count++] =
51762 &dev_attr_max_energy_range_uj.attr;
51763 if (power_zone->ops->get_energy_uj) {
51764+ pax_open_kernel();
51765 if (power_zone->ops->reset_energy_uj)
51766- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51767+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51768 else
51769- dev_attr_energy_uj.attr.mode = S_IRUGO;
51770+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51771+ pax_close_kernel();
51772 power_zone->zone_dev_attrs[count++] =
51773 &dev_attr_energy_uj.attr;
51774 }
51775diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51776index 9c5d414..c7900ce 100644
51777--- a/drivers/ptp/ptp_private.h
51778+++ b/drivers/ptp/ptp_private.h
51779@@ -51,7 +51,7 @@ struct ptp_clock {
51780 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51781 wait_queue_head_t tsev_wq;
51782 int defunct; /* tells readers to go away when clock is being removed */
51783- struct device_attribute *pin_dev_attr;
51784+ device_attribute_no_const *pin_dev_attr;
51785 struct attribute **pin_attr;
51786 struct attribute_group pin_attr_group;
51787 };
51788diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51789index 302e626..12579af 100644
51790--- a/drivers/ptp/ptp_sysfs.c
51791+++ b/drivers/ptp/ptp_sysfs.c
51792@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51793 goto no_pin_attr;
51794
51795 for (i = 0; i < n_pins; i++) {
51796- struct device_attribute *da = &ptp->pin_dev_attr[i];
51797+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51798 sysfs_attr_init(&da->attr);
51799 da->attr.name = info->pin_config[i].name;
51800 da->attr.mode = 0644;
51801diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51802index a4a8a6d..a3456f4 100644
51803--- a/drivers/regulator/core.c
51804+++ b/drivers/regulator/core.c
51805@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51806 const struct regulation_constraints *constraints = NULL;
51807 const struct regulator_init_data *init_data;
51808 struct regulator_config *config = NULL;
51809- static atomic_t regulator_no = ATOMIC_INIT(-1);
51810+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51811 struct regulator_dev *rdev;
51812 struct device *dev;
51813 int ret, i;
51814@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51815 rdev->dev.class = &regulator_class;
51816 rdev->dev.parent = dev;
51817 dev_set_name(&rdev->dev, "regulator.%lu",
51818- (unsigned long) atomic_inc_return(&regulator_no));
51819+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51820 ret = device_register(&rdev->dev);
51821 if (ret != 0) {
51822 put_device(&rdev->dev);
51823diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51824index 7eee2ca..4024513 100644
51825--- a/drivers/regulator/max8660.c
51826+++ b/drivers/regulator/max8660.c
51827@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51828 max8660->shadow_regs[MAX8660_OVER1] = 5;
51829 } else {
51830 /* Otherwise devices can be toggled via software */
51831- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51832- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51833+ pax_open_kernel();
51834+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51835+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51836+ pax_close_kernel();
51837 }
51838
51839 /*
51840diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51841index c3d55c2..0dddfe6 100644
51842--- a/drivers/regulator/max8973-regulator.c
51843+++ b/drivers/regulator/max8973-regulator.c
51844@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51845 if (!pdata || !pdata->enable_ext_control) {
51846 max->desc.enable_reg = MAX8973_VOUT;
51847 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51848- max->ops.enable = regulator_enable_regmap;
51849- max->ops.disable = regulator_disable_regmap;
51850- max->ops.is_enabled = regulator_is_enabled_regmap;
51851+ pax_open_kernel();
51852+ *(void **)&max->ops.enable = regulator_enable_regmap;
51853+ *(void **)&max->ops.disable = regulator_disable_regmap;
51854+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51855+ pax_close_kernel();
51856 }
51857
51858 if (pdata) {
51859diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51860index 0d17c92..a29f627 100644
51861--- a/drivers/regulator/mc13892-regulator.c
51862+++ b/drivers/regulator/mc13892-regulator.c
51863@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51864 mc13xxx_unlock(mc13892);
51865
51866 /* update mc13892_vcam ops */
51867- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51868+ pax_open_kernel();
51869+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51870 sizeof(struct regulator_ops));
51871- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51872- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51873+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51874+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51875+ pax_close_kernel();
51876 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51877
51878 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51879diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51880index 5b2e761..c8c8a4a 100644
51881--- a/drivers/rtc/rtc-cmos.c
51882+++ b/drivers/rtc/rtc-cmos.c
51883@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51884 hpet_rtc_timer_init();
51885
51886 /* export at least the first block of NVRAM */
51887- nvram.size = address_space - NVRAM_OFFSET;
51888+ pax_open_kernel();
51889+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51890+ pax_close_kernel();
51891 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51892 if (retval < 0) {
51893 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51894diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51895index 799c34b..8e9786a 100644
51896--- a/drivers/rtc/rtc-dev.c
51897+++ b/drivers/rtc/rtc-dev.c
51898@@ -16,6 +16,7 @@
51899 #include <linux/module.h>
51900 #include <linux/rtc.h>
51901 #include <linux/sched.h>
51902+#include <linux/grsecurity.h>
51903 #include "rtc-core.h"
51904
51905 static dev_t rtc_devt;
51906@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51907 if (copy_from_user(&tm, uarg, sizeof(tm)))
51908 return -EFAULT;
51909
51910+ gr_log_timechange();
51911+
51912 return rtc_set_time(rtc, &tm);
51913
51914 case RTC_PIE_ON:
51915diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51916index 4ffabb3..1f87fca 100644
51917--- a/drivers/rtc/rtc-ds1307.c
51918+++ b/drivers/rtc/rtc-ds1307.c
51919@@ -107,7 +107,7 @@ struct ds1307 {
51920 u8 offset; /* register's offset */
51921 u8 regs[11];
51922 u16 nvram_offset;
51923- struct bin_attribute *nvram;
51924+ bin_attribute_no_const *nvram;
51925 enum ds_type type;
51926 unsigned long flags;
51927 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51928diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51929index 90abb5b..e0bf6dd 100644
51930--- a/drivers/rtc/rtc-m48t59.c
51931+++ b/drivers/rtc/rtc-m48t59.c
51932@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51933 if (IS_ERR(m48t59->rtc))
51934 return PTR_ERR(m48t59->rtc);
51935
51936- m48t59_nvram_attr.size = pdata->offset;
51937+ pax_open_kernel();
51938+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51939+ pax_close_kernel();
51940
51941 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51942 if (ret)
51943diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51944index e693af6..2e525b6 100644
51945--- a/drivers/scsi/bfa/bfa_fcpim.h
51946+++ b/drivers/scsi/bfa/bfa_fcpim.h
51947@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51948
51949 struct bfa_itn_s {
51950 bfa_isr_func_t isr;
51951-};
51952+} __no_const;
51953
51954 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51955 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51956diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51957index 0f19455..ef7adb5 100644
51958--- a/drivers/scsi/bfa/bfa_fcs.c
51959+++ b/drivers/scsi/bfa/bfa_fcs.c
51960@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51961 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51962
51963 static struct bfa_fcs_mod_s fcs_modules[] = {
51964- { bfa_fcs_port_attach, NULL, NULL },
51965- { bfa_fcs_uf_attach, NULL, NULL },
51966- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51967- bfa_fcs_fabric_modexit },
51968+ {
51969+ .attach = bfa_fcs_port_attach,
51970+ .modinit = NULL,
51971+ .modexit = NULL
51972+ },
51973+ {
51974+ .attach = bfa_fcs_uf_attach,
51975+ .modinit = NULL,
51976+ .modexit = NULL
51977+ },
51978+ {
51979+ .attach = bfa_fcs_fabric_attach,
51980+ .modinit = bfa_fcs_fabric_modinit,
51981+ .modexit = bfa_fcs_fabric_modexit
51982+ },
51983 };
51984
51985 /*
51986diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51987index ff75ef8..2dfe00a 100644
51988--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51989+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51990@@ -89,15 +89,26 @@ static struct {
51991 void (*offline) (struct bfa_fcs_lport_s *port);
51992 } __port_action[] = {
51993 {
51994- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51995- bfa_fcs_lport_unknown_offline}, {
51996- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51997- bfa_fcs_lport_fab_offline}, {
51998- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51999- bfa_fcs_lport_n2n_offline}, {
52000- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52001- bfa_fcs_lport_loop_offline},
52002- };
52003+ .init = bfa_fcs_lport_unknown_init,
52004+ .online = bfa_fcs_lport_unknown_online,
52005+ .offline = bfa_fcs_lport_unknown_offline
52006+ },
52007+ {
52008+ .init = bfa_fcs_lport_fab_init,
52009+ .online = bfa_fcs_lport_fab_online,
52010+ .offline = bfa_fcs_lport_fab_offline
52011+ },
52012+ {
52013+ .init = bfa_fcs_lport_n2n_init,
52014+ .online = bfa_fcs_lport_n2n_online,
52015+ .offline = bfa_fcs_lport_n2n_offline
52016+ },
52017+ {
52018+ .init = bfa_fcs_lport_loop_init,
52019+ .online = bfa_fcs_lport_loop_online,
52020+ .offline = bfa_fcs_lport_loop_offline
52021+ },
52022+};
52023
52024 /*
52025 * fcs_port_sm FCS logical port state machine
52026diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52027index a38aafa0..fe8f03b 100644
52028--- a/drivers/scsi/bfa/bfa_ioc.h
52029+++ b/drivers/scsi/bfa/bfa_ioc.h
52030@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52031 bfa_ioc_disable_cbfn_t disable_cbfn;
52032 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52033 bfa_ioc_reset_cbfn_t reset_cbfn;
52034-};
52035+} __no_const;
52036
52037 /*
52038 * IOC event notification mechanism.
52039@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52040 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52041 enum bfi_ioc_state fwstate);
52042 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52043-};
52044+} __no_const;
52045
52046 /*
52047 * Queue element to wait for room in request queue. FIFO order is
52048diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52049index a14c784..6de6790 100644
52050--- a/drivers/scsi/bfa/bfa_modules.h
52051+++ b/drivers/scsi/bfa/bfa_modules.h
52052@@ -78,12 +78,12 @@ enum {
52053 \
52054 extern struct bfa_module_s hal_mod_ ## __mod; \
52055 struct bfa_module_s hal_mod_ ## __mod = { \
52056- bfa_ ## __mod ## _meminfo, \
52057- bfa_ ## __mod ## _attach, \
52058- bfa_ ## __mod ## _detach, \
52059- bfa_ ## __mod ## _start, \
52060- bfa_ ## __mod ## _stop, \
52061- bfa_ ## __mod ## _iocdisable, \
52062+ .meminfo = bfa_ ## __mod ## _meminfo, \
52063+ .attach = bfa_ ## __mod ## _attach, \
52064+ .detach = bfa_ ## __mod ## _detach, \
52065+ .start = bfa_ ## __mod ## _start, \
52066+ .stop = bfa_ ## __mod ## _stop, \
52067+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52068 }
52069
52070 #define BFA_CACHELINE_SZ (256)
52071diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52072index 045c4e1..13de803 100644
52073--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52074+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52075@@ -33,8 +33,8 @@
52076 */
52077 #include "libfcoe.h"
52078
52079-static atomic_t ctlr_num;
52080-static atomic_t fcf_num;
52081+static atomic_unchecked_t ctlr_num;
52082+static atomic_unchecked_t fcf_num;
52083
52084 /*
52085 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52086@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52087 if (!ctlr)
52088 goto out;
52089
52090- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52091+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52092 ctlr->f = f;
52093 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52094 INIT_LIST_HEAD(&ctlr->fcfs);
52095@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52096 fcf->dev.parent = &ctlr->dev;
52097 fcf->dev.bus = &fcoe_bus_type;
52098 fcf->dev.type = &fcoe_fcf_device_type;
52099- fcf->id = atomic_inc_return(&fcf_num) - 1;
52100+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52101 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52102
52103 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52104@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52105 {
52106 int error;
52107
52108- atomic_set(&ctlr_num, 0);
52109- atomic_set(&fcf_num, 0);
52110+ atomic_set_unchecked(&ctlr_num, 0);
52111+ atomic_set_unchecked(&fcf_num, 0);
52112
52113 error = bus_register(&fcoe_bus_type);
52114 if (error)
52115diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52116index 8bb173e..20236b4 100644
52117--- a/drivers/scsi/hosts.c
52118+++ b/drivers/scsi/hosts.c
52119@@ -42,7 +42,7 @@
52120 #include "scsi_logging.h"
52121
52122
52123-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52124+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52125
52126
52127 static void scsi_host_cls_release(struct device *dev)
52128@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52129 * subtract one because we increment first then return, but we need to
52130 * know what the next host number was before increment
52131 */
52132- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52133+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52134 shost->dma_channel = 0xff;
52135
52136 /* These three are default values which can be overridden */
52137diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52138index a1cfbd3..d7f8ebc 100644
52139--- a/drivers/scsi/hpsa.c
52140+++ b/drivers/scsi/hpsa.c
52141@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52142 struct reply_queue_buffer *rq = &h->reply_queue[q];
52143
52144 if (h->transMethod & CFGTBL_Trans_io_accel1)
52145- return h->access.command_completed(h, q);
52146+ return h->access->command_completed(h, q);
52147
52148 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52149- return h->access.command_completed(h, q);
52150+ return h->access->command_completed(h, q);
52151
52152 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52153 a = rq->head[rq->current_entry];
52154@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52155 break;
52156 default:
52157 set_performant_mode(h, c);
52158- h->access.submit_command(h, c);
52159+ h->access->submit_command(h, c);
52160 }
52161 }
52162
52163@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52164
52165 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52166 {
52167- return h->access.command_completed(h, q);
52168+ return h->access->command_completed(h, q);
52169 }
52170
52171 static inline bool interrupt_pending(struct ctlr_info *h)
52172 {
52173- return h->access.intr_pending(h);
52174+ return h->access->intr_pending(h);
52175 }
52176
52177 static inline long interrupt_not_for_us(struct ctlr_info *h)
52178 {
52179- return (h->access.intr_pending(h) == 0) ||
52180+ return (h->access->intr_pending(h) == 0) ||
52181 (h->interrupts_enabled == 0);
52182 }
52183
52184@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52185 if (prod_index < 0)
52186 return prod_index;
52187 h->product_name = products[prod_index].product_name;
52188- h->access = *(products[prod_index].access);
52189+ h->access = products[prod_index].access;
52190
52191 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52192 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52193@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52194 unsigned long flags;
52195 u32 lockup_detected;
52196
52197- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52198+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52199 spin_lock_irqsave(&h->lock, flags);
52200 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52201 if (!lockup_detected) {
52202@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
52203 }
52204
52205 /* make sure the board interrupts are off */
52206- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52207+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52208
52209 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52210 goto clean2;
52211@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
52212 * fake ones to scoop up any residual completions.
52213 */
52214 spin_lock_irqsave(&h->lock, flags);
52215- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52216+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52217 spin_unlock_irqrestore(&h->lock, flags);
52218 hpsa_free_irqs(h);
52219 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52220@@ -6979,9 +6979,9 @@ reinit_after_soft_reset:
52221 dev_info(&h->pdev->dev, "Board READY.\n");
52222 dev_info(&h->pdev->dev,
52223 "Waiting for stale completions to drain.\n");
52224- h->access.set_intr_mask(h, HPSA_INTR_ON);
52225+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52226 msleep(10000);
52227- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52228+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52229
52230 rc = controller_reset_failed(h->cfgtable);
52231 if (rc)
52232@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
52233
52234
52235 /* Turn the interrupts on so we can service requests */
52236- h->access.set_intr_mask(h, HPSA_INTR_ON);
52237+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52238
52239 hpsa_hba_inquiry(h);
52240 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52241@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52242 * To write all data in the battery backed cache to disks
52243 */
52244 hpsa_flush_cache(h);
52245- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52246+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52247 hpsa_free_irqs_and_disable_msix(h);
52248 }
52249
52250@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52251 CFGTBL_Trans_enable_directed_msix |
52252 (trans_support & (CFGTBL_Trans_io_accel1 |
52253 CFGTBL_Trans_io_accel2));
52254- struct access_method access = SA5_performant_access;
52255+ struct access_method *access = &SA5_performant_access;
52256
52257 /* This is a bit complicated. There are 8 registers on
52258 * the controller which we write to to tell it 8 different
52259@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52260 * perform the superfluous readl() after each command submission.
52261 */
52262 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52263- access = SA5_performant_access_no_read;
52264+ access = &SA5_performant_access_no_read;
52265
52266 /* Controller spec: zero out this buffer. */
52267 for (i = 0; i < h->nreply_queues; i++)
52268@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52269 * enable outbound interrupt coalescing in accelerator mode;
52270 */
52271 if (trans_support & CFGTBL_Trans_io_accel1) {
52272- access = SA5_ioaccel_mode1_access;
52273+ access = &SA5_ioaccel_mode1_access;
52274 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52275 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52276 } else {
52277 if (trans_support & CFGTBL_Trans_io_accel2) {
52278- access = SA5_ioaccel_mode2_access;
52279+ access = &SA5_ioaccel_mode2_access;
52280 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52281 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52282 }
52283diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52284index 6577130..955f9a4 100644
52285--- a/drivers/scsi/hpsa.h
52286+++ b/drivers/scsi/hpsa.h
52287@@ -143,7 +143,7 @@ struct ctlr_info {
52288 unsigned int msix_vector;
52289 unsigned int msi_vector;
52290 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52291- struct access_method access;
52292+ struct access_method *access;
52293 char hba_mode_enabled;
52294
52295 /* queue and queue Info */
52296@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52297 }
52298
52299 static struct access_method SA5_access = {
52300- SA5_submit_command,
52301- SA5_intr_mask,
52302- SA5_intr_pending,
52303- SA5_completed,
52304+ .submit_command = SA5_submit_command,
52305+ .set_intr_mask = SA5_intr_mask,
52306+ .intr_pending = SA5_intr_pending,
52307+ .command_completed = SA5_completed,
52308 };
52309
52310 static struct access_method SA5_ioaccel_mode1_access = {
52311- SA5_submit_command,
52312- SA5_performant_intr_mask,
52313- SA5_ioaccel_mode1_intr_pending,
52314- SA5_ioaccel_mode1_completed,
52315+ .submit_command = SA5_submit_command,
52316+ .set_intr_mask = SA5_performant_intr_mask,
52317+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52318+ .command_completed = SA5_ioaccel_mode1_completed,
52319 };
52320
52321 static struct access_method SA5_ioaccel_mode2_access = {
52322- SA5_submit_command_ioaccel2,
52323- SA5_performant_intr_mask,
52324- SA5_performant_intr_pending,
52325- SA5_performant_completed,
52326+ .submit_command = SA5_submit_command_ioaccel2,
52327+ .set_intr_mask = SA5_performant_intr_mask,
52328+ .intr_pending = SA5_performant_intr_pending,
52329+ .command_completed = SA5_performant_completed,
52330 };
52331
52332 static struct access_method SA5_performant_access = {
52333- SA5_submit_command,
52334- SA5_performant_intr_mask,
52335- SA5_performant_intr_pending,
52336- SA5_performant_completed,
52337+ .submit_command = SA5_submit_command,
52338+ .set_intr_mask = SA5_performant_intr_mask,
52339+ .intr_pending = SA5_performant_intr_pending,
52340+ .command_completed = SA5_performant_completed,
52341 };
52342
52343 static struct access_method SA5_performant_access_no_read = {
52344- SA5_submit_command_no_read,
52345- SA5_performant_intr_mask,
52346- SA5_performant_intr_pending,
52347- SA5_performant_completed,
52348+ .submit_command = SA5_submit_command_no_read,
52349+ .set_intr_mask = SA5_performant_intr_mask,
52350+ .intr_pending = SA5_performant_intr_pending,
52351+ .command_completed = SA5_performant_completed,
52352 };
52353
52354 struct board_type {
52355diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52356index 1b3a094..068e683 100644
52357--- a/drivers/scsi/libfc/fc_exch.c
52358+++ b/drivers/scsi/libfc/fc_exch.c
52359@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52360 u16 pool_max_index;
52361
52362 struct {
52363- atomic_t no_free_exch;
52364- atomic_t no_free_exch_xid;
52365- atomic_t xid_not_found;
52366- atomic_t xid_busy;
52367- atomic_t seq_not_found;
52368- atomic_t non_bls_resp;
52369+ atomic_unchecked_t no_free_exch;
52370+ atomic_unchecked_t no_free_exch_xid;
52371+ atomic_unchecked_t xid_not_found;
52372+ atomic_unchecked_t xid_busy;
52373+ atomic_unchecked_t seq_not_found;
52374+ atomic_unchecked_t non_bls_resp;
52375 } stats;
52376 };
52377
52378@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52379 /* allocate memory for exchange */
52380 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52381 if (!ep) {
52382- atomic_inc(&mp->stats.no_free_exch);
52383+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52384 goto out;
52385 }
52386 memset(ep, 0, sizeof(*ep));
52387@@ -874,7 +874,7 @@ out:
52388 return ep;
52389 err:
52390 spin_unlock_bh(&pool->lock);
52391- atomic_inc(&mp->stats.no_free_exch_xid);
52392+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52393 mempool_free(ep, mp->ep_pool);
52394 return NULL;
52395 }
52396@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52397 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52398 ep = fc_exch_find(mp, xid);
52399 if (!ep) {
52400- atomic_inc(&mp->stats.xid_not_found);
52401+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52402 reject = FC_RJT_OX_ID;
52403 goto out;
52404 }
52405@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52406 ep = fc_exch_find(mp, xid);
52407 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52408 if (ep) {
52409- atomic_inc(&mp->stats.xid_busy);
52410+ atomic_inc_unchecked(&mp->stats.xid_busy);
52411 reject = FC_RJT_RX_ID;
52412 goto rel;
52413 }
52414@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52415 }
52416 xid = ep->xid; /* get our XID */
52417 } else if (!ep) {
52418- atomic_inc(&mp->stats.xid_not_found);
52419+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52420 reject = FC_RJT_RX_ID; /* XID not found */
52421 goto out;
52422 }
52423@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52424 } else {
52425 sp = &ep->seq;
52426 if (sp->id != fh->fh_seq_id) {
52427- atomic_inc(&mp->stats.seq_not_found);
52428+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52429 if (f_ctl & FC_FC_END_SEQ) {
52430 /*
52431 * Update sequence_id based on incoming last
52432@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52433
52434 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52435 if (!ep) {
52436- atomic_inc(&mp->stats.xid_not_found);
52437+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52438 goto out;
52439 }
52440 if (ep->esb_stat & ESB_ST_COMPLETE) {
52441- atomic_inc(&mp->stats.xid_not_found);
52442+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52443 goto rel;
52444 }
52445 if (ep->rxid == FC_XID_UNKNOWN)
52446 ep->rxid = ntohs(fh->fh_rx_id);
52447 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52448- atomic_inc(&mp->stats.xid_not_found);
52449+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52450 goto rel;
52451 }
52452 if (ep->did != ntoh24(fh->fh_s_id) &&
52453 ep->did != FC_FID_FLOGI) {
52454- atomic_inc(&mp->stats.xid_not_found);
52455+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52456 goto rel;
52457 }
52458 sof = fr_sof(fp);
52459@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52460 sp->ssb_stat |= SSB_ST_RESP;
52461 sp->id = fh->fh_seq_id;
52462 } else if (sp->id != fh->fh_seq_id) {
52463- atomic_inc(&mp->stats.seq_not_found);
52464+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52465 goto rel;
52466 }
52467
52468@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52469 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52470
52471 if (!sp)
52472- atomic_inc(&mp->stats.xid_not_found);
52473+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52474 else
52475- atomic_inc(&mp->stats.non_bls_resp);
52476+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52477
52478 fc_frame_free(fp);
52479 }
52480@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52481
52482 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52483 mp = ema->mp;
52484- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52485+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52486 st->fc_no_free_exch_xid +=
52487- atomic_read(&mp->stats.no_free_exch_xid);
52488- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52489- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52490- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52491- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52492+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52493+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52494+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52495+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52496+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52497 }
52498 }
52499 EXPORT_SYMBOL(fc_exch_update_stats);
52500diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52501index 9c706d8..d3e3ed2 100644
52502--- a/drivers/scsi/libsas/sas_ata.c
52503+++ b/drivers/scsi/libsas/sas_ata.c
52504@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52505 .postreset = ata_std_postreset,
52506 .error_handler = ata_std_error_handler,
52507 .post_internal_cmd = sas_ata_post_internal,
52508- .qc_defer = ata_std_qc_defer,
52509+ .qc_defer = ata_std_qc_defer,
52510 .qc_prep = ata_noop_qc_prep,
52511 .qc_issue = sas_ata_qc_issue,
52512 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52513diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52514index 434e903..5a4a79b 100644
52515--- a/drivers/scsi/lpfc/lpfc.h
52516+++ b/drivers/scsi/lpfc/lpfc.h
52517@@ -430,7 +430,7 @@ struct lpfc_vport {
52518 struct dentry *debug_nodelist;
52519 struct dentry *vport_debugfs_root;
52520 struct lpfc_debugfs_trc *disc_trc;
52521- atomic_t disc_trc_cnt;
52522+ atomic_unchecked_t disc_trc_cnt;
52523 #endif
52524 uint8_t stat_data_enabled;
52525 uint8_t stat_data_blocked;
52526@@ -880,8 +880,8 @@ struct lpfc_hba {
52527 struct timer_list fabric_block_timer;
52528 unsigned long bit_flags;
52529 #define FABRIC_COMANDS_BLOCKED 0
52530- atomic_t num_rsrc_err;
52531- atomic_t num_cmd_success;
52532+ atomic_unchecked_t num_rsrc_err;
52533+ atomic_unchecked_t num_cmd_success;
52534 unsigned long last_rsrc_error_time;
52535 unsigned long last_ramp_down_time;
52536 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52537@@ -916,7 +916,7 @@ struct lpfc_hba {
52538
52539 struct dentry *debug_slow_ring_trc;
52540 struct lpfc_debugfs_trc *slow_ring_trc;
52541- atomic_t slow_ring_trc_cnt;
52542+ atomic_unchecked_t slow_ring_trc_cnt;
52543 /* iDiag debugfs sub-directory */
52544 struct dentry *idiag_root;
52545 struct dentry *idiag_pci_cfg;
52546diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52547index 5633e7d..8272114 100644
52548--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52549+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52550@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52551
52552 #include <linux/debugfs.h>
52553
52554-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52555+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52556 static unsigned long lpfc_debugfs_start_time = 0L;
52557
52558 /* iDiag */
52559@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52560 lpfc_debugfs_enable = 0;
52561
52562 len = 0;
52563- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52564+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52565 (lpfc_debugfs_max_disc_trc - 1);
52566 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52567 dtp = vport->disc_trc + i;
52568@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52569 lpfc_debugfs_enable = 0;
52570
52571 len = 0;
52572- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52573+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52574 (lpfc_debugfs_max_slow_ring_trc - 1);
52575 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52576 dtp = phba->slow_ring_trc + i;
52577@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52578 !vport || !vport->disc_trc)
52579 return;
52580
52581- index = atomic_inc_return(&vport->disc_trc_cnt) &
52582+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52583 (lpfc_debugfs_max_disc_trc - 1);
52584 dtp = vport->disc_trc + index;
52585 dtp->fmt = fmt;
52586 dtp->data1 = data1;
52587 dtp->data2 = data2;
52588 dtp->data3 = data3;
52589- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52590+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52591 dtp->jif = jiffies;
52592 #endif
52593 return;
52594@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52595 !phba || !phba->slow_ring_trc)
52596 return;
52597
52598- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52599+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52600 (lpfc_debugfs_max_slow_ring_trc - 1);
52601 dtp = phba->slow_ring_trc + index;
52602 dtp->fmt = fmt;
52603 dtp->data1 = data1;
52604 dtp->data2 = data2;
52605 dtp->data3 = data3;
52606- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52607+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52608 dtp->jif = jiffies;
52609 #endif
52610 return;
52611@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52612 "slow_ring buffer\n");
52613 goto debug_failed;
52614 }
52615- atomic_set(&phba->slow_ring_trc_cnt, 0);
52616+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52617 memset(phba->slow_ring_trc, 0,
52618 (sizeof(struct lpfc_debugfs_trc) *
52619 lpfc_debugfs_max_slow_ring_trc));
52620@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52621 "buffer\n");
52622 goto debug_failed;
52623 }
52624- atomic_set(&vport->disc_trc_cnt, 0);
52625+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52626
52627 snprintf(name, sizeof(name), "discovery_trace");
52628 vport->debug_disc_trc =
52629diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52630index 0b2c53a..aec2b45 100644
52631--- a/drivers/scsi/lpfc/lpfc_init.c
52632+++ b/drivers/scsi/lpfc/lpfc_init.c
52633@@ -11290,8 +11290,10 @@ lpfc_init(void)
52634 "misc_register returned with status %d", error);
52635
52636 if (lpfc_enable_npiv) {
52637- lpfc_transport_functions.vport_create = lpfc_vport_create;
52638- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52639+ pax_open_kernel();
52640+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52641+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52642+ pax_close_kernel();
52643 }
52644 lpfc_transport_template =
52645 fc_attach_transport(&lpfc_transport_functions);
52646diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52647index 4f9222e..f1850e3 100644
52648--- a/drivers/scsi/lpfc/lpfc_scsi.c
52649+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52650@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52651 unsigned long expires;
52652
52653 spin_lock_irqsave(&phba->hbalock, flags);
52654- atomic_inc(&phba->num_rsrc_err);
52655+ atomic_inc_unchecked(&phba->num_rsrc_err);
52656 phba->last_rsrc_error_time = jiffies;
52657
52658 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52659@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52660 unsigned long num_rsrc_err, num_cmd_success;
52661 int i;
52662
52663- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52664- num_cmd_success = atomic_read(&phba->num_cmd_success);
52665+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52666+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52667
52668 /*
52669 * The error and success command counters are global per
52670@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52671 }
52672 }
52673 lpfc_destroy_vport_work_array(phba, vports);
52674- atomic_set(&phba->num_rsrc_err, 0);
52675- atomic_set(&phba->num_cmd_success, 0);
52676+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52677+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52678 }
52679
52680 /**
52681diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52682index 3f26147..ee8efd1 100644
52683--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52684+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52685@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52686 {
52687 struct scsi_device *sdev = to_scsi_device(dev);
52688 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52689- static struct _raid_device *raid_device;
52690+ struct _raid_device *raid_device;
52691 unsigned long flags;
52692 Mpi2RaidVolPage0_t vol_pg0;
52693 Mpi2ConfigReply_t mpi_reply;
52694@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52695 {
52696 struct scsi_device *sdev = to_scsi_device(dev);
52697 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52698- static struct _raid_device *raid_device;
52699+ struct _raid_device *raid_device;
52700 unsigned long flags;
52701 Mpi2RaidVolPage0_t vol_pg0;
52702 Mpi2ConfigReply_t mpi_reply;
52703@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52704 Mpi2EventDataIrOperationStatus_t *event_data =
52705 (Mpi2EventDataIrOperationStatus_t *)
52706 fw_event->event_data;
52707- static struct _raid_device *raid_device;
52708+ struct _raid_device *raid_device;
52709 unsigned long flags;
52710 u16 handle;
52711
52712@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52713 u64 sas_address;
52714 struct _sas_device *sas_device;
52715 struct _sas_node *expander_device;
52716- static struct _raid_device *raid_device;
52717+ struct _raid_device *raid_device;
52718 u8 retry_count;
52719 unsigned long flags;
52720
52721diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52722index ed31d8c..ab856b3 100644
52723--- a/drivers/scsi/pmcraid.c
52724+++ b/drivers/scsi/pmcraid.c
52725@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52726 res->scsi_dev = scsi_dev;
52727 scsi_dev->hostdata = res;
52728 res->change_detected = 0;
52729- atomic_set(&res->read_failures, 0);
52730- atomic_set(&res->write_failures, 0);
52731+ atomic_set_unchecked(&res->read_failures, 0);
52732+ atomic_set_unchecked(&res->write_failures, 0);
52733 rc = 0;
52734 }
52735 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52736@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52737
52738 /* If this was a SCSI read/write command keep count of errors */
52739 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52740- atomic_inc(&res->read_failures);
52741+ atomic_inc_unchecked(&res->read_failures);
52742 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52743- atomic_inc(&res->write_failures);
52744+ atomic_inc_unchecked(&res->write_failures);
52745
52746 if (!RES_IS_GSCSI(res->cfg_entry) &&
52747 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52748@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52749 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52750 * hrrq_id assigned here in queuecommand
52751 */
52752- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52753+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52754 pinstance->num_hrrq;
52755 cmd->cmd_done = pmcraid_io_done;
52756
52757@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52758 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52759 * hrrq_id assigned here in queuecommand
52760 */
52761- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52762+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52763 pinstance->num_hrrq;
52764
52765 if (request_size) {
52766@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52767
52768 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52769 /* add resources only after host is added into system */
52770- if (!atomic_read(&pinstance->expose_resources))
52771+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52772 return;
52773
52774 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52775@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52776 init_waitqueue_head(&pinstance->reset_wait_q);
52777
52778 atomic_set(&pinstance->outstanding_cmds, 0);
52779- atomic_set(&pinstance->last_message_id, 0);
52780- atomic_set(&pinstance->expose_resources, 0);
52781+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52782+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52783
52784 INIT_LIST_HEAD(&pinstance->free_res_q);
52785 INIT_LIST_HEAD(&pinstance->used_res_q);
52786@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52787 /* Schedule worker thread to handle CCN and take care of adding and
52788 * removing devices to OS
52789 */
52790- atomic_set(&pinstance->expose_resources, 1);
52791+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52792 schedule_work(&pinstance->worker_q);
52793 return rc;
52794
52795diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52796index e1d150f..6c6df44 100644
52797--- a/drivers/scsi/pmcraid.h
52798+++ b/drivers/scsi/pmcraid.h
52799@@ -748,7 +748,7 @@ struct pmcraid_instance {
52800 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52801
52802 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52803- atomic_t last_message_id;
52804+ atomic_unchecked_t last_message_id;
52805
52806 /* configuration table */
52807 struct pmcraid_config_table *cfg_table;
52808@@ -777,7 +777,7 @@ struct pmcraid_instance {
52809 atomic_t outstanding_cmds;
52810
52811 /* should add/delete resources to mid-layer now ?*/
52812- atomic_t expose_resources;
52813+ atomic_unchecked_t expose_resources;
52814
52815
52816
52817@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52818 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52819 };
52820 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52821- atomic_t read_failures; /* count of failed READ commands */
52822- atomic_t write_failures; /* count of failed WRITE commands */
52823+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52824+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52825
52826 /* To indicate add/delete/modify during CCN */
52827 u8 change_detected;
52828diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52829index 82b92c4..3178171 100644
52830--- a/drivers/scsi/qla2xxx/qla_attr.c
52831+++ b/drivers/scsi/qla2xxx/qla_attr.c
52832@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52833 return 0;
52834 }
52835
52836-struct fc_function_template qla2xxx_transport_functions = {
52837+fc_function_template_no_const qla2xxx_transport_functions = {
52838
52839 .show_host_node_name = 1,
52840 .show_host_port_name = 1,
52841@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52842 .bsg_timeout = qla24xx_bsg_timeout,
52843 };
52844
52845-struct fc_function_template qla2xxx_transport_vport_functions = {
52846+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52847
52848 .show_host_node_name = 1,
52849 .show_host_port_name = 1,
52850diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52851index 7686bfe..4710893 100644
52852--- a/drivers/scsi/qla2xxx/qla_gbl.h
52853+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52854@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52855 struct device_attribute;
52856 extern struct device_attribute *qla2x00_host_attrs[];
52857 struct fc_function_template;
52858-extern struct fc_function_template qla2xxx_transport_functions;
52859-extern struct fc_function_template qla2xxx_transport_vport_functions;
52860+extern fc_function_template_no_const qla2xxx_transport_functions;
52861+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52862 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52863 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52864 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52865diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52866index cce1cbc..5b9f0fe 100644
52867--- a/drivers/scsi/qla2xxx/qla_os.c
52868+++ b/drivers/scsi/qla2xxx/qla_os.c
52869@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52870 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52871 /* Ok, a 64bit DMA mask is applicable. */
52872 ha->flags.enable_64bit_addressing = 1;
52873- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52874- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52875+ pax_open_kernel();
52876+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52877+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52878+ pax_close_kernel();
52879 return;
52880 }
52881 }
52882diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52883index 8f6d0fb..1b21097 100644
52884--- a/drivers/scsi/qla4xxx/ql4_def.h
52885+++ b/drivers/scsi/qla4xxx/ql4_def.h
52886@@ -305,7 +305,7 @@ struct ddb_entry {
52887 * (4000 only) */
52888 atomic_t relogin_timer; /* Max Time to wait for
52889 * relogin to complete */
52890- atomic_t relogin_retry_count; /* Num of times relogin has been
52891+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52892 * retried */
52893 uint32_t default_time2wait; /* Default Min time between
52894 * relogins (+aens) */
52895diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52896index 6d25879..3031a9f 100644
52897--- a/drivers/scsi/qla4xxx/ql4_os.c
52898+++ b/drivers/scsi/qla4xxx/ql4_os.c
52899@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52900 */
52901 if (!iscsi_is_session_online(cls_sess)) {
52902 /* Reset retry relogin timer */
52903- atomic_inc(&ddb_entry->relogin_retry_count);
52904+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52905 DEBUG2(ql4_printk(KERN_INFO, ha,
52906 "%s: index[%d] relogin timed out-retrying"
52907 " relogin (%d), retry (%d)\n", __func__,
52908 ddb_entry->fw_ddb_index,
52909- atomic_read(&ddb_entry->relogin_retry_count),
52910+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52911 ddb_entry->default_time2wait + 4));
52912 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52913 atomic_set(&ddb_entry->retry_relogin_timer,
52914@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52915
52916 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52917 atomic_set(&ddb_entry->relogin_timer, 0);
52918- atomic_set(&ddb_entry->relogin_retry_count, 0);
52919+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52920 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52921 ddb_entry->default_relogin_timeout =
52922 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52923diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52924index b1a2631..5bcd9c8 100644
52925--- a/drivers/scsi/scsi_lib.c
52926+++ b/drivers/scsi/scsi_lib.c
52927@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52928 shost = sdev->host;
52929 scsi_init_cmd_errh(cmd);
52930 cmd->result = DID_NO_CONNECT << 16;
52931- atomic_inc(&cmd->device->iorequest_cnt);
52932+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52933
52934 /*
52935 * SCSI request completion path will do scsi_device_unbusy(),
52936@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52937
52938 INIT_LIST_HEAD(&cmd->eh_entry);
52939
52940- atomic_inc(&cmd->device->iodone_cnt);
52941+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52942 if (cmd->result)
52943- atomic_inc(&cmd->device->ioerr_cnt);
52944+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52945
52946 disposition = scsi_decide_disposition(cmd);
52947 if (disposition != SUCCESS &&
52948@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52949 struct Scsi_Host *host = cmd->device->host;
52950 int rtn = 0;
52951
52952- atomic_inc(&cmd->device->iorequest_cnt);
52953+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52954
52955 /* check if the device is still usable */
52956 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52957diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52958index 1ac38e7..6acc656 100644
52959--- a/drivers/scsi/scsi_sysfs.c
52960+++ b/drivers/scsi/scsi_sysfs.c
52961@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52962 char *buf) \
52963 { \
52964 struct scsi_device *sdev = to_scsi_device(dev); \
52965- unsigned long long count = atomic_read(&sdev->field); \
52966+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52967 return snprintf(buf, 20, "0x%llx\n", count); \
52968 } \
52969 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52970diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52971index 5d6f348..18778a6b 100644
52972--- a/drivers/scsi/scsi_transport_fc.c
52973+++ b/drivers/scsi/scsi_transport_fc.c
52974@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52975 * Netlink Infrastructure
52976 */
52977
52978-static atomic_t fc_event_seq;
52979+static atomic_unchecked_t fc_event_seq;
52980
52981 /**
52982 * fc_get_event_number - Obtain the next sequential FC event number
52983@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
52984 u32
52985 fc_get_event_number(void)
52986 {
52987- return atomic_add_return(1, &fc_event_seq);
52988+ return atomic_add_return_unchecked(1, &fc_event_seq);
52989 }
52990 EXPORT_SYMBOL(fc_get_event_number);
52991
52992@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
52993 {
52994 int error;
52995
52996- atomic_set(&fc_event_seq, 0);
52997+ atomic_set_unchecked(&fc_event_seq, 0);
52998
52999 error = transport_class_register(&fc_host_class);
53000 if (error)
53001@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53002 char *cp;
53003
53004 *val = simple_strtoul(buf, &cp, 0);
53005- if ((*cp && (*cp != '\n')) || (*val < 0))
53006+ if (*cp && (*cp != '\n'))
53007 return -EINVAL;
53008 /*
53009 * Check for overflow; dev_loss_tmo is u32
53010diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53011index 67d43e3..8cee73c 100644
53012--- a/drivers/scsi/scsi_transport_iscsi.c
53013+++ b/drivers/scsi/scsi_transport_iscsi.c
53014@@ -79,7 +79,7 @@ struct iscsi_internal {
53015 struct transport_container session_cont;
53016 };
53017
53018-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53019+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53020 static struct workqueue_struct *iscsi_eh_timer_workq;
53021
53022 static DEFINE_IDA(iscsi_sess_ida);
53023@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53024 int err;
53025
53026 ihost = shost->shost_data;
53027- session->sid = atomic_add_return(1, &iscsi_session_nr);
53028+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53029
53030 if (target_id == ISCSI_MAX_TARGET) {
53031 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53032@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53033 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53034 ISCSI_TRANSPORT_VERSION);
53035
53036- atomic_set(&iscsi_session_nr, 0);
53037+ atomic_set_unchecked(&iscsi_session_nr, 0);
53038
53039 err = class_register(&iscsi_transport_class);
53040 if (err)
53041diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53042index ae45bd9..c32a586 100644
53043--- a/drivers/scsi/scsi_transport_srp.c
53044+++ b/drivers/scsi/scsi_transport_srp.c
53045@@ -35,7 +35,7 @@
53046 #include "scsi_priv.h"
53047
53048 struct srp_host_attrs {
53049- atomic_t next_port_id;
53050+ atomic_unchecked_t next_port_id;
53051 };
53052 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53053
53054@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53055 struct Scsi_Host *shost = dev_to_shost(dev);
53056 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53057
53058- atomic_set(&srp_host->next_port_id, 0);
53059+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53060 return 0;
53061 }
53062
53063@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53064 rport_fast_io_fail_timedout);
53065 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53066
53067- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53068+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53069 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53070
53071 transport_setup_device(&rport->dev);
53072diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53073index a661d33..1b693d4 100644
53074--- a/drivers/scsi/sd.c
53075+++ b/drivers/scsi/sd.c
53076@@ -2997,7 +2997,7 @@ static int sd_probe(struct device *dev)
53077 sdkp->disk = gd;
53078 sdkp->index = index;
53079 atomic_set(&sdkp->openers, 0);
53080- atomic_set(&sdkp->device->ioerr_cnt, 0);
53081+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53082
53083 if (!sdp->request_queue->rq_timeout) {
53084 if (sdp->type != TYPE_MOD)
53085diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53086index 2270bd5..98408a5 100644
53087--- a/drivers/scsi/sg.c
53088+++ b/drivers/scsi/sg.c
53089@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53090 sdp->disk->disk_name,
53091 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53092 NULL,
53093- (char *)arg);
53094+ (char __user *)arg);
53095 case BLKTRACESTART:
53096 return blk_trace_startstop(sdp->device->request_queue, 1);
53097 case BLKTRACESTOP:
53098diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53099index c0d660f..24a5854 100644
53100--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53101+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53102@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53103 return i;
53104 }
53105
53106-static struct bin_attribute fuse_bin_attr = {
53107+static bin_attribute_no_const fuse_bin_attr = {
53108 .attr = { .name = "fuse", .mode = S_IRUGO, },
53109 .read = fuse_read,
53110 };
53111diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53112index 57a1950..ae54e21 100644
53113--- a/drivers/spi/spi.c
53114+++ b/drivers/spi/spi.c
53115@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
53116 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53117
53118 /* portable code must never pass more than 32 bytes */
53119-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53120+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53121
53122 static u8 *buf;
53123
53124diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53125index b41429f..2de5373 100644
53126--- a/drivers/staging/android/timed_output.c
53127+++ b/drivers/staging/android/timed_output.c
53128@@ -25,7 +25,7 @@
53129 #include "timed_output.h"
53130
53131 static struct class *timed_output_class;
53132-static atomic_t device_count;
53133+static atomic_unchecked_t device_count;
53134
53135 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53136 char *buf)
53137@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53138 timed_output_class = class_create(THIS_MODULE, "timed_output");
53139 if (IS_ERR(timed_output_class))
53140 return PTR_ERR(timed_output_class);
53141- atomic_set(&device_count, 0);
53142+ atomic_set_unchecked(&device_count, 0);
53143 timed_output_class->dev_groups = timed_output_groups;
53144 }
53145
53146@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53147 if (ret < 0)
53148 return ret;
53149
53150- tdev->index = atomic_inc_return(&device_count);
53151+ tdev->index = atomic_inc_return_unchecked(&device_count);
53152 tdev->dev = device_create(timed_output_class, NULL,
53153 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53154 if (IS_ERR(tdev->dev))
53155diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53156index 727640e..55bf61c 100644
53157--- a/drivers/staging/comedi/comedi_fops.c
53158+++ b/drivers/staging/comedi/comedi_fops.c
53159@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53160 }
53161 cfp->last_attached = dev->attached;
53162 cfp->last_detach_count = dev->detach_count;
53163- ACCESS_ONCE(cfp->read_subdev) = read_s;
53164- ACCESS_ONCE(cfp->write_subdev) = write_s;
53165+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53166+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53167 }
53168
53169 static void comedi_file_check(struct file *file)
53170@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53171 !(s_old->async->cmd.flags & CMDF_WRITE))
53172 return -EBUSY;
53173
53174- ACCESS_ONCE(cfp->read_subdev) = s_new;
53175+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53176 return 0;
53177 }
53178
53179@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53180 (s_old->async->cmd.flags & CMDF_WRITE))
53181 return -EBUSY;
53182
53183- ACCESS_ONCE(cfp->write_subdev) = s_new;
53184+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53185 return 0;
53186 }
53187
53188diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53189index 37dcf7e..f3c2016 100644
53190--- a/drivers/staging/fbtft/fbtft-core.c
53191+++ b/drivers/staging/fbtft/fbtft-core.c
53192@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53193 {
53194 struct fb_info *info;
53195 struct fbtft_par *par;
53196- struct fb_ops *fbops = NULL;
53197+ fb_ops_no_const *fbops = NULL;
53198 struct fb_deferred_io *fbdefio = NULL;
53199 struct fbtft_platform_data *pdata = dev->platform_data;
53200 u8 *vmem = NULL;
53201diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53202index 0dbf3f9..fed0063 100644
53203--- a/drivers/staging/fbtft/fbtft.h
53204+++ b/drivers/staging/fbtft/fbtft.h
53205@@ -106,7 +106,7 @@ struct fbtft_ops {
53206
53207 int (*set_var)(struct fbtft_par *par);
53208 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53209-};
53210+} __no_const;
53211
53212 /**
53213 * struct fbtft_display - Describes the display properties
53214diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53215index 001348c..cfaac8a 100644
53216--- a/drivers/staging/gdm724x/gdm_tty.c
53217+++ b/drivers/staging/gdm724x/gdm_tty.c
53218@@ -44,7 +44,7 @@
53219 #define gdm_tty_send_control(n, r, v, d, l) (\
53220 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53221
53222-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53223+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53224
53225 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53226 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53227diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53228index d23c3c2..eb63c81 100644
53229--- a/drivers/staging/i2o/i2o.h
53230+++ b/drivers/staging/i2o/i2o.h
53231@@ -565,7 +565,7 @@ struct i2o_controller {
53232 struct i2o_device *exec; /* Executive */
53233 #if BITS_PER_LONG == 64
53234 spinlock_t context_list_lock; /* lock for context_list */
53235- atomic_t context_list_counter; /* needed for unique contexts */
53236+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53237 struct list_head context_list; /* list of context id's
53238 and pointers */
53239 #endif
53240diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53241index ad84f33..c5bdf65 100644
53242--- a/drivers/staging/i2o/i2o_proc.c
53243+++ b/drivers/staging/i2o/i2o_proc.c
53244@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
53245 "Array Controller Device"
53246 };
53247
53248-static char *chtostr(char *tmp, u8 *chars, int n)
53249-{
53250- tmp[0] = 0;
53251- return strncat(tmp, (char *)chars, n);
53252-}
53253-
53254 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53255 char *group)
53256 {
53257@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53258 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53259 {
53260 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53261- static u32 work32[5];
53262- static u8 *work8 = (u8 *) work32;
53263- static u16 *work16 = (u16 *) work32;
53264+ u32 work32[5];
53265+ u8 *work8 = (u8 *) work32;
53266+ u16 *work16 = (u16 *) work32;
53267 int token;
53268 u32 hwcap;
53269
53270@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53271 } *result;
53272
53273 i2o_exec_execute_ddm_table ddm_table;
53274- char tmp[28 + 1];
53275
53276 result = kmalloc(sizeof(*result), GFP_KERNEL);
53277 if (!result)
53278@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53279
53280 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53281 seq_printf(seq, "%-#8x", ddm_table.module_id);
53282- seq_printf(seq, "%-29s",
53283- chtostr(tmp, ddm_table.module_name_version, 28));
53284+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53285 seq_printf(seq, "%9d ", ddm_table.data_size);
53286 seq_printf(seq, "%8d", ddm_table.code_size);
53287
53288@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53289
53290 i2o_driver_result_table *result;
53291 i2o_driver_store_table *dst;
53292- char tmp[28 + 1];
53293
53294 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53295 if (result == NULL)
53296@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53297
53298 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53299 seq_printf(seq, "%-#8x", dst->module_id);
53300- seq_printf(seq, "%-29s",
53301- chtostr(tmp, dst->module_name_version, 28));
53302- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53303+ seq_printf(seq, "%-.28s", dst->module_name_version);
53304+ seq_printf(seq, "%-.8s", dst->date);
53305 seq_printf(seq, "%8d ", dst->module_size);
53306 seq_printf(seq, "%8d ", dst->mpb_size);
53307 seq_printf(seq, "0x%04x", dst->module_flags);
53308@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53309 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53310 {
53311 struct i2o_device *d = (struct i2o_device *)seq->private;
53312- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53313+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53314 // == (allow) 512d bytes (max)
53315- static u16 *work16 = (u16 *) work32;
53316+ u16 *work16 = (u16 *) work32;
53317 int token;
53318- char tmp[16 + 1];
53319
53320 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53321
53322@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53323 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53324 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53325 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53326- seq_printf(seq, "Vendor info : %s\n",
53327- chtostr(tmp, (u8 *) (work32 + 2), 16));
53328- seq_printf(seq, "Product info : %s\n",
53329- chtostr(tmp, (u8 *) (work32 + 6), 16));
53330- seq_printf(seq, "Description : %s\n",
53331- chtostr(tmp, (u8 *) (work32 + 10), 16));
53332- seq_printf(seq, "Product rev. : %s\n",
53333- chtostr(tmp, (u8 *) (work32 + 14), 8));
53334+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53335+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53336+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53337+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53338
53339 seq_printf(seq, "Serial number : ");
53340 print_serial_number(seq, (u8 *) (work32 + 16),
53341@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53342 u8 pad[256]; // allow up to 256 byte (max) serial number
53343 } result;
53344
53345- char tmp[24 + 1];
53346-
53347 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53348
53349 if (token < 0) {
53350@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53351 }
53352
53353 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53354- seq_printf(seq, "Module name : %s\n",
53355- chtostr(tmp, result.module_name, 24));
53356- seq_printf(seq, "Module revision : %s\n",
53357- chtostr(tmp, result.module_rev, 8));
53358+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53359+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53360
53361 seq_printf(seq, "Serial number : ");
53362 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53363@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53364 u8 instance_number[4];
53365 } result;
53366
53367- char tmp[64 + 1];
53368-
53369 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53370
53371 if (token < 0) {
53372@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53373 return 0;
53374 }
53375
53376- seq_printf(seq, "Device name : %s\n",
53377- chtostr(tmp, result.device_name, 64));
53378- seq_printf(seq, "Service name : %s\n",
53379- chtostr(tmp, result.service_name, 64));
53380- seq_printf(seq, "Physical name : %s\n",
53381- chtostr(tmp, result.physical_location, 64));
53382- seq_printf(seq, "Instance number : %s\n",
53383- chtostr(tmp, result.instance_number, 4));
53384+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53385+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53386+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53387+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53388
53389 return 0;
53390 }
53391@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53392 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53393 {
53394 struct i2o_device *d = (struct i2o_device *)seq->private;
53395- static u32 work32[12];
53396- static u16 *work16 = (u16 *) work32;
53397- static u8 *work8 = (u8 *) work32;
53398+ u32 work32[12];
53399+ u16 *work16 = (u16 *) work32;
53400+ u8 *work8 = (u8 *) work32;
53401 int token;
53402
53403 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53404diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53405index 52334fc..d7f40b3 100644
53406--- a/drivers/staging/i2o/iop.c
53407+++ b/drivers/staging/i2o/iop.c
53408@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53409
53410 spin_lock_irqsave(&c->context_list_lock, flags);
53411
53412- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53413- atomic_inc(&c->context_list_counter);
53414+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53415+ atomic_inc_unchecked(&c->context_list_counter);
53416
53417- entry->context = atomic_read(&c->context_list_counter);
53418+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53419
53420 list_add(&entry->list, &c->context_list);
53421
53422@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53423
53424 #if BITS_PER_LONG == 64
53425 spin_lock_init(&c->context_list_lock);
53426- atomic_set(&c->context_list_counter, 0);
53427+ atomic_set_unchecked(&c->context_list_counter, 0);
53428 INIT_LIST_HEAD(&c->context_list);
53429 #endif
53430
53431diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53432index 463da07..e791ce9 100644
53433--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53434+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53435@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53436 return 0;
53437 }
53438
53439-sfw_test_client_ops_t brw_test_client;
53440-void brw_init_test_client(void)
53441-{
53442- brw_test_client.tso_init = brw_client_init;
53443- brw_test_client.tso_fini = brw_client_fini;
53444- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53445- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53446+sfw_test_client_ops_t brw_test_client = {
53447+ .tso_init = brw_client_init,
53448+ .tso_fini = brw_client_fini,
53449+ .tso_prep_rpc = brw_client_prep_rpc,
53450+ .tso_done_rpc = brw_client_done_rpc,
53451 };
53452
53453 srpc_service_t brw_test_service;
53454diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53455index 5709148..ccd9e0d 100644
53456--- a/drivers/staging/lustre/lnet/selftest/framework.c
53457+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53458@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53459
53460 extern sfw_test_client_ops_t ping_test_client;
53461 extern srpc_service_t ping_test_service;
53462-extern void ping_init_test_client(void);
53463 extern void ping_init_test_service(void);
53464
53465 extern sfw_test_client_ops_t brw_test_client;
53466 extern srpc_service_t brw_test_service;
53467-extern void brw_init_test_client(void);
53468 extern void brw_init_test_service(void);
53469
53470
53471@@ -1675,12 +1673,10 @@ sfw_startup (void)
53472 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53473 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53474
53475- brw_init_test_client();
53476 brw_init_test_service();
53477 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53478 LASSERT (rc == 0);
53479
53480- ping_init_test_client();
53481 ping_init_test_service();
53482 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53483 LASSERT (rc == 0);
53484diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53485index d8c0df6..5041cbb 100644
53486--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53487+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53488@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53489 return 0;
53490 }
53491
53492-sfw_test_client_ops_t ping_test_client;
53493-void ping_init_test_client(void)
53494-{
53495- ping_test_client.tso_init = ping_client_init;
53496- ping_test_client.tso_fini = ping_client_fini;
53497- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53498- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53499-}
53500+sfw_test_client_ops_t ping_test_client = {
53501+ .tso_init = ping_client_init,
53502+ .tso_fini = ping_client_fini,
53503+ .tso_prep_rpc = ping_client_prep_rpc,
53504+ .tso_done_rpc = ping_client_done_rpc,
53505+};
53506
53507 srpc_service_t ping_test_service;
53508 void ping_init_test_service(void)
53509diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53510index 83bc0a9..12ba00a 100644
53511--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53512+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53513@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53514 ldlm_completion_callback lcs_completion;
53515 ldlm_blocking_callback lcs_blocking;
53516 ldlm_glimpse_callback lcs_glimpse;
53517-};
53518+} __no_const;
53519
53520 /* ldlm_lockd.c */
53521 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53522diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53523index 2a88b80..62e7e5f 100644
53524--- a/drivers/staging/lustre/lustre/include/obd.h
53525+++ b/drivers/staging/lustre/lustre/include/obd.h
53526@@ -1362,7 +1362,7 @@ struct md_ops {
53527 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53528 * wrapper function in include/linux/obd_class.h.
53529 */
53530-};
53531+} __no_const;
53532
53533 struct lsm_operations {
53534 void (*lsm_free)(struct lov_stripe_md *);
53535diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53536index a4c252f..b21acac 100644
53537--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53538+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53539@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53540 int added = (mode == LCK_NL);
53541 int overlaps = 0;
53542 int splitted = 0;
53543- const struct ldlm_callback_suite null_cbs = { NULL };
53544+ const struct ldlm_callback_suite null_cbs = { };
53545
53546 CDEBUG(D_DLMTRACE,
53547 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53548diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53549index c539e37..743b213 100644
53550--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53551+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53552@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53553 loff_t *ppos)
53554 {
53555 int rc, max_delay_cs;
53556- struct ctl_table dummy = *table;
53557+ ctl_table_no_const dummy = *table;
53558 long d;
53559
53560 dummy.data = &max_delay_cs;
53561@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53562 loff_t *ppos)
53563 {
53564 int rc, min_delay_cs;
53565- struct ctl_table dummy = *table;
53566+ ctl_table_no_const dummy = *table;
53567 long d;
53568
53569 dummy.data = &min_delay_cs;
53570@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53571 void __user *buffer, size_t *lenp, loff_t *ppos)
53572 {
53573 int rc, backoff;
53574- struct ctl_table dummy = *table;
53575+ ctl_table_no_const dummy = *table;
53576
53577 dummy.data = &backoff;
53578 dummy.proc_handler = &proc_dointvec;
53579diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53580index 7dc77dd..289d03e 100644
53581--- a/drivers/staging/lustre/lustre/libcfs/module.c
53582+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53583@@ -313,11 +313,11 @@ out:
53584
53585
53586 struct cfs_psdev_ops libcfs_psdev_ops = {
53587- libcfs_psdev_open,
53588- libcfs_psdev_release,
53589- NULL,
53590- NULL,
53591- libcfs_ioctl
53592+ .p_open = libcfs_psdev_open,
53593+ .p_close = libcfs_psdev_release,
53594+ .p_read = NULL,
53595+ .p_write = NULL,
53596+ .p_ioctl = libcfs_ioctl
53597 };
53598
53599 extern int insert_proc(void);
53600diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53601index 22667db..8b703b6 100644
53602--- a/drivers/staging/octeon/ethernet-rx.c
53603+++ b/drivers/staging/octeon/ethernet-rx.c
53604@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53605 /* Increment RX stats for virtual ports */
53606 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53607 #ifdef CONFIG_64BIT
53608- atomic64_add(1,
53609+ atomic64_add_unchecked(1,
53610 (atomic64_t *)&priv->stats.rx_packets);
53611- atomic64_add(skb->len,
53612+ atomic64_add_unchecked(skb->len,
53613 (atomic64_t *)&priv->stats.rx_bytes);
53614 #else
53615- atomic_add(1,
53616+ atomic_add_unchecked(1,
53617 (atomic_t *)&priv->stats.rx_packets);
53618- atomic_add(skb->len,
53619+ atomic_add_unchecked(skb->len,
53620 (atomic_t *)&priv->stats.rx_bytes);
53621 #endif
53622 }
53623@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53624 dev->name);
53625 */
53626 #ifdef CONFIG_64BIT
53627- atomic64_add(1,
53628+ atomic64_add_unchecked(1,
53629 (atomic64_t *)&priv->stats.rx_dropped);
53630 #else
53631- atomic_add(1,
53632+ atomic_add_unchecked(1,
53633 (atomic_t *)&priv->stats.rx_dropped);
53634 #endif
53635 dev_kfree_skb_irq(skb);
53636diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53637index 460e854..f926452 100644
53638--- a/drivers/staging/octeon/ethernet.c
53639+++ b/drivers/staging/octeon/ethernet.c
53640@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53641 * since the RX tasklet also increments it.
53642 */
53643 #ifdef CONFIG_64BIT
53644- atomic64_add(rx_status.dropped_packets,
53645- (atomic64_t *)&priv->stats.rx_dropped);
53646+ atomic64_add_unchecked(rx_status.dropped_packets,
53647+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53648 #else
53649- atomic_add(rx_status.dropped_packets,
53650- (atomic_t *)&priv->stats.rx_dropped);
53651+ atomic_add_unchecked(rx_status.dropped_packets,
53652+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53653 #endif
53654 }
53655
53656diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53657index 3b476d8..f522d68 100644
53658--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53659+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53660@@ -225,7 +225,7 @@ struct hal_ops {
53661
53662 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53663 void (*hal_reset_security_engine)(struct adapter *adapter);
53664-};
53665+} __no_const;
53666
53667 enum rt_eeprom_type {
53668 EEPROM_93C46,
53669diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53670index 070cc03..6806e37 100644
53671--- a/drivers/staging/rtl8712/rtl871x_io.h
53672+++ b/drivers/staging/rtl8712/rtl871x_io.h
53673@@ -108,7 +108,7 @@ struct _io_ops {
53674 u8 *pmem);
53675 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53676 u8 *pmem);
53677-};
53678+} __no_const;
53679
53680 struct io_req {
53681 struct list_head list;
53682diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53683index 98f3ba4..c6a7fce 100644
53684--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53685+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53686@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
53687 void (*device_resume)(ulong bus_no, ulong dev_no);
53688 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53689 ulong *max_size);
53690-};
53691+} __no_const;
53692
53693 /* These functions live inside visorchipset, and will be called to indicate
53694 * responses to specific events (by code outside of visorchipset).
53695@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
53696 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53697 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53698 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53699-};
53700+} __no_const;
53701
53702 /** Register functions (in the bus driver) to get called by visorchipset
53703 * whenever a bus or device appears for which this service partition is
53704diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53705index 9512af6..045bf5a 100644
53706--- a/drivers/target/sbp/sbp_target.c
53707+++ b/drivers/target/sbp/sbp_target.c
53708@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
53709
53710 #define SESSION_MAINTENANCE_INTERVAL HZ
53711
53712-static atomic_t login_id = ATOMIC_INIT(0);
53713+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53714
53715 static void session_maintenance_work(struct work_struct *);
53716 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53717@@ -444,7 +444,7 @@ static void sbp_management_request_login(
53718 login->lun = se_lun;
53719 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53720 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53721- login->login_id = atomic_inc_return(&login_id);
53722+ login->login_id = atomic_inc_return_unchecked(&login_id);
53723
53724 login->tgt_agt = sbp_target_agent_register(login);
53725 if (IS_ERR(login->tgt_agt)) {
53726diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53727index 7faa6ae..ae6c410 100644
53728--- a/drivers/target/target_core_device.c
53729+++ b/drivers/target/target_core_device.c
53730@@ -1495,7 +1495,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53731 spin_lock_init(&dev->se_tmr_lock);
53732 spin_lock_init(&dev->qf_cmd_lock);
53733 sema_init(&dev->caw_sem, 1);
53734- atomic_set(&dev->dev_ordered_id, 0);
53735+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53736 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53737 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53738 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53739diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53740index f786de0..04b643e 100644
53741--- a/drivers/target/target_core_transport.c
53742+++ b/drivers/target/target_core_transport.c
53743@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53744 * Used to determine when ORDERED commands should go from
53745 * Dormant to Active status.
53746 */
53747- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53748+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53749 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53750 cmd->se_ordered_id, cmd->sam_task_attr,
53751 dev->transport->name);
53752diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53753index 031018e..90981a1 100644
53754--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53755+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53756@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53757 platform_set_drvdata(pdev, priv);
53758
53759 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53760- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53761- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53762+ pax_open_kernel();
53763+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53764+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53765+ pax_close_kernel();
53766 }
53767 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53768 priv, &int3400_thermal_ops,
53769diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53770index 668fb1b..2737bbe 100644
53771--- a/drivers/thermal/of-thermal.c
53772+++ b/drivers/thermal/of-thermal.c
53773@@ -31,6 +31,7 @@
53774 #include <linux/export.h>
53775 #include <linux/string.h>
53776 #include <linux/thermal.h>
53777+#include <linux/mm.h>
53778
53779 #include "thermal_core.h"
53780
53781@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53782 tz->ops = ops;
53783 tz->sensor_data = data;
53784
53785- tzd->ops->get_temp = of_thermal_get_temp;
53786- tzd->ops->get_trend = of_thermal_get_trend;
53787- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53788+ pax_open_kernel();
53789+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53790+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53791+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53792+ pax_close_kernel();
53793 mutex_unlock(&tzd->lock);
53794
53795 return tzd;
53796@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53797 return;
53798
53799 mutex_lock(&tzd->lock);
53800- tzd->ops->get_temp = NULL;
53801- tzd->ops->get_trend = NULL;
53802- tzd->ops->set_emul_temp = NULL;
53803+ pax_open_kernel();
53804+ *(void **)&tzd->ops->get_temp = NULL;
53805+ *(void **)&tzd->ops->get_trend = NULL;
53806+ *(void **)&tzd->ops->set_emul_temp = NULL;
53807+ pax_close_kernel();
53808
53809 tz->ops = NULL;
53810 tz->sensor_data = NULL;
53811diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53812index 9ea3d9d..53e8792 100644
53813--- a/drivers/thermal/x86_pkg_temp_thermal.c
53814+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53815@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53816 return NOTIFY_OK;
53817 }
53818
53819-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53820+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53821 .notifier_call = pkg_temp_thermal_cpu_callback,
53822 };
53823
53824diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53825index fd66f57..48e6376 100644
53826--- a/drivers/tty/cyclades.c
53827+++ b/drivers/tty/cyclades.c
53828@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53829 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53830 info->port.count);
53831 #endif
53832- info->port.count++;
53833+ atomic_inc(&info->port.count);
53834 #ifdef CY_DEBUG_COUNT
53835 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53836- current->pid, info->port.count);
53837+ current->pid, atomic_read(&info->port.count));
53838 #endif
53839
53840 /*
53841@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53842 for (j = 0; j < cy_card[i].nports; j++) {
53843 info = &cy_card[i].ports[j];
53844
53845- if (info->port.count) {
53846+ if (atomic_read(&info->port.count)) {
53847 /* XXX is the ldisc num worth this? */
53848 struct tty_struct *tty;
53849 struct tty_ldisc *ld;
53850diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53851index 4fcec1d..5a036f7 100644
53852--- a/drivers/tty/hvc/hvc_console.c
53853+++ b/drivers/tty/hvc/hvc_console.c
53854@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53855
53856 spin_lock_irqsave(&hp->port.lock, flags);
53857 /* Check and then increment for fast path open. */
53858- if (hp->port.count++ > 0) {
53859+ if (atomic_inc_return(&hp->port.count) > 1) {
53860 spin_unlock_irqrestore(&hp->port.lock, flags);
53861 hvc_kick();
53862 return 0;
53863@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53864
53865 spin_lock_irqsave(&hp->port.lock, flags);
53866
53867- if (--hp->port.count == 0) {
53868+ if (atomic_dec_return(&hp->port.count) == 0) {
53869 spin_unlock_irqrestore(&hp->port.lock, flags);
53870 /* We are done with the tty pointer now. */
53871 tty_port_tty_set(&hp->port, NULL);
53872@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53873 */
53874 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
53875 } else {
53876- if (hp->port.count < 0)
53877+ if (atomic_read(&hp->port.count) < 0)
53878 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53879- hp->vtermno, hp->port.count);
53880+ hp->vtermno, atomic_read(&hp->port.count));
53881 spin_unlock_irqrestore(&hp->port.lock, flags);
53882 }
53883 }
53884@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53885 * open->hangup case this can be called after the final close so prevent
53886 * that from happening for now.
53887 */
53888- if (hp->port.count <= 0) {
53889+ if (atomic_read(&hp->port.count) <= 0) {
53890 spin_unlock_irqrestore(&hp->port.lock, flags);
53891 return;
53892 }
53893
53894- hp->port.count = 0;
53895+ atomic_set(&hp->port.count, 0);
53896 spin_unlock_irqrestore(&hp->port.lock, flags);
53897 tty_port_tty_set(&hp->port, NULL);
53898
53899@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53900 return -EPIPE;
53901
53902 /* FIXME what's this (unprotected) check for? */
53903- if (hp->port.count <= 0)
53904+ if (atomic_read(&hp->port.count) <= 0)
53905 return -EIO;
53906
53907 spin_lock_irqsave(&hp->lock, flags);
53908diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53909index 81ff7e1..dfb7b71 100644
53910--- a/drivers/tty/hvc/hvcs.c
53911+++ b/drivers/tty/hvc/hvcs.c
53912@@ -83,6 +83,7 @@
53913 #include <asm/hvcserver.h>
53914 #include <asm/uaccess.h>
53915 #include <asm/vio.h>
53916+#include <asm/local.h>
53917
53918 /*
53919 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53920@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53921
53922 spin_lock_irqsave(&hvcsd->lock, flags);
53923
53924- if (hvcsd->port.count > 0) {
53925+ if (atomic_read(&hvcsd->port.count) > 0) {
53926 spin_unlock_irqrestore(&hvcsd->lock, flags);
53927 printk(KERN_INFO "HVCS: vterm state unchanged. "
53928 "The hvcs device node is still in use.\n");
53929@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
53930 }
53931 }
53932
53933- hvcsd->port.count = 0;
53934+ atomic_set(&hvcsd->port.count, 0);
53935 hvcsd->port.tty = tty;
53936 tty->driver_data = hvcsd;
53937
53938@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
53939 unsigned long flags;
53940
53941 spin_lock_irqsave(&hvcsd->lock, flags);
53942- hvcsd->port.count++;
53943+ atomic_inc(&hvcsd->port.count);
53944 hvcsd->todo_mask |= HVCS_SCHED_READ;
53945 spin_unlock_irqrestore(&hvcsd->lock, flags);
53946
53947@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53948 hvcsd = tty->driver_data;
53949
53950 spin_lock_irqsave(&hvcsd->lock, flags);
53951- if (--hvcsd->port.count == 0) {
53952+ if (atomic_dec_and_test(&hvcsd->port.count)) {
53953
53954 vio_disable_interrupts(hvcsd->vdev);
53955
53956@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53957
53958 free_irq(irq, hvcsd);
53959 return;
53960- } else if (hvcsd->port.count < 0) {
53961+ } else if (atomic_read(&hvcsd->port.count) < 0) {
53962 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
53963 " is missmanaged.\n",
53964- hvcsd->vdev->unit_address, hvcsd->port.count);
53965+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
53966 }
53967
53968 spin_unlock_irqrestore(&hvcsd->lock, flags);
53969@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53970
53971 spin_lock_irqsave(&hvcsd->lock, flags);
53972 /* Preserve this so that we know how many kref refs to put */
53973- temp_open_count = hvcsd->port.count;
53974+ temp_open_count = atomic_read(&hvcsd->port.count);
53975
53976 /*
53977 * Don't kref put inside the spinlock because the destruction
53978@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53979 tty->driver_data = NULL;
53980 hvcsd->port.tty = NULL;
53981
53982- hvcsd->port.count = 0;
53983+ atomic_set(&hvcsd->port.count, 0);
53984
53985 /* This will drop any buffered data on the floor which is OK in a hangup
53986 * scenario. */
53987@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
53988 * the middle of a write operation? This is a crummy place to do this
53989 * but we want to keep it all in the spinlock.
53990 */
53991- if (hvcsd->port.count <= 0) {
53992+ if (atomic_read(&hvcsd->port.count) <= 0) {
53993 spin_unlock_irqrestore(&hvcsd->lock, flags);
53994 return -ENODEV;
53995 }
53996@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
53997 {
53998 struct hvcs_struct *hvcsd = tty->driver_data;
53999
54000- if (!hvcsd || hvcsd->port.count <= 0)
54001+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54002 return 0;
54003
54004 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54005diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54006index 4190199..06d5bfa 100644
54007--- a/drivers/tty/hvc/hvsi.c
54008+++ b/drivers/tty/hvc/hvsi.c
54009@@ -85,7 +85,7 @@ struct hvsi_struct {
54010 int n_outbuf;
54011 uint32_t vtermno;
54012 uint32_t virq;
54013- atomic_t seqno; /* HVSI packet sequence number */
54014+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54015 uint16_t mctrl;
54016 uint8_t state; /* HVSI protocol state */
54017 uint8_t flags;
54018@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54019
54020 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54021 packet.hdr.len = sizeof(struct hvsi_query_response);
54022- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54023+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54024 packet.verb = VSV_SEND_VERSION_NUMBER;
54025 packet.u.version = HVSI_VERSION;
54026 packet.query_seqno = query_seqno+1;
54027@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54028
54029 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54030 packet.hdr.len = sizeof(struct hvsi_query);
54031- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54032+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54033 packet.verb = verb;
54034
54035 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54036@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54037 int wrote;
54038
54039 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54040- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54041+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54042 packet.hdr.len = sizeof(struct hvsi_control);
54043 packet.verb = VSV_SET_MODEM_CTL;
54044 packet.mask = HVSI_TSDTR;
54045@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54046 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54047
54048 packet.hdr.type = VS_DATA_PACKET_HEADER;
54049- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54050+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54051 packet.hdr.len = count + sizeof(struct hvsi_header);
54052 memcpy(&packet.data, buf, count);
54053
54054@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54055 struct hvsi_control packet __ALIGNED__;
54056
54057 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54058- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54059+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54060 packet.hdr.len = 6;
54061 packet.verb = VSV_CLOSE_PROTOCOL;
54062
54063@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54064
54065 tty_port_tty_set(&hp->port, tty);
54066 spin_lock_irqsave(&hp->lock, flags);
54067- hp->port.count++;
54068+ atomic_inc(&hp->port.count);
54069 atomic_set(&hp->seqno, 0);
54070 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54071 spin_unlock_irqrestore(&hp->lock, flags);
54072@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54073
54074 spin_lock_irqsave(&hp->lock, flags);
54075
54076- if (--hp->port.count == 0) {
54077+ if (atomic_dec_return(&hp->port.count) == 0) {
54078 tty_port_tty_set(&hp->port, NULL);
54079 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54080
54081@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54082
54083 spin_lock_irqsave(&hp->lock, flags);
54084 }
54085- } else if (hp->port.count < 0)
54086+ } else if (atomic_read(&hp->port.count) < 0)
54087 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54088- hp - hvsi_ports, hp->port.count);
54089+ hp - hvsi_ports, atomic_read(&hp->port.count));
54090
54091 spin_unlock_irqrestore(&hp->lock, flags);
54092 }
54093@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54094 tty_port_tty_set(&hp->port, NULL);
54095
54096 spin_lock_irqsave(&hp->lock, flags);
54097- hp->port.count = 0;
54098+ atomic_set(&hp->port.count, 0);
54099 hp->n_outbuf = 0;
54100 spin_unlock_irqrestore(&hp->lock, flags);
54101 }
54102diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54103index a270f04..7c77b5d 100644
54104--- a/drivers/tty/hvc/hvsi_lib.c
54105+++ b/drivers/tty/hvc/hvsi_lib.c
54106@@ -8,7 +8,7 @@
54107
54108 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54109 {
54110- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54111+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54112
54113 /* Assumes that always succeeds, works in practice */
54114 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54115@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54116
54117 /* Reset state */
54118 pv->established = 0;
54119- atomic_set(&pv->seqno, 0);
54120+ atomic_set_unchecked(&pv->seqno, 0);
54121
54122 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54123
54124diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54125index 345cebb..d5a1e9e 100644
54126--- a/drivers/tty/ipwireless/tty.c
54127+++ b/drivers/tty/ipwireless/tty.c
54128@@ -28,6 +28,7 @@
54129 #include <linux/tty_driver.h>
54130 #include <linux/tty_flip.h>
54131 #include <linux/uaccess.h>
54132+#include <asm/local.h>
54133
54134 #include "tty.h"
54135 #include "network.h"
54136@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54137 return -ENODEV;
54138
54139 mutex_lock(&tty->ipw_tty_mutex);
54140- if (tty->port.count == 0)
54141+ if (atomic_read(&tty->port.count) == 0)
54142 tty->tx_bytes_queued = 0;
54143
54144- tty->port.count++;
54145+ atomic_inc(&tty->port.count);
54146
54147 tty->port.tty = linux_tty;
54148 linux_tty->driver_data = tty;
54149@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54150
54151 static void do_ipw_close(struct ipw_tty *tty)
54152 {
54153- tty->port.count--;
54154-
54155- if (tty->port.count == 0) {
54156+ if (atomic_dec_return(&tty->port.count) == 0) {
54157 struct tty_struct *linux_tty = tty->port.tty;
54158
54159 if (linux_tty != NULL) {
54160@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54161 return;
54162
54163 mutex_lock(&tty->ipw_tty_mutex);
54164- if (tty->port.count == 0) {
54165+ if (atomic_read(&tty->port.count) == 0) {
54166 mutex_unlock(&tty->ipw_tty_mutex);
54167 return;
54168 }
54169@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54170
54171 mutex_lock(&tty->ipw_tty_mutex);
54172
54173- if (!tty->port.count) {
54174+ if (!atomic_read(&tty->port.count)) {
54175 mutex_unlock(&tty->ipw_tty_mutex);
54176 return;
54177 }
54178@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54179 return -ENODEV;
54180
54181 mutex_lock(&tty->ipw_tty_mutex);
54182- if (!tty->port.count) {
54183+ if (!atomic_read(&tty->port.count)) {
54184 mutex_unlock(&tty->ipw_tty_mutex);
54185 return -EINVAL;
54186 }
54187@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54188 if (!tty)
54189 return -ENODEV;
54190
54191- if (!tty->port.count)
54192+ if (!atomic_read(&tty->port.count))
54193 return -EINVAL;
54194
54195 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54196@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54197 if (!tty)
54198 return 0;
54199
54200- if (!tty->port.count)
54201+ if (!atomic_read(&tty->port.count))
54202 return 0;
54203
54204 return tty->tx_bytes_queued;
54205@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54206 if (!tty)
54207 return -ENODEV;
54208
54209- if (!tty->port.count)
54210+ if (!atomic_read(&tty->port.count))
54211 return -EINVAL;
54212
54213 return get_control_lines(tty);
54214@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54215 if (!tty)
54216 return -ENODEV;
54217
54218- if (!tty->port.count)
54219+ if (!atomic_read(&tty->port.count))
54220 return -EINVAL;
54221
54222 return set_control_lines(tty, set, clear);
54223@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54224 if (!tty)
54225 return -ENODEV;
54226
54227- if (!tty->port.count)
54228+ if (!atomic_read(&tty->port.count))
54229 return -EINVAL;
54230
54231 /* FIXME: Exactly how is the tty object locked here .. */
54232@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54233 * are gone */
54234 mutex_lock(&ttyj->ipw_tty_mutex);
54235 }
54236- while (ttyj->port.count)
54237+ while (atomic_read(&ttyj->port.count))
54238 do_ipw_close(ttyj);
54239 ipwireless_disassociate_network_ttys(network,
54240 ttyj->channel_idx);
54241diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54242index 14c54e0..1efd4f2 100644
54243--- a/drivers/tty/moxa.c
54244+++ b/drivers/tty/moxa.c
54245@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54246 }
54247
54248 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54249- ch->port.count++;
54250+ atomic_inc(&ch->port.count);
54251 tty->driver_data = ch;
54252 tty_port_tty_set(&ch->port, tty);
54253 mutex_lock(&ch->port.mutex);
54254diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54255index bce16e4..1120a85 100644
54256--- a/drivers/tty/n_gsm.c
54257+++ b/drivers/tty/n_gsm.c
54258@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54259 spin_lock_init(&dlci->lock);
54260 mutex_init(&dlci->mutex);
54261 dlci->fifo = &dlci->_fifo;
54262- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54263+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54264 kfree(dlci);
54265 return NULL;
54266 }
54267@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54268 struct gsm_dlci *dlci = tty->driver_data;
54269 struct tty_port *port = &dlci->port;
54270
54271- port->count++;
54272+ atomic_inc(&port->count);
54273 tty_port_tty_set(port, tty);
54274
54275 dlci->modem_rx = 0;
54276diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54277index cc57a3a..b39622b 100644
54278--- a/drivers/tty/n_tty.c
54279+++ b/drivers/tty/n_tty.c
54280@@ -116,7 +116,7 @@ struct n_tty_data {
54281 int minimum_to_wake;
54282
54283 /* consumer-published */
54284- size_t read_tail;
54285+ size_t read_tail __intentional_overflow(-1);
54286 size_t line_start;
54287
54288 /* protected by output lock */
54289@@ -2561,6 +2561,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54290 {
54291 *ops = tty_ldisc_N_TTY;
54292 ops->owner = NULL;
54293- ops->refcount = ops->flags = 0;
54294+ atomic_set(&ops->refcount, 0);
54295+ ops->flags = 0;
54296 }
54297 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54298diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54299index 4d5e840..a2340a6 100644
54300--- a/drivers/tty/pty.c
54301+++ b/drivers/tty/pty.c
54302@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54303 panic("Couldn't register Unix98 pts driver");
54304
54305 /* Now create the /dev/ptmx special device */
54306+ pax_open_kernel();
54307 tty_default_fops(&ptmx_fops);
54308- ptmx_fops.open = ptmx_open;
54309+ *(void **)&ptmx_fops.open = ptmx_open;
54310+ pax_close_kernel();
54311
54312 cdev_init(&ptmx_cdev, &ptmx_fops);
54313 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54314diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54315index c8dd8dc..dca6cfd 100644
54316--- a/drivers/tty/rocket.c
54317+++ b/drivers/tty/rocket.c
54318@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54319 tty->driver_data = info;
54320 tty_port_tty_set(port, tty);
54321
54322- if (port->count++ == 0) {
54323+ if (atomic_inc_return(&port->count) == 1) {
54324 atomic_inc(&rp_num_ports_open);
54325
54326 #ifdef ROCKET_DEBUG_OPEN
54327@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54328 #endif
54329 }
54330 #ifdef ROCKET_DEBUG_OPEN
54331- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54332+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54333 #endif
54334
54335 /*
54336@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54337 spin_unlock_irqrestore(&info->port.lock, flags);
54338 return;
54339 }
54340- if (info->port.count)
54341+ if (atomic_read(&info->port.count))
54342 atomic_dec(&rp_num_ports_open);
54343 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54344 spin_unlock_irqrestore(&info->port.lock, flags);
54345diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54346index aa28209..e08fb85 100644
54347--- a/drivers/tty/serial/ioc4_serial.c
54348+++ b/drivers/tty/serial/ioc4_serial.c
54349@@ -437,7 +437,7 @@ struct ioc4_soft {
54350 } is_intr_info[MAX_IOC4_INTR_ENTS];
54351
54352 /* Number of entries active in the above array */
54353- atomic_t is_num_intrs;
54354+ atomic_unchecked_t is_num_intrs;
54355 } is_intr_type[IOC4_NUM_INTR_TYPES];
54356
54357 /* is_ir_lock must be held while
54358@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54359 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54360 || (type == IOC4_OTHER_INTR_TYPE)));
54361
54362- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54363+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54364 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54365
54366 /* Save off the lower level interrupt handler */
54367@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54368
54369 soft = arg;
54370 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54371- num_intrs = (int)atomic_read(
54372+ num_intrs = (int)atomic_read_unchecked(
54373 &soft->is_intr_type[intr_type].is_num_intrs);
54374
54375 this_mir = this_ir = pending_intrs(soft, intr_type);
54376diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54377index 129dc5b..1da5bb8 100644
54378--- a/drivers/tty/serial/kgdb_nmi.c
54379+++ b/drivers/tty/serial/kgdb_nmi.c
54380@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54381 * I/O utilities that messages sent to the console will automatically
54382 * be displayed on the dbg_io.
54383 */
54384- dbg_io_ops->is_console = true;
54385+ pax_open_kernel();
54386+ *(int *)&dbg_io_ops->is_console = true;
54387+ pax_close_kernel();
54388
54389 return 0;
54390 }
54391diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54392index a260cde..6b2b5ce 100644
54393--- a/drivers/tty/serial/kgdboc.c
54394+++ b/drivers/tty/serial/kgdboc.c
54395@@ -24,8 +24,9 @@
54396 #define MAX_CONFIG_LEN 40
54397
54398 static struct kgdb_io kgdboc_io_ops;
54399+static struct kgdb_io kgdboc_io_ops_console;
54400
54401-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54402+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54403 static int configured = -1;
54404
54405 static char config[MAX_CONFIG_LEN];
54406@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54407 kgdboc_unregister_kbd();
54408 if (configured == 1)
54409 kgdb_unregister_io_module(&kgdboc_io_ops);
54410+ else if (configured == 2)
54411+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54412 }
54413
54414 static int configure_kgdboc(void)
54415@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54416 int err;
54417 char *cptr = config;
54418 struct console *cons;
54419+ int is_console = 0;
54420
54421 err = kgdboc_option_setup(config);
54422 if (err || !strlen(config) || isspace(config[0]))
54423 goto noconfig;
54424
54425 err = -ENODEV;
54426- kgdboc_io_ops.is_console = 0;
54427 kgdb_tty_driver = NULL;
54428
54429 kgdboc_use_kms = 0;
54430@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54431 int idx;
54432 if (cons->device && cons->device(cons, &idx) == p &&
54433 idx == tty_line) {
54434- kgdboc_io_ops.is_console = 1;
54435+ is_console = 1;
54436 break;
54437 }
54438 cons = cons->next;
54439@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54440 kgdb_tty_line = tty_line;
54441
54442 do_register:
54443- err = kgdb_register_io_module(&kgdboc_io_ops);
54444+ if (is_console) {
54445+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54446+ configured = 2;
54447+ } else {
54448+ err = kgdb_register_io_module(&kgdboc_io_ops);
54449+ configured = 1;
54450+ }
54451 if (err)
54452 goto noconfig;
54453
54454@@ -205,8 +214,6 @@ do_register:
54455 if (err)
54456 goto nmi_con_failed;
54457
54458- configured = 1;
54459-
54460 return 0;
54461
54462 nmi_con_failed:
54463@@ -223,7 +230,7 @@ noconfig:
54464 static int __init init_kgdboc(void)
54465 {
54466 /* Already configured? */
54467- if (configured == 1)
54468+ if (configured >= 1)
54469 return 0;
54470
54471 return configure_kgdboc();
54472@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54473 if (config[len - 1] == '\n')
54474 config[len - 1] = '\0';
54475
54476- if (configured == 1)
54477+ if (configured >= 1)
54478 cleanup_kgdboc();
54479
54480 /* Go and configure with the new params. */
54481@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54482 .post_exception = kgdboc_post_exp_handler,
54483 };
54484
54485+static struct kgdb_io kgdboc_io_ops_console = {
54486+ .name = "kgdboc",
54487+ .read_char = kgdboc_get_char,
54488+ .write_char = kgdboc_put_char,
54489+ .pre_exception = kgdboc_pre_exp_handler,
54490+ .post_exception = kgdboc_post_exp_handler,
54491+ .is_console = 1
54492+};
54493+
54494 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54495 /* This is only available if kgdboc is a built in for early debugging */
54496 static int __init kgdboc_early_init(char *opt)
54497diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54498index b73889c..9f74f0a 100644
54499--- a/drivers/tty/serial/msm_serial.c
54500+++ b/drivers/tty/serial/msm_serial.c
54501@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54502 .cons = MSM_CONSOLE,
54503 };
54504
54505-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54506+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54507
54508 static const struct of_device_id msm_uartdm_table[] = {
54509 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54510@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54511 line = pdev->id;
54512
54513 if (line < 0)
54514- line = atomic_inc_return(&msm_uart_next_id) - 1;
54515+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54516
54517 if (unlikely(line < 0 || line >= UART_NR))
54518 return -ENXIO;
54519diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54520index cf08876..711e0bf 100644
54521--- a/drivers/tty/serial/samsung.c
54522+++ b/drivers/tty/serial/samsung.c
54523@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54524 ourport->tx_in_progress = 0;
54525 }
54526
54527+static int s3c64xx_serial_startup(struct uart_port *port);
54528 static int s3c24xx_serial_startup(struct uart_port *port)
54529 {
54530 struct s3c24xx_uart_port *ourport = to_ourport(port);
54531 int ret;
54532
54533+ /* Startup sequence is different for s3c64xx and higher SoC's */
54534+ if (s3c24xx_serial_has_interrupt_mask(port))
54535+ return s3c64xx_serial_startup(port);
54536+
54537 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54538 port, (unsigned long long)port->mapbase, port->membase);
54539
54540@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54541 /* setup info for port */
54542 port->dev = &platdev->dev;
54543
54544- /* Startup sequence is different for s3c64xx and higher SoC's */
54545- if (s3c24xx_serial_has_interrupt_mask(port))
54546- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54547-
54548 port->uartclk = 1;
54549
54550 if (cfg->uart_flags & UPF_CONS_FLOW) {
54551diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54552index 6a1055a..5ca9ad9 100644
54553--- a/drivers/tty/serial/serial_core.c
54554+++ b/drivers/tty/serial/serial_core.c
54555@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54556 state = drv->state + tty->index;
54557 port = &state->port;
54558 spin_lock_irq(&port->lock);
54559- --port->count;
54560+ atomic_dec(&port->count);
54561 spin_unlock_irq(&port->lock);
54562 return;
54563 }
54564@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54565
54566 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54567
54568- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54569+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54570 return;
54571
54572 /*
54573@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54574 uart_flush_buffer(tty);
54575 uart_shutdown(tty, state);
54576 spin_lock_irqsave(&port->lock, flags);
54577- port->count = 0;
54578+ atomic_set(&port->count, 0);
54579 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54580 spin_unlock_irqrestore(&port->lock, flags);
54581 tty_port_tty_set(port, NULL);
54582@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54583 pr_debug("uart_open(%d) called\n", line);
54584
54585 spin_lock_irq(&port->lock);
54586- ++port->count;
54587+ atomic_inc(&port->count);
54588 spin_unlock_irq(&port->lock);
54589
54590 /*
54591diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54592index b799170..87dafd5 100644
54593--- a/drivers/tty/synclink.c
54594+++ b/drivers/tty/synclink.c
54595@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54596
54597 if (debug_level >= DEBUG_LEVEL_INFO)
54598 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54599- __FILE__,__LINE__, info->device_name, info->port.count);
54600+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54601
54602 if (tty_port_close_start(&info->port, tty, filp) == 0)
54603 goto cleanup;
54604@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54605 cleanup:
54606 if (debug_level >= DEBUG_LEVEL_INFO)
54607 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54608- tty->driver->name, info->port.count);
54609+ tty->driver->name, atomic_read(&info->port.count));
54610
54611 } /* end of mgsl_close() */
54612
54613@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54614
54615 mgsl_flush_buffer(tty);
54616 shutdown(info);
54617-
54618- info->port.count = 0;
54619+
54620+ atomic_set(&info->port.count, 0);
54621 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54622 info->port.tty = NULL;
54623
54624@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54625
54626 if (debug_level >= DEBUG_LEVEL_INFO)
54627 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54628- __FILE__,__LINE__, tty->driver->name, port->count );
54629+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54630
54631 spin_lock_irqsave(&info->irq_spinlock, flags);
54632- port->count--;
54633+ atomic_dec(&port->count);
54634 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54635 port->blocked_open++;
54636
54637@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54638
54639 if (debug_level >= DEBUG_LEVEL_INFO)
54640 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54641- __FILE__,__LINE__, tty->driver->name, port->count );
54642+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54643
54644 tty_unlock(tty);
54645 schedule();
54646@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54647
54648 /* FIXME: Racy on hangup during close wait */
54649 if (!tty_hung_up_p(filp))
54650- port->count++;
54651+ atomic_inc(&port->count);
54652 port->blocked_open--;
54653
54654 if (debug_level >= DEBUG_LEVEL_INFO)
54655 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54656- __FILE__,__LINE__, tty->driver->name, port->count );
54657+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54658
54659 if (!retval)
54660 port->flags |= ASYNC_NORMAL_ACTIVE;
54661@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54662
54663 if (debug_level >= DEBUG_LEVEL_INFO)
54664 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54665- __FILE__,__LINE__,tty->driver->name, info->port.count);
54666+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54667
54668 /* If port is closing, signal caller to try again */
54669 if (info->port.flags & ASYNC_CLOSING){
54670@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54671 spin_unlock_irqrestore(&info->netlock, flags);
54672 goto cleanup;
54673 }
54674- info->port.count++;
54675+ atomic_inc(&info->port.count);
54676 spin_unlock_irqrestore(&info->netlock, flags);
54677
54678- if (info->port.count == 1) {
54679+ if (atomic_read(&info->port.count) == 1) {
54680 /* 1st open on this device, init hardware */
54681 retval = startup(info);
54682 if (retval < 0)
54683@@ -3442,8 +3442,8 @@ cleanup:
54684 if (retval) {
54685 if (tty->count == 1)
54686 info->port.tty = NULL; /* tty layer will release tty struct */
54687- if(info->port.count)
54688- info->port.count--;
54689+ if (atomic_read(&info->port.count))
54690+ atomic_dec(&info->port.count);
54691 }
54692
54693 return retval;
54694@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54695 unsigned short new_crctype;
54696
54697 /* return error if TTY interface open */
54698- if (info->port.count)
54699+ if (atomic_read(&info->port.count))
54700 return -EBUSY;
54701
54702 switch (encoding)
54703@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54704
54705 /* arbitrate between network and tty opens */
54706 spin_lock_irqsave(&info->netlock, flags);
54707- if (info->port.count != 0 || info->netcount != 0) {
54708+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54709 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54710 spin_unlock_irqrestore(&info->netlock, flags);
54711 return -EBUSY;
54712@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54713 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54714
54715 /* return error if TTY interface open */
54716- if (info->port.count)
54717+ if (atomic_read(&info->port.count))
54718 return -EBUSY;
54719
54720 if (cmd != SIOCWANDEV)
54721diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54722index 0e8c39b..e0cb171 100644
54723--- a/drivers/tty/synclink_gt.c
54724+++ b/drivers/tty/synclink_gt.c
54725@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54726 tty->driver_data = info;
54727 info->port.tty = tty;
54728
54729- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54730+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54731
54732 /* If port is closing, signal caller to try again */
54733 if (info->port.flags & ASYNC_CLOSING){
54734@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54735 mutex_unlock(&info->port.mutex);
54736 goto cleanup;
54737 }
54738- info->port.count++;
54739+ atomic_inc(&info->port.count);
54740 spin_unlock_irqrestore(&info->netlock, flags);
54741
54742- if (info->port.count == 1) {
54743+ if (atomic_read(&info->port.count) == 1) {
54744 /* 1st open on this device, init hardware */
54745 retval = startup(info);
54746 if (retval < 0) {
54747@@ -715,8 +715,8 @@ cleanup:
54748 if (retval) {
54749 if (tty->count == 1)
54750 info->port.tty = NULL; /* tty layer will release tty struct */
54751- if(info->port.count)
54752- info->port.count--;
54753+ if(atomic_read(&info->port.count))
54754+ atomic_dec(&info->port.count);
54755 }
54756
54757 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54758@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54759
54760 if (sanity_check(info, tty->name, "close"))
54761 return;
54762- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54763+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54764
54765 if (tty_port_close_start(&info->port, tty, filp) == 0)
54766 goto cleanup;
54767@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54768 tty_port_close_end(&info->port, tty);
54769 info->port.tty = NULL;
54770 cleanup:
54771- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54772+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54773 }
54774
54775 static void hangup(struct tty_struct *tty)
54776@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54777 shutdown(info);
54778
54779 spin_lock_irqsave(&info->port.lock, flags);
54780- info->port.count = 0;
54781+ atomic_set(&info->port.count, 0);
54782 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54783 info->port.tty = NULL;
54784 spin_unlock_irqrestore(&info->port.lock, flags);
54785@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54786 unsigned short new_crctype;
54787
54788 /* return error if TTY interface open */
54789- if (info->port.count)
54790+ if (atomic_read(&info->port.count))
54791 return -EBUSY;
54792
54793 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54794@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54795
54796 /* arbitrate between network and tty opens */
54797 spin_lock_irqsave(&info->netlock, flags);
54798- if (info->port.count != 0 || info->netcount != 0) {
54799+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54800 DBGINFO(("%s hdlc_open busy\n", dev->name));
54801 spin_unlock_irqrestore(&info->netlock, flags);
54802 return -EBUSY;
54803@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54804 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54805
54806 /* return error if TTY interface open */
54807- if (info->port.count)
54808+ if (atomic_read(&info->port.count))
54809 return -EBUSY;
54810
54811 if (cmd != SIOCWANDEV)
54812@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54813 if (port == NULL)
54814 continue;
54815 spin_lock(&port->lock);
54816- if ((port->port.count || port->netcount) &&
54817+ if ((atomic_read(&port->port.count) || port->netcount) &&
54818 port->pending_bh && !port->bh_running &&
54819 !port->bh_requested) {
54820 DBGISR(("%s bh queued\n", port->device_name));
54821@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54822 add_wait_queue(&port->open_wait, &wait);
54823
54824 spin_lock_irqsave(&info->lock, flags);
54825- port->count--;
54826+ atomic_dec(&port->count);
54827 spin_unlock_irqrestore(&info->lock, flags);
54828 port->blocked_open++;
54829
54830@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54831 remove_wait_queue(&port->open_wait, &wait);
54832
54833 if (!tty_hung_up_p(filp))
54834- port->count++;
54835+ atomic_inc(&port->count);
54836 port->blocked_open--;
54837
54838 if (!retval)
54839diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54840index c3f9091..abe4601 100644
54841--- a/drivers/tty/synclinkmp.c
54842+++ b/drivers/tty/synclinkmp.c
54843@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54844
54845 if (debug_level >= DEBUG_LEVEL_INFO)
54846 printk("%s(%d):%s open(), old ref count = %d\n",
54847- __FILE__,__LINE__,tty->driver->name, info->port.count);
54848+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54849
54850 /* If port is closing, signal caller to try again */
54851 if (info->port.flags & ASYNC_CLOSING){
54852@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54853 spin_unlock_irqrestore(&info->netlock, flags);
54854 goto cleanup;
54855 }
54856- info->port.count++;
54857+ atomic_inc(&info->port.count);
54858 spin_unlock_irqrestore(&info->netlock, flags);
54859
54860- if (info->port.count == 1) {
54861+ if (atomic_read(&info->port.count) == 1) {
54862 /* 1st open on this device, init hardware */
54863 retval = startup(info);
54864 if (retval < 0)
54865@@ -796,8 +796,8 @@ cleanup:
54866 if (retval) {
54867 if (tty->count == 1)
54868 info->port.tty = NULL; /* tty layer will release tty struct */
54869- if(info->port.count)
54870- info->port.count--;
54871+ if(atomic_read(&info->port.count))
54872+ atomic_dec(&info->port.count);
54873 }
54874
54875 return retval;
54876@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54877
54878 if (debug_level >= DEBUG_LEVEL_INFO)
54879 printk("%s(%d):%s close() entry, count=%d\n",
54880- __FILE__,__LINE__, info->device_name, info->port.count);
54881+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54882
54883 if (tty_port_close_start(&info->port, tty, filp) == 0)
54884 goto cleanup;
54885@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54886 cleanup:
54887 if (debug_level >= DEBUG_LEVEL_INFO)
54888 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
54889- tty->driver->name, info->port.count);
54890+ tty->driver->name, atomic_read(&info->port.count));
54891 }
54892
54893 /* Called by tty_hangup() when a hangup is signaled.
54894@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
54895 shutdown(info);
54896
54897 spin_lock_irqsave(&info->port.lock, flags);
54898- info->port.count = 0;
54899+ atomic_set(&info->port.count, 0);
54900 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54901 info->port.tty = NULL;
54902 spin_unlock_irqrestore(&info->port.lock, flags);
54903@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54904 unsigned short new_crctype;
54905
54906 /* return error if TTY interface open */
54907- if (info->port.count)
54908+ if (atomic_read(&info->port.count))
54909 return -EBUSY;
54910
54911 switch (encoding)
54912@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
54913
54914 /* arbitrate between network and tty opens */
54915 spin_lock_irqsave(&info->netlock, flags);
54916- if (info->port.count != 0 || info->netcount != 0) {
54917+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54918 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54919 spin_unlock_irqrestore(&info->netlock, flags);
54920 return -EBUSY;
54921@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54922 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54923
54924 /* return error if TTY interface open */
54925- if (info->port.count)
54926+ if (atomic_read(&info->port.count))
54927 return -EBUSY;
54928
54929 if (cmd != SIOCWANDEV)
54930@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
54931 * do not request bottom half processing if the
54932 * device is not open in a normal mode.
54933 */
54934- if ( port && (port->port.count || port->netcount) &&
54935+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
54936 port->pending_bh && !port->bh_running &&
54937 !port->bh_requested ) {
54938 if ( debug_level >= DEBUG_LEVEL_ISR )
54939@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54940
54941 if (debug_level >= DEBUG_LEVEL_INFO)
54942 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
54943- __FILE__,__LINE__, tty->driver->name, port->count );
54944+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54945
54946 spin_lock_irqsave(&info->lock, flags);
54947- port->count--;
54948+ atomic_dec(&port->count);
54949 spin_unlock_irqrestore(&info->lock, flags);
54950 port->blocked_open++;
54951
54952@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54953
54954 if (debug_level >= DEBUG_LEVEL_INFO)
54955 printk("%s(%d):%s block_til_ready() count=%d\n",
54956- __FILE__,__LINE__, tty->driver->name, port->count );
54957+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54958
54959 tty_unlock(tty);
54960 schedule();
54961@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54962 set_current_state(TASK_RUNNING);
54963 remove_wait_queue(&port->open_wait, &wait);
54964 if (!tty_hung_up_p(filp))
54965- port->count++;
54966+ atomic_inc(&port->count);
54967 port->blocked_open--;
54968
54969 if (debug_level >= DEBUG_LEVEL_INFO)
54970 printk("%s(%d):%s block_til_ready() after, count=%d\n",
54971- __FILE__,__LINE__, tty->driver->name, port->count );
54972+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54973
54974 if (!retval)
54975 port->flags |= ASYNC_NORMAL_ACTIVE;
54976diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
54977index 259a4d5..9b0c9e7 100644
54978--- a/drivers/tty/sysrq.c
54979+++ b/drivers/tty/sysrq.c
54980@@ -1085,7 +1085,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
54981 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
54982 size_t count, loff_t *ppos)
54983 {
54984- if (count) {
54985+ if (count && capable(CAP_SYS_ADMIN)) {
54986 char c;
54987
54988 if (get_user(c, buf))
54989diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
54990index 2bb4dfc..a7f6e86 100644
54991--- a/drivers/tty/tty_io.c
54992+++ b/drivers/tty/tty_io.c
54993@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
54994
54995 void tty_default_fops(struct file_operations *fops)
54996 {
54997- *fops = tty_fops;
54998+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
54999 }
55000
55001 /*
55002diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55003index 3737f55..7cef448 100644
55004--- a/drivers/tty/tty_ldisc.c
55005+++ b/drivers/tty/tty_ldisc.c
55006@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55007 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55008 tty_ldiscs[disc] = new_ldisc;
55009 new_ldisc->num = disc;
55010- new_ldisc->refcount = 0;
55011+ atomic_set(&new_ldisc->refcount, 0);
55012 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55013
55014 return ret;
55015@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55016 return -EINVAL;
55017
55018 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55019- if (tty_ldiscs[disc]->refcount)
55020+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55021 ret = -EBUSY;
55022 else
55023 tty_ldiscs[disc] = NULL;
55024@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55025 if (ldops) {
55026 ret = ERR_PTR(-EAGAIN);
55027 if (try_module_get(ldops->owner)) {
55028- ldops->refcount++;
55029+ atomic_inc(&ldops->refcount);
55030 ret = ldops;
55031 }
55032 }
55033@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55034 unsigned long flags;
55035
55036 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55037- ldops->refcount--;
55038+ atomic_dec(&ldops->refcount);
55039 module_put(ldops->owner);
55040 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55041 }
55042diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55043index 40b31835..94d92ae 100644
55044--- a/drivers/tty/tty_port.c
55045+++ b/drivers/tty/tty_port.c
55046@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55047 unsigned long flags;
55048
55049 spin_lock_irqsave(&port->lock, flags);
55050- port->count = 0;
55051+ atomic_set(&port->count, 0);
55052 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55053 tty = port->tty;
55054 if (tty)
55055@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55056
55057 /* The port lock protects the port counts */
55058 spin_lock_irqsave(&port->lock, flags);
55059- port->count--;
55060+ atomic_dec(&port->count);
55061 port->blocked_open++;
55062 spin_unlock_irqrestore(&port->lock, flags);
55063
55064@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55065 we must not mess that up further */
55066 spin_lock_irqsave(&port->lock, flags);
55067 if (!tty_hung_up_p(filp))
55068- port->count++;
55069+ atomic_inc(&port->count);
55070 port->blocked_open--;
55071 if (retval == 0)
55072 port->flags |= ASYNC_NORMAL_ACTIVE;
55073@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55074 return 0;
55075
55076 spin_lock_irqsave(&port->lock, flags);
55077- if (tty->count == 1 && port->count != 1) {
55078+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55079 printk(KERN_WARNING
55080 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55081- port->count);
55082- port->count = 1;
55083+ atomic_read(&port->count));
55084+ atomic_set(&port->count, 1);
55085 }
55086- if (--port->count < 0) {
55087+ if (atomic_dec_return(&port->count) < 0) {
55088 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55089- port->count);
55090- port->count = 0;
55091+ atomic_read(&port->count));
55092+ atomic_set(&port->count, 0);
55093 }
55094
55095- if (port->count) {
55096+ if (atomic_read(&port->count)) {
55097 spin_unlock_irqrestore(&port->lock, flags);
55098 return 0;
55099 }
55100@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55101 struct file *filp)
55102 {
55103 spin_lock_irq(&port->lock);
55104- ++port->count;
55105+ atomic_inc(&port->count);
55106 spin_unlock_irq(&port->lock);
55107 tty_port_tty_set(port, tty);
55108
55109diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55110index 8a89f6e..50b32af 100644
55111--- a/drivers/tty/vt/keyboard.c
55112+++ b/drivers/tty/vt/keyboard.c
55113@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55114 kbd->kbdmode == VC_OFF) &&
55115 value != KVAL(K_SAK))
55116 return; /* SAK is allowed even in raw mode */
55117+
55118+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55119+ {
55120+ void *func = fn_handler[value];
55121+ if (func == fn_show_state || func == fn_show_ptregs ||
55122+ func == fn_show_mem)
55123+ return;
55124+ }
55125+#endif
55126+
55127 fn_handler[value](vc);
55128 }
55129
55130@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55131 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55132 return -EFAULT;
55133
55134- if (!capable(CAP_SYS_TTY_CONFIG))
55135- perm = 0;
55136-
55137 switch (cmd) {
55138 case KDGKBENT:
55139 /* Ensure another thread doesn't free it under us */
55140@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55141 spin_unlock_irqrestore(&kbd_event_lock, flags);
55142 return put_user(val, &user_kbe->kb_value);
55143 case KDSKBENT:
55144+ if (!capable(CAP_SYS_TTY_CONFIG))
55145+ perm = 0;
55146+
55147 if (!perm)
55148 return -EPERM;
55149 if (!i && v == K_NOSUCHMAP) {
55150@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55151 int i, j, k;
55152 int ret;
55153
55154- if (!capable(CAP_SYS_TTY_CONFIG))
55155- perm = 0;
55156-
55157 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55158 if (!kbs) {
55159 ret = -ENOMEM;
55160@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55161 kfree(kbs);
55162 return ((p && *p) ? -EOVERFLOW : 0);
55163 case KDSKBSENT:
55164+ if (!capable(CAP_SYS_TTY_CONFIG))
55165+ perm = 0;
55166+
55167 if (!perm) {
55168 ret = -EPERM;
55169 goto reterr;
55170diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55171index 6276f13..84f2449 100644
55172--- a/drivers/uio/uio.c
55173+++ b/drivers/uio/uio.c
55174@@ -25,6 +25,7 @@
55175 #include <linux/kobject.h>
55176 #include <linux/cdev.h>
55177 #include <linux/uio_driver.h>
55178+#include <asm/local.h>
55179
55180 #define UIO_MAX_DEVICES (1U << MINORBITS)
55181
55182@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55183 struct device_attribute *attr, char *buf)
55184 {
55185 struct uio_device *idev = dev_get_drvdata(dev);
55186- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55187+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55188 }
55189 static DEVICE_ATTR_RO(event);
55190
55191@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55192 {
55193 struct uio_device *idev = info->uio_dev;
55194
55195- atomic_inc(&idev->event);
55196+ atomic_inc_unchecked(&idev->event);
55197 wake_up_interruptible(&idev->wait);
55198 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55199 }
55200@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55201 }
55202
55203 listener->dev = idev;
55204- listener->event_count = atomic_read(&idev->event);
55205+ listener->event_count = atomic_read_unchecked(&idev->event);
55206 filep->private_data = listener;
55207
55208 if (idev->info->open) {
55209@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55210 return -EIO;
55211
55212 poll_wait(filep, &idev->wait, wait);
55213- if (listener->event_count != atomic_read(&idev->event))
55214+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55215 return POLLIN | POLLRDNORM;
55216 return 0;
55217 }
55218@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55219 do {
55220 set_current_state(TASK_INTERRUPTIBLE);
55221
55222- event_count = atomic_read(&idev->event);
55223+ event_count = atomic_read_unchecked(&idev->event);
55224 if (event_count != listener->event_count) {
55225 if (copy_to_user(buf, &event_count, count))
55226 retval = -EFAULT;
55227@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55228 static int uio_find_mem_index(struct vm_area_struct *vma)
55229 {
55230 struct uio_device *idev = vma->vm_private_data;
55231+ unsigned long size;
55232
55233 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55234- if (idev->info->mem[vma->vm_pgoff].size == 0)
55235+ size = idev->info->mem[vma->vm_pgoff].size;
55236+ if (size == 0)
55237+ return -1;
55238+ if (vma->vm_end - vma->vm_start > size)
55239 return -1;
55240 return (int)vma->vm_pgoff;
55241 }
55242@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55243 idev->owner = owner;
55244 idev->info = info;
55245 init_waitqueue_head(&idev->wait);
55246- atomic_set(&idev->event, 0);
55247+ atomic_set_unchecked(&idev->event, 0);
55248
55249 ret = uio_get_minor(idev);
55250 if (ret)
55251diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55252index 813d4d3..a71934f 100644
55253--- a/drivers/usb/atm/cxacru.c
55254+++ b/drivers/usb/atm/cxacru.c
55255@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55256 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55257 if (ret < 2)
55258 return -EINVAL;
55259- if (index < 0 || index > 0x7f)
55260+ if (index > 0x7f)
55261 return -EINVAL;
55262 pos += tmp;
55263
55264diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55265index dada014..1d0d517 100644
55266--- a/drivers/usb/atm/usbatm.c
55267+++ b/drivers/usb/atm/usbatm.c
55268@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55269 if (printk_ratelimit())
55270 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55271 __func__, vpi, vci);
55272- atomic_inc(&vcc->stats->rx_err);
55273+ atomic_inc_unchecked(&vcc->stats->rx_err);
55274 return;
55275 }
55276
55277@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55278 if (length > ATM_MAX_AAL5_PDU) {
55279 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55280 __func__, length, vcc);
55281- atomic_inc(&vcc->stats->rx_err);
55282+ atomic_inc_unchecked(&vcc->stats->rx_err);
55283 goto out;
55284 }
55285
55286@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55287 if (sarb->len < pdu_length) {
55288 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55289 __func__, pdu_length, sarb->len, vcc);
55290- atomic_inc(&vcc->stats->rx_err);
55291+ atomic_inc_unchecked(&vcc->stats->rx_err);
55292 goto out;
55293 }
55294
55295 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55296 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55297 __func__, vcc);
55298- atomic_inc(&vcc->stats->rx_err);
55299+ atomic_inc_unchecked(&vcc->stats->rx_err);
55300 goto out;
55301 }
55302
55303@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55304 if (printk_ratelimit())
55305 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55306 __func__, length);
55307- atomic_inc(&vcc->stats->rx_drop);
55308+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55309 goto out;
55310 }
55311
55312@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55313
55314 vcc->push(vcc, skb);
55315
55316- atomic_inc(&vcc->stats->rx);
55317+ atomic_inc_unchecked(&vcc->stats->rx);
55318 out:
55319 skb_trim(sarb, 0);
55320 }
55321@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55322 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55323
55324 usbatm_pop(vcc, skb);
55325- atomic_inc(&vcc->stats->tx);
55326+ atomic_inc_unchecked(&vcc->stats->tx);
55327
55328 skb = skb_dequeue(&instance->sndqueue);
55329 }
55330@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55331 if (!left--)
55332 return sprintf(page,
55333 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55334- atomic_read(&atm_dev->stats.aal5.tx),
55335- atomic_read(&atm_dev->stats.aal5.tx_err),
55336- atomic_read(&atm_dev->stats.aal5.rx),
55337- atomic_read(&atm_dev->stats.aal5.rx_err),
55338- atomic_read(&atm_dev->stats.aal5.rx_drop));
55339+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55340+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55341+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55342+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55343+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55344
55345 if (!left--) {
55346 if (instance->disconnected)
55347diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55348index 2a3bbdf..91d72cf 100644
55349--- a/drivers/usb/core/devices.c
55350+++ b/drivers/usb/core/devices.c
55351@@ -126,7 +126,7 @@ static const char format_endpt[] =
55352 * time it gets called.
55353 */
55354 static struct device_connect_event {
55355- atomic_t count;
55356+ atomic_unchecked_t count;
55357 wait_queue_head_t wait;
55358 } device_event = {
55359 .count = ATOMIC_INIT(1),
55360@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55361
55362 void usbfs_conn_disc_event(void)
55363 {
55364- atomic_add(2, &device_event.count);
55365+ atomic_add_unchecked(2, &device_event.count);
55366 wake_up(&device_event.wait);
55367 }
55368
55369@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55370
55371 poll_wait(file, &device_event.wait, wait);
55372
55373- event_count = atomic_read(&device_event.count);
55374+ event_count = atomic_read_unchecked(&device_event.count);
55375 if (file->f_version != event_count) {
55376 file->f_version = event_count;
55377 return POLLIN | POLLRDNORM;
55378diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55379index 1163553..f292679 100644
55380--- a/drivers/usb/core/devio.c
55381+++ b/drivers/usb/core/devio.c
55382@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55383 struct usb_dev_state *ps = file->private_data;
55384 struct usb_device *dev = ps->dev;
55385 ssize_t ret = 0;
55386- unsigned len;
55387+ size_t len;
55388 loff_t pos;
55389 int i;
55390
55391@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55392 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55393 struct usb_config_descriptor *config =
55394 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55395- unsigned int length = le16_to_cpu(config->wTotalLength);
55396+ size_t length = le16_to_cpu(config->wTotalLength);
55397
55398 if (*ppos < pos + length) {
55399
55400 /* The descriptor may claim to be longer than it
55401 * really is. Here is the actual allocated length. */
55402- unsigned alloclen =
55403+ size_t alloclen =
55404 le16_to_cpu(dev->config[i].desc.wTotalLength);
55405
55406- len = length - (*ppos - pos);
55407+ len = length + pos - *ppos;
55408 if (len > nbytes)
55409 len = nbytes;
55410
55411 /* Simply don't write (skip over) unallocated parts */
55412 if (alloclen > (*ppos - pos)) {
55413- alloclen -= (*ppos - pos);
55414+ alloclen = alloclen + pos - *ppos;
55415 if (copy_to_user(buf,
55416 dev->rawdescriptors[i] + (*ppos - pos),
55417 min(len, alloclen))) {
55418diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55419index 45a915c..09f9735 100644
55420--- a/drivers/usb/core/hcd.c
55421+++ b/drivers/usb/core/hcd.c
55422@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55423 */
55424 usb_get_urb(urb);
55425 atomic_inc(&urb->use_count);
55426- atomic_inc(&urb->dev->urbnum);
55427+ atomic_inc_unchecked(&urb->dev->urbnum);
55428 usbmon_urb_submit(&hcd->self, urb);
55429
55430 /* NOTE requirements on root-hub callers (usbfs and the hub
55431@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55432 urb->hcpriv = NULL;
55433 INIT_LIST_HEAD(&urb->urb_list);
55434 atomic_dec(&urb->use_count);
55435- atomic_dec(&urb->dev->urbnum);
55436+ atomic_dec_unchecked(&urb->dev->urbnum);
55437 if (atomic_read(&urb->reject))
55438 wake_up(&usb_kill_urb_queue);
55439 usb_put_urb(urb);
55440diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55441index 3b71516..1f26579 100644
55442--- a/drivers/usb/core/hub.c
55443+++ b/drivers/usb/core/hub.c
55444@@ -26,6 +26,7 @@
55445 #include <linux/mutex.h>
55446 #include <linux/random.h>
55447 #include <linux/pm_qos.h>
55448+#include <linux/grsecurity.h>
55449
55450 #include <asm/uaccess.h>
55451 #include <asm/byteorder.h>
55452@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55453 goto done;
55454 return;
55455 }
55456+
55457+ if (gr_handle_new_usb())
55458+ goto done;
55459+
55460 if (hub_is_superspeed(hub->hdev))
55461 unit_load = 150;
55462 else
55463diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55464index f368d20..0c30ac5 100644
55465--- a/drivers/usb/core/message.c
55466+++ b/drivers/usb/core/message.c
55467@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55468 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55469 * error number.
55470 */
55471-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55472+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55473 __u8 requesttype, __u16 value, __u16 index, void *data,
55474 __u16 size, int timeout)
55475 {
55476@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55477 * If successful, 0. Otherwise a negative error number. The number of actual
55478 * bytes transferred will be stored in the @actual_length parameter.
55479 */
55480-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55481+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55482 void *data, int len, int *actual_length, int timeout)
55483 {
55484 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55485@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55486 * bytes transferred will be stored in the @actual_length parameter.
55487 *
55488 */
55489-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55490+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55491 void *data, int len, int *actual_length, int timeout)
55492 {
55493 struct urb *urb;
55494diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55495index d269738..7340cd7 100644
55496--- a/drivers/usb/core/sysfs.c
55497+++ b/drivers/usb/core/sysfs.c
55498@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55499 struct usb_device *udev;
55500
55501 udev = to_usb_device(dev);
55502- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55503+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55504 }
55505 static DEVICE_ATTR_RO(urbnum);
55506
55507diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55508index b1fb9ae..4224885 100644
55509--- a/drivers/usb/core/usb.c
55510+++ b/drivers/usb/core/usb.c
55511@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55512 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55513 dev->state = USB_STATE_ATTACHED;
55514 dev->lpm_disable_count = 1;
55515- atomic_set(&dev->urbnum, 0);
55516+ atomic_set_unchecked(&dev->urbnum, 0);
55517
55518 INIT_LIST_HEAD(&dev->ep0.urb_list);
55519 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55520diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55521index 8cfc319..4868255 100644
55522--- a/drivers/usb/early/ehci-dbgp.c
55523+++ b/drivers/usb/early/ehci-dbgp.c
55524@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55525
55526 #ifdef CONFIG_KGDB
55527 static struct kgdb_io kgdbdbgp_io_ops;
55528-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55529+static struct kgdb_io kgdbdbgp_io_ops_console;
55530+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55531 #else
55532 #define dbgp_kgdb_mode (0)
55533 #endif
55534@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55535 .write_char = kgdbdbgp_write_char,
55536 };
55537
55538+static struct kgdb_io kgdbdbgp_io_ops_console = {
55539+ .name = "kgdbdbgp",
55540+ .read_char = kgdbdbgp_read_char,
55541+ .write_char = kgdbdbgp_write_char,
55542+ .is_console = 1
55543+};
55544+
55545 static int kgdbdbgp_wait_time;
55546
55547 static int __init kgdbdbgp_parse_config(char *str)
55548@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55549 ptr++;
55550 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55551 }
55552- kgdb_register_io_module(&kgdbdbgp_io_ops);
55553- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55554+ if (early_dbgp_console.index != -1)
55555+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55556+ else
55557+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55558
55559 return 0;
55560 }
55561diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55562index 9719abf..789d5d9 100644
55563--- a/drivers/usb/gadget/function/f_uac1.c
55564+++ b/drivers/usb/gadget/function/f_uac1.c
55565@@ -14,6 +14,7 @@
55566 #include <linux/module.h>
55567 #include <linux/device.h>
55568 #include <linux/atomic.h>
55569+#include <linux/module.h>
55570
55571 #include "u_uac1.h"
55572
55573diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55574index 491082a..dfd7d17 100644
55575--- a/drivers/usb/gadget/function/u_serial.c
55576+++ b/drivers/usb/gadget/function/u_serial.c
55577@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55578 spin_lock_irq(&port->port_lock);
55579
55580 /* already open? Great. */
55581- if (port->port.count) {
55582+ if (atomic_read(&port->port.count)) {
55583 status = 0;
55584- port->port.count++;
55585+ atomic_inc(&port->port.count);
55586
55587 /* currently opening/closing? wait ... */
55588 } else if (port->openclose) {
55589@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55590 tty->driver_data = port;
55591 port->port.tty = tty;
55592
55593- port->port.count = 1;
55594+ atomic_set(&port->port.count, 1);
55595 port->openclose = false;
55596
55597 /* if connected, start the I/O stream */
55598@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55599
55600 spin_lock_irq(&port->port_lock);
55601
55602- if (port->port.count != 1) {
55603- if (port->port.count == 0)
55604+ if (atomic_read(&port->port.count) != 1) {
55605+ if (atomic_read(&port->port.count) == 0)
55606 WARN_ON(1);
55607 else
55608- --port->port.count;
55609+ atomic_dec(&port->port.count);
55610 goto exit;
55611 }
55612
55613@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55614 * and sleep if necessary
55615 */
55616 port->openclose = true;
55617- port->port.count = 0;
55618+ atomic_set(&port->port.count, 0);
55619
55620 gser = port->port_usb;
55621 if (gser && gser->disconnect)
55622@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
55623 int cond;
55624
55625 spin_lock_irq(&port->port_lock);
55626- cond = (port->port.count == 0) && !port->openclose;
55627+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55628 spin_unlock_irq(&port->port_lock);
55629 return cond;
55630 }
55631@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55632 /* if it's already open, start I/O ... and notify the serial
55633 * protocol about open/close status (connect/disconnect).
55634 */
55635- if (port->port.count) {
55636+ if (atomic_read(&port->port.count)) {
55637 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55638 gs_start_io(port);
55639 if (gser->connect)
55640@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
55641
55642 port->port_usb = NULL;
55643 gser->ioport = NULL;
55644- if (port->port.count > 0 || port->openclose) {
55645+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55646 wake_up_interruptible(&port->drain_wait);
55647 if (port->port.tty)
55648 tty_hangup(port->port.tty);
55649@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
55650
55651 /* finally, free any unused/unusable I/O buffers */
55652 spin_lock_irqsave(&port->port_lock, flags);
55653- if (port->port.count == 0 && !port->openclose)
55654+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55655 gs_buf_free(&port->port_write_buf);
55656 gs_free_requests(gser->out, &port->read_pool, NULL);
55657 gs_free_requests(gser->out, &port->read_queue, NULL);
55658diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55659index c78c841..48fd281 100644
55660--- a/drivers/usb/gadget/function/u_uac1.c
55661+++ b/drivers/usb/gadget/function/u_uac1.c
55662@@ -17,6 +17,7 @@
55663 #include <linux/ctype.h>
55664 #include <linux/random.h>
55665 #include <linux/syscalls.h>
55666+#include <linux/module.h>
55667
55668 #include "u_uac1.h"
55669
55670diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55671index 7354d01..299478e 100644
55672--- a/drivers/usb/host/ehci-hub.c
55673+++ b/drivers/usb/host/ehci-hub.c
55674@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55675 urb->transfer_flags = URB_DIR_IN;
55676 usb_get_urb(urb);
55677 atomic_inc(&urb->use_count);
55678- atomic_inc(&urb->dev->urbnum);
55679+ atomic_inc_unchecked(&urb->dev->urbnum);
55680 urb->setup_dma = dma_map_single(
55681 hcd->self.controller,
55682 urb->setup_packet,
55683@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55684 urb->status = -EINPROGRESS;
55685 usb_get_urb(urb);
55686 atomic_inc(&urb->use_count);
55687- atomic_inc(&urb->dev->urbnum);
55688+ atomic_inc_unchecked(&urb->dev->urbnum);
55689 retval = submit_single_step_set_feature(hcd, urb, 0);
55690 if (!retval && !wait_for_completion_timeout(&done,
55691 msecs_to_jiffies(2000))) {
55692diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55693index 1db0626..4948782 100644
55694--- a/drivers/usb/host/hwa-hc.c
55695+++ b/drivers/usb/host/hwa-hc.c
55696@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55697 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55698 struct wahc *wa = &hwahc->wa;
55699 struct device *dev = &wa->usb_iface->dev;
55700- u8 mas_le[UWB_NUM_MAS/8];
55701+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55702+
55703+ if (mas_le == NULL)
55704+ return -ENOMEM;
55705
55706 /* Set the stream index */
55707 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55708@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55709 WUSB_REQ_SET_WUSB_MAS,
55710 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55711 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55712- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55713+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55714 if (result < 0)
55715 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55716 out:
55717+ kfree(mas_le);
55718+
55719 return result;
55720 }
55721
55722diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55723index b3d245e..99549ed 100644
55724--- a/drivers/usb/misc/appledisplay.c
55725+++ b/drivers/usb/misc/appledisplay.c
55726@@ -84,7 +84,7 @@ struct appledisplay {
55727 struct mutex sysfslock; /* concurrent read and write */
55728 };
55729
55730-static atomic_t count_displays = ATOMIC_INIT(0);
55731+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55732 static struct workqueue_struct *wq;
55733
55734 static void appledisplay_complete(struct urb *urb)
55735@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55736
55737 /* Register backlight device */
55738 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55739- atomic_inc_return(&count_displays) - 1);
55740+ atomic_inc_return_unchecked(&count_displays) - 1);
55741 memset(&props, 0, sizeof(struct backlight_properties));
55742 props.type = BACKLIGHT_RAW;
55743 props.max_brightness = 0xff;
55744diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55745index 3806e70..55c508b 100644
55746--- a/drivers/usb/serial/console.c
55747+++ b/drivers/usb/serial/console.c
55748@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55749
55750 info->port = port;
55751
55752- ++port->port.count;
55753+ atomic_inc(&port->port.count);
55754 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55755 if (serial->type->set_termios) {
55756 /*
55757@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55758 }
55759 /* Now that any required fake tty operations are completed restore
55760 * the tty port count */
55761- --port->port.count;
55762+ atomic_dec(&port->port.count);
55763 /* The console is special in terms of closing the device so
55764 * indicate this port is now acting as a system console. */
55765 port->port.console = 1;
55766@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55767 put_tty:
55768 tty_kref_put(tty);
55769 reset_open_count:
55770- port->port.count = 0;
55771+ atomic_set(&port->port.count, 0);
55772 usb_autopm_put_interface(serial->interface);
55773 error_get_interface:
55774 usb_serial_put(serial);
55775@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55776 static void usb_console_write(struct console *co,
55777 const char *buf, unsigned count)
55778 {
55779- static struct usbcons_info *info = &usbcons_info;
55780+ struct usbcons_info *info = &usbcons_info;
55781 struct usb_serial_port *port = info->port;
55782 struct usb_serial *serial;
55783 int retval = -ENODEV;
55784diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55785index 307e339..6aa97cb 100644
55786--- a/drivers/usb/storage/usb.h
55787+++ b/drivers/usb/storage/usb.h
55788@@ -63,7 +63,7 @@ struct us_unusual_dev {
55789 __u8 useProtocol;
55790 __u8 useTransport;
55791 int (*initFunction)(struct us_data *);
55792-};
55793+} __do_const;
55794
55795
55796 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55797diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55798index a863a98..d272795 100644
55799--- a/drivers/usb/usbip/vhci.h
55800+++ b/drivers/usb/usbip/vhci.h
55801@@ -83,7 +83,7 @@ struct vhci_hcd {
55802 unsigned resuming:1;
55803 unsigned long re_timeout;
55804
55805- atomic_t seqnum;
55806+ atomic_unchecked_t seqnum;
55807
55808 /*
55809 * NOTE:
55810diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55811index 11f6f61..1087910 100644
55812--- a/drivers/usb/usbip/vhci_hcd.c
55813+++ b/drivers/usb/usbip/vhci_hcd.c
55814@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55815
55816 spin_lock(&vdev->priv_lock);
55817
55818- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55819+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55820 if (priv->seqnum == 0xffff)
55821 dev_info(&urb->dev->dev, "seqnum max\n");
55822
55823@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55824 return -ENOMEM;
55825 }
55826
55827- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55828+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55829 if (unlink->seqnum == 0xffff)
55830 pr_info("seqnum max\n");
55831
55832@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55833 vdev->rhport = rhport;
55834 }
55835
55836- atomic_set(&vhci->seqnum, 0);
55837+ atomic_set_unchecked(&vhci->seqnum, 0);
55838 spin_lock_init(&vhci->lock);
55839
55840 hcd->power_budget = 0; /* no limit */
55841diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55842index 00e4a54..d676f85 100644
55843--- a/drivers/usb/usbip/vhci_rx.c
55844+++ b/drivers/usb/usbip/vhci_rx.c
55845@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55846 if (!urb) {
55847 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55848 pr_info("max seqnum %d\n",
55849- atomic_read(&the_controller->seqnum));
55850+ atomic_read_unchecked(&the_controller->seqnum));
55851 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55852 return;
55853 }
55854diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55855index edc7267..9f65ce2 100644
55856--- a/drivers/usb/wusbcore/wa-hc.h
55857+++ b/drivers/usb/wusbcore/wa-hc.h
55858@@ -240,7 +240,7 @@ struct wahc {
55859 spinlock_t xfer_list_lock;
55860 struct work_struct xfer_enqueue_work;
55861 struct work_struct xfer_error_work;
55862- atomic_t xfer_id_count;
55863+ atomic_unchecked_t xfer_id_count;
55864
55865 kernel_ulong_t quirks;
55866 };
55867@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
55868 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
55869 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
55870 wa->dto_in_use = 0;
55871- atomic_set(&wa->xfer_id_count, 1);
55872+ atomic_set_unchecked(&wa->xfer_id_count, 1);
55873 /* init the buf in URBs */
55874 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
55875 usb_init_urb(&(wa->buf_in_urbs[index]));
55876diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
55877index 69af4fd..da390d7 100644
55878--- a/drivers/usb/wusbcore/wa-xfer.c
55879+++ b/drivers/usb/wusbcore/wa-xfer.c
55880@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
55881 */
55882 static void wa_xfer_id_init(struct wa_xfer *xfer)
55883 {
55884- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
55885+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
55886 }
55887
55888 /* Return the xfer's ID. */
55889diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
55890index 837d177..170724af 100644
55891--- a/drivers/vfio/vfio.c
55892+++ b/drivers/vfio/vfio.c
55893@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
55894 return 0;
55895
55896 /* TODO Prevent device auto probing */
55897- WARN("Device %s added to live group %d!\n", dev_name(dev),
55898+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
55899 iommu_group_id(group->iommu_group));
55900
55901 return 0;
55902diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
55903index 3bb02c6..a01ff38 100644
55904--- a/drivers/vhost/vringh.c
55905+++ b/drivers/vhost/vringh.c
55906@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
55907 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
55908 {
55909 __virtio16 v = 0;
55910- int rc = get_user(v, (__force __virtio16 __user *)p);
55911+ int rc = get_user(v, (__force_user __virtio16 *)p);
55912 *val = vringh16_to_cpu(vrh, v);
55913 return rc;
55914 }
55915@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
55916 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
55917 {
55918 __virtio16 v = cpu_to_vringh16(vrh, val);
55919- return put_user(v, (__force __virtio16 __user *)p);
55920+ return put_user(v, (__force_user __virtio16 *)p);
55921 }
55922
55923 static inline int copydesc_user(void *dst, const void *src, size_t len)
55924 {
55925- return copy_from_user(dst, (__force void __user *)src, len) ?
55926+ return copy_from_user(dst, (void __force_user *)src, len) ?
55927 -EFAULT : 0;
55928 }
55929
55930@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
55931 const struct vring_used_elem *src,
55932 unsigned int num)
55933 {
55934- return copy_to_user((__force void __user *)dst, src,
55935+ return copy_to_user((void __force_user *)dst, src,
55936 sizeof(*dst) * num) ? -EFAULT : 0;
55937 }
55938
55939 static inline int xfer_from_user(void *src, void *dst, size_t len)
55940 {
55941- return copy_from_user(dst, (__force void __user *)src, len) ?
55942+ return copy_from_user(dst, (void __force_user *)src, len) ?
55943 -EFAULT : 0;
55944 }
55945
55946 static inline int xfer_to_user(void *dst, void *src, size_t len)
55947 {
55948- return copy_to_user((__force void __user *)dst, src, len) ?
55949+ return copy_to_user((void __force_user *)dst, src, len) ?
55950 -EFAULT : 0;
55951 }
55952
55953@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
55954 vrh->last_used_idx = 0;
55955 vrh->vring.num = num;
55956 /* vring expects kernel addresses, but only used via accessors. */
55957- vrh->vring.desc = (__force struct vring_desc *)desc;
55958- vrh->vring.avail = (__force struct vring_avail *)avail;
55959- vrh->vring.used = (__force struct vring_used *)used;
55960+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
55961+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
55962+ vrh->vring.used = (__force_kernel struct vring_used *)used;
55963 return 0;
55964 }
55965 EXPORT_SYMBOL(vringh_init_user);
55966@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
55967
55968 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
55969 {
55970- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
55971+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
55972 return 0;
55973 }
55974
55975diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
55976index 84a110a..96312c3 100644
55977--- a/drivers/video/backlight/kb3886_bl.c
55978+++ b/drivers/video/backlight/kb3886_bl.c
55979@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
55980 static unsigned long kb3886bl_flags;
55981 #define KB3886BL_SUSPENDED 0x01
55982
55983-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
55984+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
55985 {
55986 .ident = "Sahara Touch-iT",
55987 .matches = {
55988diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
55989index 1b0b233..6f34c2c 100644
55990--- a/drivers/video/fbdev/arcfb.c
55991+++ b/drivers/video/fbdev/arcfb.c
55992@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
55993 return -ENOSPC;
55994
55995 err = 0;
55996- if ((count + p) > fbmemlength) {
55997+ if (count > (fbmemlength - p)) {
55998 count = fbmemlength - p;
55999 err = -ENOSPC;
56000 }
56001diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56002index aedf2fb..47c9aca 100644
56003--- a/drivers/video/fbdev/aty/aty128fb.c
56004+++ b/drivers/video/fbdev/aty/aty128fb.c
56005@@ -149,7 +149,7 @@ enum {
56006 };
56007
56008 /* Must match above enum */
56009-static char * const r128_family[] = {
56010+static const char * const r128_family[] = {
56011 "AGP",
56012 "PCI",
56013 "PRO AGP",
56014diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56015index 8789e48..698fe4c 100644
56016--- a/drivers/video/fbdev/aty/atyfb_base.c
56017+++ b/drivers/video/fbdev/aty/atyfb_base.c
56018@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56019 par->accel_flags = var->accel_flags; /* hack */
56020
56021 if (var->accel_flags) {
56022- info->fbops->fb_sync = atyfb_sync;
56023+ pax_open_kernel();
56024+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56025+ pax_close_kernel();
56026 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56027 } else {
56028- info->fbops->fb_sync = NULL;
56029+ pax_open_kernel();
56030+ *(void **)&info->fbops->fb_sync = NULL;
56031+ pax_close_kernel();
56032 info->flags |= FBINFO_HWACCEL_DISABLED;
56033 }
56034
56035diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56036index 2fa0317..4983f2a 100644
56037--- a/drivers/video/fbdev/aty/mach64_cursor.c
56038+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56039@@ -8,6 +8,7 @@
56040 #include "../core/fb_draw.h"
56041
56042 #include <asm/io.h>
56043+#include <asm/pgtable.h>
56044
56045 #ifdef __sparc__
56046 #include <asm/fbio.h>
56047@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56048 info->sprite.buf_align = 16; /* and 64 lines tall. */
56049 info->sprite.flags = FB_PIXMAP_IO;
56050
56051- info->fbops->fb_cursor = atyfb_cursor;
56052+ pax_open_kernel();
56053+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56054+ pax_close_kernel();
56055
56056 return 0;
56057 }
56058diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56059index d6cab1f..112f680 100644
56060--- a/drivers/video/fbdev/core/fb_defio.c
56061+++ b/drivers/video/fbdev/core/fb_defio.c
56062@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56063
56064 BUG_ON(!fbdefio);
56065 mutex_init(&fbdefio->lock);
56066- info->fbops->fb_mmap = fb_deferred_io_mmap;
56067+ pax_open_kernel();
56068+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56069+ pax_close_kernel();
56070 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56071 INIT_LIST_HEAD(&fbdefio->pagelist);
56072 if (fbdefio->delay == 0) /* set a default of 1 s */
56073@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56074 page->mapping = NULL;
56075 }
56076
56077- info->fbops->fb_mmap = NULL;
56078+ *(void **)&info->fbops->fb_mmap = NULL;
56079 mutex_destroy(&fbdefio->lock);
56080 }
56081 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56082diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56083index 0705d88..d9429bf 100644
56084--- a/drivers/video/fbdev/core/fbmem.c
56085+++ b/drivers/video/fbdev/core/fbmem.c
56086@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56087 __u32 data;
56088 int err;
56089
56090- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56091+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56092
56093 data = (__u32) (unsigned long) fix->smem_start;
56094 err |= put_user(data, &fix32->smem_start);
56095diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56096index 4254336..282567e 100644
56097--- a/drivers/video/fbdev/hyperv_fb.c
56098+++ b/drivers/video/fbdev/hyperv_fb.c
56099@@ -240,7 +240,7 @@ static uint screen_fb_size;
56100 static inline int synthvid_send(struct hv_device *hdev,
56101 struct synthvid_msg *msg)
56102 {
56103- static atomic64_t request_id = ATOMIC64_INIT(0);
56104+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56105 int ret;
56106
56107 msg->pipe_hdr.type = PIPE_MSG_DATA;
56108@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56109
56110 ret = vmbus_sendpacket(hdev->channel, msg,
56111 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56112- atomic64_inc_return(&request_id),
56113+ atomic64_inc_return_unchecked(&request_id),
56114 VM_PKT_DATA_INBAND, 0);
56115
56116 if (ret)
56117diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56118index 7672d2e..b56437f 100644
56119--- a/drivers/video/fbdev/i810/i810_accel.c
56120+++ b/drivers/video/fbdev/i810/i810_accel.c
56121@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56122 }
56123 }
56124 printk("ringbuffer lockup!!!\n");
56125+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56126 i810_report_error(mmio);
56127 par->dev_flags |= LOCKUP;
56128 info->pixmap.scan_align = 1;
56129diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56130index a01147f..5d896f8 100644
56131--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56132+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56133@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56134
56135 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56136 struct matrox_switch matrox_mystique = {
56137- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56138+ .preinit = MGA1064_preinit,
56139+ .reset = MGA1064_reset,
56140+ .init = MGA1064_init,
56141+ .restore = MGA1064_restore,
56142 };
56143 EXPORT_SYMBOL(matrox_mystique);
56144 #endif
56145
56146 #ifdef CONFIG_FB_MATROX_G
56147 struct matrox_switch matrox_G100 = {
56148- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56149+ .preinit = MGAG100_preinit,
56150+ .reset = MGAG100_reset,
56151+ .init = MGAG100_init,
56152+ .restore = MGAG100_restore,
56153 };
56154 EXPORT_SYMBOL(matrox_G100);
56155 #endif
56156diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56157index 195ad7c..09743fc 100644
56158--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56159+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56160@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56161 }
56162
56163 struct matrox_switch matrox_millennium = {
56164- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56165+ .preinit = Ti3026_preinit,
56166+ .reset = Ti3026_reset,
56167+ .init = Ti3026_init,
56168+ .restore = Ti3026_restore
56169 };
56170 EXPORT_SYMBOL(matrox_millennium);
56171 #endif
56172diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56173index fe92eed..106e085 100644
56174--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56175+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56176@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56177 struct mb862xxfb_par *par = info->par;
56178
56179 if (info->var.bits_per_pixel == 32) {
56180- info->fbops->fb_fillrect = cfb_fillrect;
56181- info->fbops->fb_copyarea = cfb_copyarea;
56182- info->fbops->fb_imageblit = cfb_imageblit;
56183+ pax_open_kernel();
56184+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56185+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56186+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56187+ pax_close_kernel();
56188 } else {
56189 outreg(disp, GC_L0EM, 3);
56190- info->fbops->fb_fillrect = mb86290fb_fillrect;
56191- info->fbops->fb_copyarea = mb86290fb_copyarea;
56192- info->fbops->fb_imageblit = mb86290fb_imageblit;
56193+ pax_open_kernel();
56194+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56195+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56196+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56197+ pax_close_kernel();
56198 }
56199 outreg(draw, GDC_REG_DRAW_BASE, 0);
56200 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56201diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56202index def0412..fed6529 100644
56203--- a/drivers/video/fbdev/nvidia/nvidia.c
56204+++ b/drivers/video/fbdev/nvidia/nvidia.c
56205@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56206 info->fix.line_length = (info->var.xres_virtual *
56207 info->var.bits_per_pixel) >> 3;
56208 if (info->var.accel_flags) {
56209- info->fbops->fb_imageblit = nvidiafb_imageblit;
56210- info->fbops->fb_fillrect = nvidiafb_fillrect;
56211- info->fbops->fb_copyarea = nvidiafb_copyarea;
56212- info->fbops->fb_sync = nvidiafb_sync;
56213+ pax_open_kernel();
56214+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56215+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56216+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56217+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56218+ pax_close_kernel();
56219 info->pixmap.scan_align = 4;
56220 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56221 info->flags |= FBINFO_READS_FAST;
56222 NVResetGraphics(info);
56223 } else {
56224- info->fbops->fb_imageblit = cfb_imageblit;
56225- info->fbops->fb_fillrect = cfb_fillrect;
56226- info->fbops->fb_copyarea = cfb_copyarea;
56227- info->fbops->fb_sync = NULL;
56228+ pax_open_kernel();
56229+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56230+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56231+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56232+ *(void **)&info->fbops->fb_sync = NULL;
56233+ pax_close_kernel();
56234 info->pixmap.scan_align = 1;
56235 info->flags |= FBINFO_HWACCEL_DISABLED;
56236 info->flags &= ~FBINFO_READS_FAST;
56237@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56238 info->pixmap.size = 8 * 1024;
56239 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56240
56241- if (!hwcur)
56242- info->fbops->fb_cursor = NULL;
56243+ if (!hwcur) {
56244+ pax_open_kernel();
56245+ *(void **)&info->fbops->fb_cursor = NULL;
56246+ pax_close_kernel();
56247+ }
56248
56249 info->var.accel_flags = (!noaccel);
56250
56251diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56252index 2412a0d..294215b 100644
56253--- a/drivers/video/fbdev/omap2/dss/display.c
56254+++ b/drivers/video/fbdev/omap2/dss/display.c
56255@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56256 if (dssdev->name == NULL)
56257 dssdev->name = dssdev->alias;
56258
56259+ pax_open_kernel();
56260 if (drv && drv->get_resolution == NULL)
56261- drv->get_resolution = omapdss_default_get_resolution;
56262+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56263 if (drv && drv->get_recommended_bpp == NULL)
56264- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56265+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56266 if (drv && drv->get_timings == NULL)
56267- drv->get_timings = omapdss_default_get_timings;
56268+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56269+ pax_close_kernel();
56270
56271 mutex_lock(&panel_list_mutex);
56272 list_add_tail(&dssdev->panel_list, &panel_list);
56273diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56274index 83433cb..71e9b98 100644
56275--- a/drivers/video/fbdev/s1d13xxxfb.c
56276+++ b/drivers/video/fbdev/s1d13xxxfb.c
56277@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56278
56279 switch(prod_id) {
56280 case S1D13506_PROD_ID: /* activate acceleration */
56281- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56282- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56283+ pax_open_kernel();
56284+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56285+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56286+ pax_close_kernel();
56287 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56288 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56289 break;
56290diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56291index d3013cd..95b8285 100644
56292--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56293+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56294@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56295 }
56296
56297 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56298- lcdc_sys_write_index,
56299- lcdc_sys_write_data,
56300- lcdc_sys_read_data,
56301+ .write_index = lcdc_sys_write_index,
56302+ .write_data = lcdc_sys_write_data,
56303+ .read_data = lcdc_sys_read_data,
56304 };
56305
56306 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56307diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56308index 9279e5f..d5f5276 100644
56309--- a/drivers/video/fbdev/smscufx.c
56310+++ b/drivers/video/fbdev/smscufx.c
56311@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56312 fb_deferred_io_cleanup(info);
56313 kfree(info->fbdefio);
56314 info->fbdefio = NULL;
56315- info->fbops->fb_mmap = ufx_ops_mmap;
56316+ pax_open_kernel();
56317+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56318+ pax_close_kernel();
56319 }
56320
56321 pr_debug("released /dev/fb%d user=%d count=%d",
56322diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56323index ff2b873..626a8d5 100644
56324--- a/drivers/video/fbdev/udlfb.c
56325+++ b/drivers/video/fbdev/udlfb.c
56326@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56327 dlfb_urb_completion(urb);
56328
56329 error:
56330- atomic_add(bytes_sent, &dev->bytes_sent);
56331- atomic_add(bytes_identical, &dev->bytes_identical);
56332- atomic_add(width*height*2, &dev->bytes_rendered);
56333+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56334+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56335+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56336 end_cycles = get_cycles();
56337- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56338+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56339 >> 10)), /* Kcycles */
56340 &dev->cpu_kcycles_used);
56341
56342@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56343 dlfb_urb_completion(urb);
56344
56345 error:
56346- atomic_add(bytes_sent, &dev->bytes_sent);
56347- atomic_add(bytes_identical, &dev->bytes_identical);
56348- atomic_add(bytes_rendered, &dev->bytes_rendered);
56349+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56350+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56351+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56352 end_cycles = get_cycles();
56353- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56354+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56355 >> 10)), /* Kcycles */
56356 &dev->cpu_kcycles_used);
56357 }
56358@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56359 fb_deferred_io_cleanup(info);
56360 kfree(info->fbdefio);
56361 info->fbdefio = NULL;
56362- info->fbops->fb_mmap = dlfb_ops_mmap;
56363+ pax_open_kernel();
56364+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56365+ pax_close_kernel();
56366 }
56367
56368 pr_warn("released /dev/fb%d user=%d count=%d\n",
56369@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56370 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56371 struct dlfb_data *dev = fb_info->par;
56372 return snprintf(buf, PAGE_SIZE, "%u\n",
56373- atomic_read(&dev->bytes_rendered));
56374+ atomic_read_unchecked(&dev->bytes_rendered));
56375 }
56376
56377 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56378@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56379 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56380 struct dlfb_data *dev = fb_info->par;
56381 return snprintf(buf, PAGE_SIZE, "%u\n",
56382- atomic_read(&dev->bytes_identical));
56383+ atomic_read_unchecked(&dev->bytes_identical));
56384 }
56385
56386 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56387@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56388 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56389 struct dlfb_data *dev = fb_info->par;
56390 return snprintf(buf, PAGE_SIZE, "%u\n",
56391- atomic_read(&dev->bytes_sent));
56392+ atomic_read_unchecked(&dev->bytes_sent));
56393 }
56394
56395 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56396@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56397 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56398 struct dlfb_data *dev = fb_info->par;
56399 return snprintf(buf, PAGE_SIZE, "%u\n",
56400- atomic_read(&dev->cpu_kcycles_used));
56401+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56402 }
56403
56404 static ssize_t edid_show(
56405@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56406 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56407 struct dlfb_data *dev = fb_info->par;
56408
56409- atomic_set(&dev->bytes_rendered, 0);
56410- atomic_set(&dev->bytes_identical, 0);
56411- atomic_set(&dev->bytes_sent, 0);
56412- atomic_set(&dev->cpu_kcycles_used, 0);
56413+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56414+ atomic_set_unchecked(&dev->bytes_identical, 0);
56415+ atomic_set_unchecked(&dev->bytes_sent, 0);
56416+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56417
56418 return count;
56419 }
56420diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56421index d32d1c4..46722e6 100644
56422--- a/drivers/video/fbdev/uvesafb.c
56423+++ b/drivers/video/fbdev/uvesafb.c
56424@@ -19,6 +19,7 @@
56425 #include <linux/io.h>
56426 #include <linux/mutex.h>
56427 #include <linux/slab.h>
56428+#include <linux/moduleloader.h>
56429 #include <video/edid.h>
56430 #include <video/uvesafb.h>
56431 #ifdef CONFIG_X86
56432@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56433 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56434 par->pmi_setpal = par->ypan = 0;
56435 } else {
56436+
56437+#ifdef CONFIG_PAX_KERNEXEC
56438+#ifdef CONFIG_MODULES
56439+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56440+#endif
56441+ if (!par->pmi_code) {
56442+ par->pmi_setpal = par->ypan = 0;
56443+ return 0;
56444+ }
56445+#endif
56446+
56447 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56448 + task->t.regs.edi);
56449+
56450+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56451+ pax_open_kernel();
56452+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56453+ pax_close_kernel();
56454+
56455+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56456+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56457+#else
56458 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56459 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56460+#endif
56461+
56462 printk(KERN_INFO "uvesafb: protected mode interface info at "
56463 "%04x:%04x\n",
56464 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56465@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56466 par->ypan = ypan;
56467
56468 if (par->pmi_setpal || par->ypan) {
56469+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56470 if (__supported_pte_mask & _PAGE_NX) {
56471 par->pmi_setpal = par->ypan = 0;
56472 printk(KERN_WARNING "uvesafb: NX protection is active, "
56473 "better not use the PMI.\n");
56474- } else {
56475+ } else
56476+#endif
56477 uvesafb_vbe_getpmi(task, par);
56478- }
56479 }
56480 #else
56481 /* The protected mode interface is not available on non-x86. */
56482@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56483 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56484
56485 /* Disable blanking if the user requested so. */
56486- if (!blank)
56487- info->fbops->fb_blank = NULL;
56488+ if (!blank) {
56489+ pax_open_kernel();
56490+ *(void **)&info->fbops->fb_blank = NULL;
56491+ pax_close_kernel();
56492+ }
56493
56494 /*
56495 * Find out how much IO memory is required for the mode with
56496@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56497 info->flags = FBINFO_FLAG_DEFAULT |
56498 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56499
56500- if (!par->ypan)
56501- info->fbops->fb_pan_display = NULL;
56502+ if (!par->ypan) {
56503+ pax_open_kernel();
56504+ *(void **)&info->fbops->fb_pan_display = NULL;
56505+ pax_close_kernel();
56506+ }
56507 }
56508
56509 static void uvesafb_init_mtrr(struct fb_info *info)
56510@@ -1786,6 +1816,11 @@ out_mode:
56511 out:
56512 kfree(par->vbe_modes);
56513
56514+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56515+ if (par->pmi_code)
56516+ module_memfree_exec(par->pmi_code);
56517+#endif
56518+
56519 framebuffer_release(info);
56520 return err;
56521 }
56522@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56523 kfree(par->vbe_state_orig);
56524 kfree(par->vbe_state_saved);
56525
56526+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56527+ if (par->pmi_code)
56528+ module_memfree_exec(par->pmi_code);
56529+#endif
56530+
56531 framebuffer_release(info);
56532 }
56533 return 0;
56534diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56535index d79a0ac..2d0c3d4 100644
56536--- a/drivers/video/fbdev/vesafb.c
56537+++ b/drivers/video/fbdev/vesafb.c
56538@@ -9,6 +9,7 @@
56539 */
56540
56541 #include <linux/module.h>
56542+#include <linux/moduleloader.h>
56543 #include <linux/kernel.h>
56544 #include <linux/errno.h>
56545 #include <linux/string.h>
56546@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56547 static int vram_total; /* Set total amount of memory */
56548 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56549 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56550-static void (*pmi_start)(void) __read_mostly;
56551-static void (*pmi_pal) (void) __read_mostly;
56552+static void (*pmi_start)(void) __read_only;
56553+static void (*pmi_pal) (void) __read_only;
56554 static int depth __read_mostly;
56555 static int vga_compat __read_mostly;
56556 /* --------------------------------------------------------------------- */
56557@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56558 unsigned int size_remap;
56559 unsigned int size_total;
56560 char *option = NULL;
56561+ void *pmi_code = NULL;
56562
56563 /* ignore error return of fb_get_options */
56564 fb_get_options("vesafb", &option);
56565@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56566 size_remap = size_total;
56567 vesafb_fix.smem_len = size_remap;
56568
56569-#ifndef __i386__
56570- screen_info.vesapm_seg = 0;
56571-#endif
56572-
56573 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56574 printk(KERN_WARNING
56575 "vesafb: cannot reserve video memory at 0x%lx\n",
56576@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56577 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56578 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56579
56580+#ifdef __i386__
56581+
56582+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56583+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56584+ if (!pmi_code)
56585+#elif !defined(CONFIG_PAX_KERNEXEC)
56586+ if (0)
56587+#endif
56588+
56589+#endif
56590+ screen_info.vesapm_seg = 0;
56591+
56592 if (screen_info.vesapm_seg) {
56593- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56594- screen_info.vesapm_seg,screen_info.vesapm_off);
56595+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56596+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56597 }
56598
56599 if (screen_info.vesapm_seg < 0xc000)
56600@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56601
56602 if (ypan || pmi_setpal) {
56603 unsigned short *pmi_base;
56604+
56605 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56606- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56607- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56608+
56609+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56610+ pax_open_kernel();
56611+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56612+#else
56613+ pmi_code = pmi_base;
56614+#endif
56615+
56616+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56617+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56618+
56619+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56620+ pmi_start = ktva_ktla(pmi_start);
56621+ pmi_pal = ktva_ktla(pmi_pal);
56622+ pax_close_kernel();
56623+#endif
56624+
56625 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56626 if (pmi_base[3]) {
56627 printk(KERN_INFO "vesafb: pmi: ports = ");
56628@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56629 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56630 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56631
56632- if (!ypan)
56633- info->fbops->fb_pan_display = NULL;
56634+ if (!ypan) {
56635+ pax_open_kernel();
56636+ *(void **)&info->fbops->fb_pan_display = NULL;
56637+ pax_close_kernel();
56638+ }
56639
56640 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56641 err = -ENOMEM;
56642@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56643 fb_info(info, "%s frame buffer device\n", info->fix.id);
56644 return 0;
56645 err:
56646+
56647+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56648+ module_memfree_exec(pmi_code);
56649+#endif
56650+
56651 if (info->screen_base)
56652 iounmap(info->screen_base);
56653 framebuffer_release(info);
56654diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56655index 88714ae..16c2e11 100644
56656--- a/drivers/video/fbdev/via/via_clock.h
56657+++ b/drivers/video/fbdev/via/via_clock.h
56658@@ -56,7 +56,7 @@ struct via_clock {
56659
56660 void (*set_engine_pll_state)(u8 state);
56661 void (*set_engine_pll)(struct via_pll_config config);
56662-};
56663+} __no_const;
56664
56665
56666 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56667diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56668index 3c14e43..2630570 100644
56669--- a/drivers/video/logo/logo_linux_clut224.ppm
56670+++ b/drivers/video/logo/logo_linux_clut224.ppm
56671@@ -2,1603 +2,1123 @@ P3
56672 # Standard 224-color Linux logo
56673 80 80
56674 255
56675- 0 0 0 0 0 0 0 0 0 0 0 0
56676- 0 0 0 0 0 0 0 0 0 0 0 0
56677- 0 0 0 0 0 0 0 0 0 0 0 0
56678- 0 0 0 0 0 0 0 0 0 0 0 0
56679- 0 0 0 0 0 0 0 0 0 0 0 0
56680- 0 0 0 0 0 0 0 0 0 0 0 0
56681- 0 0 0 0 0 0 0 0 0 0 0 0
56682- 0 0 0 0 0 0 0 0 0 0 0 0
56683- 0 0 0 0 0 0 0 0 0 0 0 0
56684- 6 6 6 6 6 6 10 10 10 10 10 10
56685- 10 10 10 6 6 6 6 6 6 6 6 6
56686- 0 0 0 0 0 0 0 0 0 0 0 0
56687- 0 0 0 0 0 0 0 0 0 0 0 0
56688- 0 0 0 0 0 0 0 0 0 0 0 0
56689- 0 0 0 0 0 0 0 0 0 0 0 0
56690- 0 0 0 0 0 0 0 0 0 0 0 0
56691- 0 0 0 0 0 0 0 0 0 0 0 0
56692- 0 0 0 0 0 0 0 0 0 0 0 0
56693- 0 0 0 0 0 0 0 0 0 0 0 0
56694- 0 0 0 0 0 0 0 0 0 0 0 0
56695- 0 0 0 0 0 0 0 0 0 0 0 0
56696- 0 0 0 0 0 0 0 0 0 0 0 0
56697- 0 0 0 0 0 0 0 0 0 0 0 0
56698- 0 0 0 0 0 0 0 0 0 0 0 0
56699- 0 0 0 0 0 0 0 0 0 0 0 0
56700- 0 0 0 0 0 0 0 0 0 0 0 0
56701- 0 0 0 0 0 0 0 0 0 0 0 0
56702- 0 0 0 0 0 0 0 0 0 0 0 0
56703- 0 0 0 6 6 6 10 10 10 14 14 14
56704- 22 22 22 26 26 26 30 30 30 34 34 34
56705- 30 30 30 30 30 30 26 26 26 18 18 18
56706- 14 14 14 10 10 10 6 6 6 0 0 0
56707- 0 0 0 0 0 0 0 0 0 0 0 0
56708- 0 0 0 0 0 0 0 0 0 0 0 0
56709- 0 0 0 0 0 0 0 0 0 0 0 0
56710- 0 0 0 0 0 0 0 0 0 0 0 0
56711- 0 0 0 0 0 0 0 0 0 0 0 0
56712- 0 0 0 0 0 0 0 0 0 0 0 0
56713- 0 0 0 0 0 0 0 0 0 0 0 0
56714- 0 0 0 0 0 0 0 0 0 0 0 0
56715- 0 0 0 0 0 0 0 0 0 0 0 0
56716- 0 0 0 0 0 1 0 0 1 0 0 0
56717- 0 0 0 0 0 0 0 0 0 0 0 0
56718- 0 0 0 0 0 0 0 0 0 0 0 0
56719- 0 0 0 0 0 0 0 0 0 0 0 0
56720- 0 0 0 0 0 0 0 0 0 0 0 0
56721- 0 0 0 0 0 0 0 0 0 0 0 0
56722- 0 0 0 0 0 0 0 0 0 0 0 0
56723- 6 6 6 14 14 14 26 26 26 42 42 42
56724- 54 54 54 66 66 66 78 78 78 78 78 78
56725- 78 78 78 74 74 74 66 66 66 54 54 54
56726- 42 42 42 26 26 26 18 18 18 10 10 10
56727- 6 6 6 0 0 0 0 0 0 0 0 0
56728- 0 0 0 0 0 0 0 0 0 0 0 0
56729- 0 0 0 0 0 0 0 0 0 0 0 0
56730- 0 0 0 0 0 0 0 0 0 0 0 0
56731- 0 0 0 0 0 0 0 0 0 0 0 0
56732- 0 0 0 0 0 0 0 0 0 0 0 0
56733- 0 0 0 0 0 0 0 0 0 0 0 0
56734- 0 0 0 0 0 0 0 0 0 0 0 0
56735- 0 0 0 0 0 0 0 0 0 0 0 0
56736- 0 0 1 0 0 0 0 0 0 0 0 0
56737- 0 0 0 0 0 0 0 0 0 0 0 0
56738- 0 0 0 0 0 0 0 0 0 0 0 0
56739- 0 0 0 0 0 0 0 0 0 0 0 0
56740- 0 0 0 0 0 0 0 0 0 0 0 0
56741- 0 0 0 0 0 0 0 0 0 0 0 0
56742- 0 0 0 0 0 0 0 0 0 10 10 10
56743- 22 22 22 42 42 42 66 66 66 86 86 86
56744- 66 66 66 38 38 38 38 38 38 22 22 22
56745- 26 26 26 34 34 34 54 54 54 66 66 66
56746- 86 86 86 70 70 70 46 46 46 26 26 26
56747- 14 14 14 6 6 6 0 0 0 0 0 0
56748- 0 0 0 0 0 0 0 0 0 0 0 0
56749- 0 0 0 0 0 0 0 0 0 0 0 0
56750- 0 0 0 0 0 0 0 0 0 0 0 0
56751- 0 0 0 0 0 0 0 0 0 0 0 0
56752- 0 0 0 0 0 0 0 0 0 0 0 0
56753- 0 0 0 0 0 0 0 0 0 0 0 0
56754- 0 0 0 0 0 0 0 0 0 0 0 0
56755- 0 0 0 0 0 0 0 0 0 0 0 0
56756- 0 0 1 0 0 1 0 0 1 0 0 0
56757- 0 0 0 0 0 0 0 0 0 0 0 0
56758- 0 0 0 0 0 0 0 0 0 0 0 0
56759- 0 0 0 0 0 0 0 0 0 0 0 0
56760- 0 0 0 0 0 0 0 0 0 0 0 0
56761- 0 0 0 0 0 0 0 0 0 0 0 0
56762- 0 0 0 0 0 0 10 10 10 26 26 26
56763- 50 50 50 82 82 82 58 58 58 6 6 6
56764- 2 2 6 2 2 6 2 2 6 2 2 6
56765- 2 2 6 2 2 6 2 2 6 2 2 6
56766- 6 6 6 54 54 54 86 86 86 66 66 66
56767- 38 38 38 18 18 18 6 6 6 0 0 0
56768- 0 0 0 0 0 0 0 0 0 0 0 0
56769- 0 0 0 0 0 0 0 0 0 0 0 0
56770- 0 0 0 0 0 0 0 0 0 0 0 0
56771- 0 0 0 0 0 0 0 0 0 0 0 0
56772- 0 0 0 0 0 0 0 0 0 0 0 0
56773- 0 0 0 0 0 0 0 0 0 0 0 0
56774- 0 0 0 0 0 0 0 0 0 0 0 0
56775- 0 0 0 0 0 0 0 0 0 0 0 0
56776- 0 0 0 0 0 0 0 0 0 0 0 0
56777- 0 0 0 0 0 0 0 0 0 0 0 0
56778- 0 0 0 0 0 0 0 0 0 0 0 0
56779- 0 0 0 0 0 0 0 0 0 0 0 0
56780- 0 0 0 0 0 0 0 0 0 0 0 0
56781- 0 0 0 0 0 0 0 0 0 0 0 0
56782- 0 0 0 6 6 6 22 22 22 50 50 50
56783- 78 78 78 34 34 34 2 2 6 2 2 6
56784- 2 2 6 2 2 6 2 2 6 2 2 6
56785- 2 2 6 2 2 6 2 2 6 2 2 6
56786- 2 2 6 2 2 6 6 6 6 70 70 70
56787- 78 78 78 46 46 46 22 22 22 6 6 6
56788- 0 0 0 0 0 0 0 0 0 0 0 0
56789- 0 0 0 0 0 0 0 0 0 0 0 0
56790- 0 0 0 0 0 0 0 0 0 0 0 0
56791- 0 0 0 0 0 0 0 0 0 0 0 0
56792- 0 0 0 0 0 0 0 0 0 0 0 0
56793- 0 0 0 0 0 0 0 0 0 0 0 0
56794- 0 0 0 0 0 0 0 0 0 0 0 0
56795- 0 0 0 0 0 0 0 0 0 0 0 0
56796- 0 0 1 0 0 1 0 0 1 0 0 0
56797- 0 0 0 0 0 0 0 0 0 0 0 0
56798- 0 0 0 0 0 0 0 0 0 0 0 0
56799- 0 0 0 0 0 0 0 0 0 0 0 0
56800- 0 0 0 0 0 0 0 0 0 0 0 0
56801- 0 0 0 0 0 0 0 0 0 0 0 0
56802- 6 6 6 18 18 18 42 42 42 82 82 82
56803- 26 26 26 2 2 6 2 2 6 2 2 6
56804- 2 2 6 2 2 6 2 2 6 2 2 6
56805- 2 2 6 2 2 6 2 2 6 14 14 14
56806- 46 46 46 34 34 34 6 6 6 2 2 6
56807- 42 42 42 78 78 78 42 42 42 18 18 18
56808- 6 6 6 0 0 0 0 0 0 0 0 0
56809- 0 0 0 0 0 0 0 0 0 0 0 0
56810- 0 0 0 0 0 0 0 0 0 0 0 0
56811- 0 0 0 0 0 0 0 0 0 0 0 0
56812- 0 0 0 0 0 0 0 0 0 0 0 0
56813- 0 0 0 0 0 0 0 0 0 0 0 0
56814- 0 0 0 0 0 0 0 0 0 0 0 0
56815- 0 0 0 0 0 0 0 0 0 0 0 0
56816- 0 0 1 0 0 0 0 0 1 0 0 0
56817- 0 0 0 0 0 0 0 0 0 0 0 0
56818- 0 0 0 0 0 0 0 0 0 0 0 0
56819- 0 0 0 0 0 0 0 0 0 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 10 10 10 30 30 30 66 66 66 58 58 58
56823- 2 2 6 2 2 6 2 2 6 2 2 6
56824- 2 2 6 2 2 6 2 2 6 2 2 6
56825- 2 2 6 2 2 6 2 2 6 26 26 26
56826- 86 86 86 101 101 101 46 46 46 10 10 10
56827- 2 2 6 58 58 58 70 70 70 34 34 34
56828- 10 10 10 0 0 0 0 0 0 0 0 0
56829- 0 0 0 0 0 0 0 0 0 0 0 0
56830- 0 0 0 0 0 0 0 0 0 0 0 0
56831- 0 0 0 0 0 0 0 0 0 0 0 0
56832- 0 0 0 0 0 0 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 0 0 0
56835- 0 0 0 0 0 0 0 0 0 0 0 0
56836- 0 0 1 0 0 1 0 0 1 0 0 0
56837- 0 0 0 0 0 0 0 0 0 0 0 0
56838- 0 0 0 0 0 0 0 0 0 0 0 0
56839- 0 0 0 0 0 0 0 0 0 0 0 0
56840- 0 0 0 0 0 0 0 0 0 0 0 0
56841- 0 0 0 0 0 0 0 0 0 0 0 0
56842- 14 14 14 42 42 42 86 86 86 10 10 10
56843- 2 2 6 2 2 6 2 2 6 2 2 6
56844- 2 2 6 2 2 6 2 2 6 2 2 6
56845- 2 2 6 2 2 6 2 2 6 30 30 30
56846- 94 94 94 94 94 94 58 58 58 26 26 26
56847- 2 2 6 6 6 6 78 78 78 54 54 54
56848- 22 22 22 6 6 6 0 0 0 0 0 0
56849- 0 0 0 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 0 0 0 0 0 0
56855- 0 0 0 0 0 0 0 0 0 0 0 0
56856- 0 0 0 0 0 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 6 6 6
56862- 22 22 22 62 62 62 62 62 62 2 2 6
56863- 2 2 6 2 2 6 2 2 6 2 2 6
56864- 2 2 6 2 2 6 2 2 6 2 2 6
56865- 2 2 6 2 2 6 2 2 6 26 26 26
56866- 54 54 54 38 38 38 18 18 18 10 10 10
56867- 2 2 6 2 2 6 34 34 34 82 82 82
56868- 38 38 38 14 14 14 0 0 0 0 0 0
56869- 0 0 0 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 0 0 0 0 0 0 0 0 0
56874- 0 0 0 0 0 0 0 0 0 0 0 0
56875- 0 0 0 0 0 0 0 0 0 0 0 0
56876- 0 0 0 0 0 1 0 0 1 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 6 6 6
56882- 30 30 30 78 78 78 30 30 30 2 2 6
56883- 2 2 6 2 2 6 2 2 6 2 2 6
56884- 2 2 6 2 2 6 2 2 6 2 2 6
56885- 2 2 6 2 2 6 2 2 6 10 10 10
56886- 10 10 10 2 2 6 2 2 6 2 2 6
56887- 2 2 6 2 2 6 2 2 6 78 78 78
56888- 50 50 50 18 18 18 6 6 6 0 0 0
56889- 0 0 0 0 0 0 0 0 0 0 0 0
56890- 0 0 0 0 0 0 0 0 0 0 0 0
56891- 0 0 0 0 0 0 0 0 0 0 0 0
56892- 0 0 0 0 0 0 0 0 0 0 0 0
56893- 0 0 0 0 0 0 0 0 0 0 0 0
56894- 0 0 0 0 0 0 0 0 0 0 0 0
56895- 0 0 0 0 0 0 0 0 0 0 0 0
56896- 0 0 1 0 0 0 0 0 0 0 0 0
56897- 0 0 0 0 0 0 0 0 0 0 0 0
56898- 0 0 0 0 0 0 0 0 0 0 0 0
56899- 0 0 0 0 0 0 0 0 0 0 0 0
56900- 0 0 0 0 0 0 0 0 0 0 0 0
56901- 0 0 0 0 0 0 0 0 0 10 10 10
56902- 38 38 38 86 86 86 14 14 14 2 2 6
56903- 2 2 6 2 2 6 2 2 6 2 2 6
56904- 2 2 6 2 2 6 2 2 6 2 2 6
56905- 2 2 6 2 2 6 2 2 6 2 2 6
56906- 2 2 6 2 2 6 2 2 6 2 2 6
56907- 2 2 6 2 2 6 2 2 6 54 54 54
56908- 66 66 66 26 26 26 6 6 6 0 0 0
56909- 0 0 0 0 0 0 0 0 0 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 0 0 0 0 0 0 0 0 0 0 0 0
56915- 0 0 0 0 0 0 0 0 0 0 0 0
56916- 0 0 0 0 0 1 0 0 1 0 0 0
56917- 0 0 0 0 0 0 0 0 0 0 0 0
56918- 0 0 0 0 0 0 0 0 0 0 0 0
56919- 0 0 0 0 0 0 0 0 0 0 0 0
56920- 0 0 0 0 0 0 0 0 0 0 0 0
56921- 0 0 0 0 0 0 0 0 0 14 14 14
56922- 42 42 42 82 82 82 2 2 6 2 2 6
56923- 2 2 6 6 6 6 10 10 10 2 2 6
56924- 2 2 6 2 2 6 2 2 6 2 2 6
56925- 2 2 6 2 2 6 2 2 6 6 6 6
56926- 14 14 14 10 10 10 2 2 6 2 2 6
56927- 2 2 6 2 2 6 2 2 6 18 18 18
56928- 82 82 82 34 34 34 10 10 10 0 0 0
56929- 0 0 0 0 0 0 0 0 0 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 0 0 0 0 0 0 0 0 0 0 0 0
56936- 0 0 1 0 0 0 0 0 0 0 0 0
56937- 0 0 0 0 0 0 0 0 0 0 0 0
56938- 0 0 0 0 0 0 0 0 0 0 0 0
56939- 0 0 0 0 0 0 0 0 0 0 0 0
56940- 0 0 0 0 0 0 0 0 0 0 0 0
56941- 0 0 0 0 0 0 0 0 0 14 14 14
56942- 46 46 46 86 86 86 2 2 6 2 2 6
56943- 6 6 6 6 6 6 22 22 22 34 34 34
56944- 6 6 6 2 2 6 2 2 6 2 2 6
56945- 2 2 6 2 2 6 18 18 18 34 34 34
56946- 10 10 10 50 50 50 22 22 22 2 2 6
56947- 2 2 6 2 2 6 2 2 6 10 10 10
56948- 86 86 86 42 42 42 14 14 14 0 0 0
56949- 0 0 0 0 0 0 0 0 0 0 0 0
56950- 0 0 0 0 0 0 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 0 0 0 0 0 0 0 0 0 0 0 0
56956- 0 0 1 0 0 1 0 0 1 0 0 0
56957- 0 0 0 0 0 0 0 0 0 0 0 0
56958- 0 0 0 0 0 0 0 0 0 0 0 0
56959- 0 0 0 0 0 0 0 0 0 0 0 0
56960- 0 0 0 0 0 0 0 0 0 0 0 0
56961- 0 0 0 0 0 0 0 0 0 14 14 14
56962- 46 46 46 86 86 86 2 2 6 2 2 6
56963- 38 38 38 116 116 116 94 94 94 22 22 22
56964- 22 22 22 2 2 6 2 2 6 2 2 6
56965- 14 14 14 86 86 86 138 138 138 162 162 162
56966-154 154 154 38 38 38 26 26 26 6 6 6
56967- 2 2 6 2 2 6 2 2 6 2 2 6
56968- 86 86 86 46 46 46 14 14 14 0 0 0
56969- 0 0 0 0 0 0 0 0 0 0 0 0
56970- 0 0 0 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 0 0 0 0 0 0 0 0 0 0 0 0
56975- 0 0 0 0 0 0 0 0 0 0 0 0
56976- 0 0 0 0 0 0 0 0 0 0 0 0
56977- 0 0 0 0 0 0 0 0 0 0 0 0
56978- 0 0 0 0 0 0 0 0 0 0 0 0
56979- 0 0 0 0 0 0 0 0 0 0 0 0
56980- 0 0 0 0 0 0 0 0 0 0 0 0
56981- 0 0 0 0 0 0 0 0 0 14 14 14
56982- 46 46 46 86 86 86 2 2 6 14 14 14
56983-134 134 134 198 198 198 195 195 195 116 116 116
56984- 10 10 10 2 2 6 2 2 6 6 6 6
56985-101 98 89 187 187 187 210 210 210 218 218 218
56986-214 214 214 134 134 134 14 14 14 6 6 6
56987- 2 2 6 2 2 6 2 2 6 2 2 6
56988- 86 86 86 50 50 50 18 18 18 6 6 6
56989- 0 0 0 0 0 0 0 0 0 0 0 0
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 0 0 0
56994- 0 0 0 0 0 0 0 0 0 0 0 0
56995- 0 0 0 0 0 0 0 0 1 0 0 0
56996- 0 0 1 0 0 1 0 0 1 0 0 0
56997- 0 0 0 0 0 0 0 0 0 0 0 0
56998- 0 0 0 0 0 0 0 0 0 0 0 0
56999- 0 0 0 0 0 0 0 0 0 0 0 0
57000- 0 0 0 0 0 0 0 0 0 0 0 0
57001- 0 0 0 0 0 0 0 0 0 14 14 14
57002- 46 46 46 86 86 86 2 2 6 54 54 54
57003-218 218 218 195 195 195 226 226 226 246 246 246
57004- 58 58 58 2 2 6 2 2 6 30 30 30
57005-210 210 210 253 253 253 174 174 174 123 123 123
57006-221 221 221 234 234 234 74 74 74 2 2 6
57007- 2 2 6 2 2 6 2 2 6 2 2 6
57008- 70 70 70 58 58 58 22 22 22 6 6 6
57009- 0 0 0 0 0 0 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 0 0 0
57015- 0 0 0 0 0 0 0 0 0 0 0 0
57016- 0 0 0 0 0 0 0 0 0 0 0 0
57017- 0 0 0 0 0 0 0 0 0 0 0 0
57018- 0 0 0 0 0 0 0 0 0 0 0 0
57019- 0 0 0 0 0 0 0 0 0 0 0 0
57020- 0 0 0 0 0 0 0 0 0 0 0 0
57021- 0 0 0 0 0 0 0 0 0 14 14 14
57022- 46 46 46 82 82 82 2 2 6 106 106 106
57023-170 170 170 26 26 26 86 86 86 226 226 226
57024-123 123 123 10 10 10 14 14 14 46 46 46
57025-231 231 231 190 190 190 6 6 6 70 70 70
57026- 90 90 90 238 238 238 158 158 158 2 2 6
57027- 2 2 6 2 2 6 2 2 6 2 2 6
57028- 70 70 70 58 58 58 22 22 22 6 6 6
57029- 0 0 0 0 0 0 0 0 0 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 0 0 0
57035- 0 0 0 0 0 0 0 0 1 0 0 0
57036- 0 0 1 0 0 1 0 0 1 0 0 0
57037- 0 0 0 0 0 0 0 0 0 0 0 0
57038- 0 0 0 0 0 0 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 0 0 0
57040- 0 0 0 0 0 0 0 0 0 0 0 0
57041- 0 0 0 0 0 0 0 0 0 14 14 14
57042- 42 42 42 86 86 86 6 6 6 116 116 116
57043-106 106 106 6 6 6 70 70 70 149 149 149
57044-128 128 128 18 18 18 38 38 38 54 54 54
57045-221 221 221 106 106 106 2 2 6 14 14 14
57046- 46 46 46 190 190 190 198 198 198 2 2 6
57047- 2 2 6 2 2 6 2 2 6 2 2 6
57048- 74 74 74 62 62 62 22 22 22 6 6 6
57049- 0 0 0 0 0 0 0 0 0 0 0 0
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 0 0 0
57054- 0 0 0 0 0 0 0 0 0 0 0 0
57055- 0 0 0 0 0 0 0 0 1 0 0 0
57056- 0 0 1 0 0 0 0 0 1 0 0 0
57057- 0 0 0 0 0 0 0 0 0 0 0 0
57058- 0 0 0 0 0 0 0 0 0 0 0 0
57059- 0 0 0 0 0 0 0 0 0 0 0 0
57060- 0 0 0 0 0 0 0 0 0 0 0 0
57061- 0 0 0 0 0 0 0 0 0 14 14 14
57062- 42 42 42 94 94 94 14 14 14 101 101 101
57063-128 128 128 2 2 6 18 18 18 116 116 116
57064-118 98 46 121 92 8 121 92 8 98 78 10
57065-162 162 162 106 106 106 2 2 6 2 2 6
57066- 2 2 6 195 195 195 195 195 195 6 6 6
57067- 2 2 6 2 2 6 2 2 6 2 2 6
57068- 74 74 74 62 62 62 22 22 22 6 6 6
57069- 0 0 0 0 0 0 0 0 0 0 0 0
57070- 0 0 0 0 0 0 0 0 0 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 0 0 0
57074- 0 0 0 0 0 0 0 0 0 0 0 0
57075- 0 0 0 0 0 0 0 0 1 0 0 1
57076- 0 0 1 0 0 0 0 0 1 0 0 0
57077- 0 0 0 0 0 0 0 0 0 0 0 0
57078- 0 0 0 0 0 0 0 0 0 0 0 0
57079- 0 0 0 0 0 0 0 0 0 0 0 0
57080- 0 0 0 0 0 0 0 0 0 0 0 0
57081- 0 0 0 0 0 0 0 0 0 10 10 10
57082- 38 38 38 90 90 90 14 14 14 58 58 58
57083-210 210 210 26 26 26 54 38 6 154 114 10
57084-226 170 11 236 186 11 225 175 15 184 144 12
57085-215 174 15 175 146 61 37 26 9 2 2 6
57086- 70 70 70 246 246 246 138 138 138 2 2 6
57087- 2 2 6 2 2 6 2 2 6 2 2 6
57088- 70 70 70 66 66 66 26 26 26 6 6 6
57089- 0 0 0 0 0 0 0 0 0 0 0 0
57090- 0 0 0 0 0 0 0 0 0 0 0 0
57091- 0 0 0 0 0 0 0 0 0 0 0 0
57092- 0 0 0 0 0 0 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 0 0 0
57094- 0 0 0 0 0 0 0 0 0 0 0 0
57095- 0 0 0 0 0 0 0 0 0 0 0 0
57096- 0 0 0 0 0 0 0 0 0 0 0 0
57097- 0 0 0 0 0 0 0 0 0 0 0 0
57098- 0 0 0 0 0 0 0 0 0 0 0 0
57099- 0 0 0 0 0 0 0 0 0 0 0 0
57100- 0 0 0 0 0 0 0 0 0 0 0 0
57101- 0 0 0 0 0 0 0 0 0 10 10 10
57102- 38 38 38 86 86 86 14 14 14 10 10 10
57103-195 195 195 188 164 115 192 133 9 225 175 15
57104-239 182 13 234 190 10 232 195 16 232 200 30
57105-245 207 45 241 208 19 232 195 16 184 144 12
57106-218 194 134 211 206 186 42 42 42 2 2 6
57107- 2 2 6 2 2 6 2 2 6 2 2 6
57108- 50 50 50 74 74 74 30 30 30 6 6 6
57109- 0 0 0 0 0 0 0 0 0 0 0 0
57110- 0 0 0 0 0 0 0 0 0 0 0 0
57111- 0 0 0 0 0 0 0 0 0 0 0 0
57112- 0 0 0 0 0 0 0 0 0 0 0 0
57113- 0 0 0 0 0 0 0 0 0 0 0 0
57114- 0 0 0 0 0 0 0 0 0 0 0 0
57115- 0 0 0 0 0 0 0 0 0 0 0 0
57116- 0 0 0 0 0 0 0 0 0 0 0 0
57117- 0 0 0 0 0 0 0 0 0 0 0 0
57118- 0 0 0 0 0 0 0 0 0 0 0 0
57119- 0 0 0 0 0 0 0 0 0 0 0 0
57120- 0 0 0 0 0 0 0 0 0 0 0 0
57121- 0 0 0 0 0 0 0 0 0 10 10 10
57122- 34 34 34 86 86 86 14 14 14 2 2 6
57123-121 87 25 192 133 9 219 162 10 239 182 13
57124-236 186 11 232 195 16 241 208 19 244 214 54
57125-246 218 60 246 218 38 246 215 20 241 208 19
57126-241 208 19 226 184 13 121 87 25 2 2 6
57127- 2 2 6 2 2 6 2 2 6 2 2 6
57128- 50 50 50 82 82 82 34 34 34 10 10 10
57129- 0 0 0 0 0 0 0 0 0 0 0 0
57130- 0 0 0 0 0 0 0 0 0 0 0 0
57131- 0 0 0 0 0 0 0 0 0 0 0 0
57132- 0 0 0 0 0 0 0 0 0 0 0 0
57133- 0 0 0 0 0 0 0 0 0 0 0 0
57134- 0 0 0 0 0 0 0 0 0 0 0 0
57135- 0 0 0 0 0 0 0 0 0 0 0 0
57136- 0 0 0 0 0 0 0 0 0 0 0 0
57137- 0 0 0 0 0 0 0 0 0 0 0 0
57138- 0 0 0 0 0 0 0 0 0 0 0 0
57139- 0 0 0 0 0 0 0 0 0 0 0 0
57140- 0 0 0 0 0 0 0 0 0 0 0 0
57141- 0 0 0 0 0 0 0 0 0 10 10 10
57142- 34 34 34 82 82 82 30 30 30 61 42 6
57143-180 123 7 206 145 10 230 174 11 239 182 13
57144-234 190 10 238 202 15 241 208 19 246 218 74
57145-246 218 38 246 215 20 246 215 20 246 215 20
57146-226 184 13 215 174 15 184 144 12 6 6 6
57147- 2 2 6 2 2 6 2 2 6 2 2 6
57148- 26 26 26 94 94 94 42 42 42 14 14 14
57149- 0 0 0 0 0 0 0 0 0 0 0 0
57150- 0 0 0 0 0 0 0 0 0 0 0 0
57151- 0 0 0 0 0 0 0 0 0 0 0 0
57152- 0 0 0 0 0 0 0 0 0 0 0 0
57153- 0 0 0 0 0 0 0 0 0 0 0 0
57154- 0 0 0 0 0 0 0 0 0 0 0 0
57155- 0 0 0 0 0 0 0 0 0 0 0 0
57156- 0 0 0 0 0 0 0 0 0 0 0 0
57157- 0 0 0 0 0 0 0 0 0 0 0 0
57158- 0 0 0 0 0 0 0 0 0 0 0 0
57159- 0 0 0 0 0 0 0 0 0 0 0 0
57160- 0 0 0 0 0 0 0 0 0 0 0 0
57161- 0 0 0 0 0 0 0 0 0 10 10 10
57162- 30 30 30 78 78 78 50 50 50 104 69 6
57163-192 133 9 216 158 10 236 178 12 236 186 11
57164-232 195 16 241 208 19 244 214 54 245 215 43
57165-246 215 20 246 215 20 241 208 19 198 155 10
57166-200 144 11 216 158 10 156 118 10 2 2 6
57167- 2 2 6 2 2 6 2 2 6 2 2 6
57168- 6 6 6 90 90 90 54 54 54 18 18 18
57169- 6 6 6 0 0 0 0 0 0 0 0 0
57170- 0 0 0 0 0 0 0 0 0 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 0 0 0
57173- 0 0 0 0 0 0 0 0 0 0 0 0
57174- 0 0 0 0 0 0 0 0 0 0 0 0
57175- 0 0 0 0 0 0 0 0 0 0 0 0
57176- 0 0 0 0 0 0 0 0 0 0 0 0
57177- 0 0 0 0 0 0 0 0 0 0 0 0
57178- 0 0 0 0 0 0 0 0 0 0 0 0
57179- 0 0 0 0 0 0 0 0 0 0 0 0
57180- 0 0 0 0 0 0 0 0 0 0 0 0
57181- 0 0 0 0 0 0 0 0 0 10 10 10
57182- 30 30 30 78 78 78 46 46 46 22 22 22
57183-137 92 6 210 162 10 239 182 13 238 190 10
57184-238 202 15 241 208 19 246 215 20 246 215 20
57185-241 208 19 203 166 17 185 133 11 210 150 10
57186-216 158 10 210 150 10 102 78 10 2 2 6
57187- 6 6 6 54 54 54 14 14 14 2 2 6
57188- 2 2 6 62 62 62 74 74 74 30 30 30
57189- 10 10 10 0 0 0 0 0 0 0 0 0
57190- 0 0 0 0 0 0 0 0 0 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 0 0 0
57193- 0 0 0 0 0 0 0 0 0 0 0 0
57194- 0 0 0 0 0 0 0 0 0 0 0 0
57195- 0 0 0 0 0 0 0 0 0 0 0 0
57196- 0 0 0 0 0 0 0 0 0 0 0 0
57197- 0 0 0 0 0 0 0 0 0 0 0 0
57198- 0 0 0 0 0 0 0 0 0 0 0 0
57199- 0 0 0 0 0 0 0 0 0 0 0 0
57200- 0 0 0 0 0 0 0 0 0 0 0 0
57201- 0 0 0 0 0 0 0 0 0 10 10 10
57202- 34 34 34 78 78 78 50 50 50 6 6 6
57203- 94 70 30 139 102 15 190 146 13 226 184 13
57204-232 200 30 232 195 16 215 174 15 190 146 13
57205-168 122 10 192 133 9 210 150 10 213 154 11
57206-202 150 34 182 157 106 101 98 89 2 2 6
57207- 2 2 6 78 78 78 116 116 116 58 58 58
57208- 2 2 6 22 22 22 90 90 90 46 46 46
57209- 18 18 18 6 6 6 0 0 0 0 0 0
57210- 0 0 0 0 0 0 0 0 0 0 0 0
57211- 0 0 0 0 0 0 0 0 0 0 0 0
57212- 0 0 0 0 0 0 0 0 0 0 0 0
57213- 0 0 0 0 0 0 0 0 0 0 0 0
57214- 0 0 0 0 0 0 0 0 0 0 0 0
57215- 0 0 0 0 0 0 0 0 0 0 0 0
57216- 0 0 0 0 0 0 0 0 0 0 0 0
57217- 0 0 0 0 0 0 0 0 0 0 0 0
57218- 0 0 0 0 0 0 0 0 0 0 0 0
57219- 0 0 0 0 0 0 0 0 0 0 0 0
57220- 0 0 0 0 0 0 0 0 0 0 0 0
57221- 0 0 0 0 0 0 0 0 0 10 10 10
57222- 38 38 38 86 86 86 50 50 50 6 6 6
57223-128 128 128 174 154 114 156 107 11 168 122 10
57224-198 155 10 184 144 12 197 138 11 200 144 11
57225-206 145 10 206 145 10 197 138 11 188 164 115
57226-195 195 195 198 198 198 174 174 174 14 14 14
57227- 2 2 6 22 22 22 116 116 116 116 116 116
57228- 22 22 22 2 2 6 74 74 74 70 70 70
57229- 30 30 30 10 10 10 0 0 0 0 0 0
57230- 0 0 0 0 0 0 0 0 0 0 0 0
57231- 0 0 0 0 0 0 0 0 0 0 0 0
57232- 0 0 0 0 0 0 0 0 0 0 0 0
57233- 0 0 0 0 0 0 0 0 0 0 0 0
57234- 0 0 0 0 0 0 0 0 0 0 0 0
57235- 0 0 0 0 0 0 0 0 0 0 0 0
57236- 0 0 0 0 0 0 0 0 0 0 0 0
57237- 0 0 0 0 0 0 0 0 0 0 0 0
57238- 0 0 0 0 0 0 0 0 0 0 0 0
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 0 0 0
57241- 0 0 0 0 0 0 6 6 6 18 18 18
57242- 50 50 50 101 101 101 26 26 26 10 10 10
57243-138 138 138 190 190 190 174 154 114 156 107 11
57244-197 138 11 200 144 11 197 138 11 192 133 9
57245-180 123 7 190 142 34 190 178 144 187 187 187
57246-202 202 202 221 221 221 214 214 214 66 66 66
57247- 2 2 6 2 2 6 50 50 50 62 62 62
57248- 6 6 6 2 2 6 10 10 10 90 90 90
57249- 50 50 50 18 18 18 6 6 6 0 0 0
57250- 0 0 0 0 0 0 0 0 0 0 0 0
57251- 0 0 0 0 0 0 0 0 0 0 0 0
57252- 0 0 0 0 0 0 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 0 0 0
57254- 0 0 0 0 0 0 0 0 0 0 0 0
57255- 0 0 0 0 0 0 0 0 0 0 0 0
57256- 0 0 0 0 0 0 0 0 0 0 0 0
57257- 0 0 0 0 0 0 0 0 0 0 0 0
57258- 0 0 0 0 0 0 0 0 0 0 0 0
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 0 0 0
57261- 0 0 0 0 0 0 10 10 10 34 34 34
57262- 74 74 74 74 74 74 2 2 6 6 6 6
57263-144 144 144 198 198 198 190 190 190 178 166 146
57264-154 121 60 156 107 11 156 107 11 168 124 44
57265-174 154 114 187 187 187 190 190 190 210 210 210
57266-246 246 246 253 253 253 253 253 253 182 182 182
57267- 6 6 6 2 2 6 2 2 6 2 2 6
57268- 2 2 6 2 2 6 2 2 6 62 62 62
57269- 74 74 74 34 34 34 14 14 14 0 0 0
57270- 0 0 0 0 0 0 0 0 0 0 0 0
57271- 0 0 0 0 0 0 0 0 0 0 0 0
57272- 0 0 0 0 0 0 0 0 0 0 0 0
57273- 0 0 0 0 0 0 0 0 0 0 0 0
57274- 0 0 0 0 0 0 0 0 0 0 0 0
57275- 0 0 0 0 0 0 0 0 0 0 0 0
57276- 0 0 0 0 0 0 0 0 0 0 0 0
57277- 0 0 0 0 0 0 0 0 0 0 0 0
57278- 0 0 0 0 0 0 0 0 0 0 0 0
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 0 0 0
57281- 0 0 0 10 10 10 22 22 22 54 54 54
57282- 94 94 94 18 18 18 2 2 6 46 46 46
57283-234 234 234 221 221 221 190 190 190 190 190 190
57284-190 190 190 187 187 187 187 187 187 190 190 190
57285-190 190 190 195 195 195 214 214 214 242 242 242
57286-253 253 253 253 253 253 253 253 253 253 253 253
57287- 82 82 82 2 2 6 2 2 6 2 2 6
57288- 2 2 6 2 2 6 2 2 6 14 14 14
57289- 86 86 86 54 54 54 22 22 22 6 6 6
57290- 0 0 0 0 0 0 0 0 0 0 0 0
57291- 0 0 0 0 0 0 0 0 0 0 0 0
57292- 0 0 0 0 0 0 0 0 0 0 0 0
57293- 0 0 0 0 0 0 0 0 0 0 0 0
57294- 0 0 0 0 0 0 0 0 0 0 0 0
57295- 0 0 0 0 0 0 0 0 0 0 0 0
57296- 0 0 0 0 0 0 0 0 0 0 0 0
57297- 0 0 0 0 0 0 0 0 0 0 0 0
57298- 0 0 0 0 0 0 0 0 0 0 0 0
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 0 0 0
57301- 6 6 6 18 18 18 46 46 46 90 90 90
57302- 46 46 46 18 18 18 6 6 6 182 182 182
57303-253 253 253 246 246 246 206 206 206 190 190 190
57304-190 190 190 190 190 190 190 190 190 190 190 190
57305-206 206 206 231 231 231 250 250 250 253 253 253
57306-253 253 253 253 253 253 253 253 253 253 253 253
57307-202 202 202 14 14 14 2 2 6 2 2 6
57308- 2 2 6 2 2 6 2 2 6 2 2 6
57309- 42 42 42 86 86 86 42 42 42 18 18 18
57310- 6 6 6 0 0 0 0 0 0 0 0 0
57311- 0 0 0 0 0 0 0 0 0 0 0 0
57312- 0 0 0 0 0 0 0 0 0 0 0 0
57313- 0 0 0 0 0 0 0 0 0 0 0 0
57314- 0 0 0 0 0 0 0 0 0 0 0 0
57315- 0 0 0 0 0 0 0 0 0 0 0 0
57316- 0 0 0 0 0 0 0 0 0 0 0 0
57317- 0 0 0 0 0 0 0 0 0 0 0 0
57318- 0 0 0 0 0 0 0 0 0 0 0 0
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 6 6 6
57321- 14 14 14 38 38 38 74 74 74 66 66 66
57322- 2 2 6 6 6 6 90 90 90 250 250 250
57323-253 253 253 253 253 253 238 238 238 198 198 198
57324-190 190 190 190 190 190 195 195 195 221 221 221
57325-246 246 246 253 253 253 253 253 253 253 253 253
57326-253 253 253 253 253 253 253 253 253 253 253 253
57327-253 253 253 82 82 82 2 2 6 2 2 6
57328- 2 2 6 2 2 6 2 2 6 2 2 6
57329- 2 2 6 78 78 78 70 70 70 34 34 34
57330- 14 14 14 6 6 6 0 0 0 0 0 0
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 0 0 0 0 0 0
57334- 0 0 0 0 0 0 0 0 0 0 0 0
57335- 0 0 0 0 0 0 0 0 0 0 0 0
57336- 0 0 0 0 0 0 0 0 0 0 0 0
57337- 0 0 0 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 0 14 14 14
57341- 34 34 34 66 66 66 78 78 78 6 6 6
57342- 2 2 6 18 18 18 218 218 218 253 253 253
57343-253 253 253 253 253 253 253 253 253 246 246 246
57344-226 226 226 231 231 231 246 246 246 253 253 253
57345-253 253 253 253 253 253 253 253 253 253 253 253
57346-253 253 253 253 253 253 253 253 253 253 253 253
57347-253 253 253 178 178 178 2 2 6 2 2 6
57348- 2 2 6 2 2 6 2 2 6 2 2 6
57349- 2 2 6 18 18 18 90 90 90 62 62 62
57350- 30 30 30 10 10 10 0 0 0 0 0 0
57351- 0 0 0 0 0 0 0 0 0 0 0 0
57352- 0 0 0 0 0 0 0 0 0 0 0 0
57353- 0 0 0 0 0 0 0 0 0 0 0 0
57354- 0 0 0 0 0 0 0 0 0 0 0 0
57355- 0 0 0 0 0 0 0 0 0 0 0 0
57356- 0 0 0 0 0 0 0 0 0 0 0 0
57357- 0 0 0 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 10 10 10 26 26 26
57361- 58 58 58 90 90 90 18 18 18 2 2 6
57362- 2 2 6 110 110 110 253 253 253 253 253 253
57363-253 253 253 253 253 253 253 253 253 253 253 253
57364-250 250 250 253 253 253 253 253 253 253 253 253
57365-253 253 253 253 253 253 253 253 253 253 253 253
57366-253 253 253 253 253 253 253 253 253 253 253 253
57367-253 253 253 231 231 231 18 18 18 2 2 6
57368- 2 2 6 2 2 6 2 2 6 2 2 6
57369- 2 2 6 2 2 6 18 18 18 94 94 94
57370- 54 54 54 26 26 26 10 10 10 0 0 0
57371- 0 0 0 0 0 0 0 0 0 0 0 0
57372- 0 0 0 0 0 0 0 0 0 0 0 0
57373- 0 0 0 0 0 0 0 0 0 0 0 0
57374- 0 0 0 0 0 0 0 0 0 0 0 0
57375- 0 0 0 0 0 0 0 0 0 0 0 0
57376- 0 0 0 0 0 0 0 0 0 0 0 0
57377- 0 0 0 0 0 0 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 6 6 6 22 22 22 50 50 50
57381- 90 90 90 26 26 26 2 2 6 2 2 6
57382- 14 14 14 195 195 195 250 250 250 253 253 253
57383-253 253 253 253 253 253 253 253 253 253 253 253
57384-253 253 253 253 253 253 253 253 253 253 253 253
57385-253 253 253 253 253 253 253 253 253 253 253 253
57386-253 253 253 253 253 253 253 253 253 253 253 253
57387-250 250 250 242 242 242 54 54 54 2 2 6
57388- 2 2 6 2 2 6 2 2 6 2 2 6
57389- 2 2 6 2 2 6 2 2 6 38 38 38
57390- 86 86 86 50 50 50 22 22 22 6 6 6
57391- 0 0 0 0 0 0 0 0 0 0 0 0
57392- 0 0 0 0 0 0 0 0 0 0 0 0
57393- 0 0 0 0 0 0 0 0 0 0 0 0
57394- 0 0 0 0 0 0 0 0 0 0 0 0
57395- 0 0 0 0 0 0 0 0 0 0 0 0
57396- 0 0 0 0 0 0 0 0 0 0 0 0
57397- 0 0 0 0 0 0 0 0 0 0 0 0
57398- 0 0 0 0 0 0 0 0 0 0 0 0
57399- 0 0 0 0 0 0 0 0 0 0 0 0
57400- 6 6 6 14 14 14 38 38 38 82 82 82
57401- 34 34 34 2 2 6 2 2 6 2 2 6
57402- 42 42 42 195 195 195 246 246 246 253 253 253
57403-253 253 253 253 253 253 253 253 253 250 250 250
57404-242 242 242 242 242 242 250 250 250 253 253 253
57405-253 253 253 253 253 253 253 253 253 253 253 253
57406-253 253 253 250 250 250 246 246 246 238 238 238
57407-226 226 226 231 231 231 101 101 101 6 6 6
57408- 2 2 6 2 2 6 2 2 6 2 2 6
57409- 2 2 6 2 2 6 2 2 6 2 2 6
57410- 38 38 38 82 82 82 42 42 42 14 14 14
57411- 6 6 6 0 0 0 0 0 0 0 0 0
57412- 0 0 0 0 0 0 0 0 0 0 0 0
57413- 0 0 0 0 0 0 0 0 0 0 0 0
57414- 0 0 0 0 0 0 0 0 0 0 0 0
57415- 0 0 0 0 0 0 0 0 0 0 0 0
57416- 0 0 0 0 0 0 0 0 0 0 0 0
57417- 0 0 0 0 0 0 0 0 0 0 0 0
57418- 0 0 0 0 0 0 0 0 0 0 0 0
57419- 0 0 0 0 0 0 0 0 0 0 0 0
57420- 10 10 10 26 26 26 62 62 62 66 66 66
57421- 2 2 6 2 2 6 2 2 6 6 6 6
57422- 70 70 70 170 170 170 206 206 206 234 234 234
57423-246 246 246 250 250 250 250 250 250 238 238 238
57424-226 226 226 231 231 231 238 238 238 250 250 250
57425-250 250 250 250 250 250 246 246 246 231 231 231
57426-214 214 214 206 206 206 202 202 202 202 202 202
57427-198 198 198 202 202 202 182 182 182 18 18 18
57428- 2 2 6 2 2 6 2 2 6 2 2 6
57429- 2 2 6 2 2 6 2 2 6 2 2 6
57430- 2 2 6 62 62 62 66 66 66 30 30 30
57431- 10 10 10 0 0 0 0 0 0 0 0 0
57432- 0 0 0 0 0 0 0 0 0 0 0 0
57433- 0 0 0 0 0 0 0 0 0 0 0 0
57434- 0 0 0 0 0 0 0 0 0 0 0 0
57435- 0 0 0 0 0 0 0 0 0 0 0 0
57436- 0 0 0 0 0 0 0 0 0 0 0 0
57437- 0 0 0 0 0 0 0 0 0 0 0 0
57438- 0 0 0 0 0 0 0 0 0 0 0 0
57439- 0 0 0 0 0 0 0 0 0 0 0 0
57440- 14 14 14 42 42 42 82 82 82 18 18 18
57441- 2 2 6 2 2 6 2 2 6 10 10 10
57442- 94 94 94 182 182 182 218 218 218 242 242 242
57443-250 250 250 253 253 253 253 253 253 250 250 250
57444-234 234 234 253 253 253 253 253 253 253 253 253
57445-253 253 253 253 253 253 253 253 253 246 246 246
57446-238 238 238 226 226 226 210 210 210 202 202 202
57447-195 195 195 195 195 195 210 210 210 158 158 158
57448- 6 6 6 14 14 14 50 50 50 14 14 14
57449- 2 2 6 2 2 6 2 2 6 2 2 6
57450- 2 2 6 6 6 6 86 86 86 46 46 46
57451- 18 18 18 6 6 6 0 0 0 0 0 0
57452- 0 0 0 0 0 0 0 0 0 0 0 0
57453- 0 0 0 0 0 0 0 0 0 0 0 0
57454- 0 0 0 0 0 0 0 0 0 0 0 0
57455- 0 0 0 0 0 0 0 0 0 0 0 0
57456- 0 0 0 0 0 0 0 0 0 0 0 0
57457- 0 0 0 0 0 0 0 0 0 0 0 0
57458- 0 0 0 0 0 0 0 0 0 0 0 0
57459- 0 0 0 0 0 0 0 0 0 6 6 6
57460- 22 22 22 54 54 54 70 70 70 2 2 6
57461- 2 2 6 10 10 10 2 2 6 22 22 22
57462-166 166 166 231 231 231 250 250 250 253 253 253
57463-253 253 253 253 253 253 253 253 253 250 250 250
57464-242 242 242 253 253 253 253 253 253 253 253 253
57465-253 253 253 253 253 253 253 253 253 253 253 253
57466-253 253 253 253 253 253 253 253 253 246 246 246
57467-231 231 231 206 206 206 198 198 198 226 226 226
57468- 94 94 94 2 2 6 6 6 6 38 38 38
57469- 30 30 30 2 2 6 2 2 6 2 2 6
57470- 2 2 6 2 2 6 62 62 62 66 66 66
57471- 26 26 26 10 10 10 0 0 0 0 0 0
57472- 0 0 0 0 0 0 0 0 0 0 0 0
57473- 0 0 0 0 0 0 0 0 0 0 0 0
57474- 0 0 0 0 0 0 0 0 0 0 0 0
57475- 0 0 0 0 0 0 0 0 0 0 0 0
57476- 0 0 0 0 0 0 0 0 0 0 0 0
57477- 0 0 0 0 0 0 0 0 0 0 0 0
57478- 0 0 0 0 0 0 0 0 0 0 0 0
57479- 0 0 0 0 0 0 0 0 0 10 10 10
57480- 30 30 30 74 74 74 50 50 50 2 2 6
57481- 26 26 26 26 26 26 2 2 6 106 106 106
57482-238 238 238 253 253 253 253 253 253 253 253 253
57483-253 253 253 253 253 253 253 253 253 253 253 253
57484-253 253 253 253 253 253 253 253 253 253 253 253
57485-253 253 253 253 253 253 253 253 253 253 253 253
57486-253 253 253 253 253 253 253 253 253 253 253 253
57487-253 253 253 246 246 246 218 218 218 202 202 202
57488-210 210 210 14 14 14 2 2 6 2 2 6
57489- 30 30 30 22 22 22 2 2 6 2 2 6
57490- 2 2 6 2 2 6 18 18 18 86 86 86
57491- 42 42 42 14 14 14 0 0 0 0 0 0
57492- 0 0 0 0 0 0 0 0 0 0 0 0
57493- 0 0 0 0 0 0 0 0 0 0 0 0
57494- 0 0 0 0 0 0 0 0 0 0 0 0
57495- 0 0 0 0 0 0 0 0 0 0 0 0
57496- 0 0 0 0 0 0 0 0 0 0 0 0
57497- 0 0 0 0 0 0 0 0 0 0 0 0
57498- 0 0 0 0 0 0 0 0 0 0 0 0
57499- 0 0 0 0 0 0 0 0 0 14 14 14
57500- 42 42 42 90 90 90 22 22 22 2 2 6
57501- 42 42 42 2 2 6 18 18 18 218 218 218
57502-253 253 253 253 253 253 253 253 253 253 253 253
57503-253 253 253 253 253 253 253 253 253 253 253 253
57504-253 253 253 253 253 253 253 253 253 253 253 253
57505-253 253 253 253 253 253 253 253 253 253 253 253
57506-253 253 253 253 253 253 253 253 253 253 253 253
57507-253 253 253 253 253 253 250 250 250 221 221 221
57508-218 218 218 101 101 101 2 2 6 14 14 14
57509- 18 18 18 38 38 38 10 10 10 2 2 6
57510- 2 2 6 2 2 6 2 2 6 78 78 78
57511- 58 58 58 22 22 22 6 6 6 0 0 0
57512- 0 0 0 0 0 0 0 0 0 0 0 0
57513- 0 0 0 0 0 0 0 0 0 0 0 0
57514- 0 0 0 0 0 0 0 0 0 0 0 0
57515- 0 0 0 0 0 0 0 0 0 0 0 0
57516- 0 0 0 0 0 0 0 0 0 0 0 0
57517- 0 0 0 0 0 0 0 0 0 0 0 0
57518- 0 0 0 0 0 0 0 0 0 0 0 0
57519- 0 0 0 0 0 0 6 6 6 18 18 18
57520- 54 54 54 82 82 82 2 2 6 26 26 26
57521- 22 22 22 2 2 6 123 123 123 253 253 253
57522-253 253 253 253 253 253 253 253 253 253 253 253
57523-253 253 253 253 253 253 253 253 253 253 253 253
57524-253 253 253 253 253 253 253 253 253 253 253 253
57525-253 253 253 253 253 253 253 253 253 253 253 253
57526-253 253 253 253 253 253 253 253 253 253 253 253
57527-253 253 253 253 253 253 253 253 253 250 250 250
57528-238 238 238 198 198 198 6 6 6 38 38 38
57529- 58 58 58 26 26 26 38 38 38 2 2 6
57530- 2 2 6 2 2 6 2 2 6 46 46 46
57531- 78 78 78 30 30 30 10 10 10 0 0 0
57532- 0 0 0 0 0 0 0 0 0 0 0 0
57533- 0 0 0 0 0 0 0 0 0 0 0 0
57534- 0 0 0 0 0 0 0 0 0 0 0 0
57535- 0 0 0 0 0 0 0 0 0 0 0 0
57536- 0 0 0 0 0 0 0 0 0 0 0 0
57537- 0 0 0 0 0 0 0 0 0 0 0 0
57538- 0 0 0 0 0 0 0 0 0 0 0 0
57539- 0 0 0 0 0 0 10 10 10 30 30 30
57540- 74 74 74 58 58 58 2 2 6 42 42 42
57541- 2 2 6 22 22 22 231 231 231 253 253 253
57542-253 253 253 253 253 253 253 253 253 253 253 253
57543-253 253 253 253 253 253 253 253 253 250 250 250
57544-253 253 253 253 253 253 253 253 253 253 253 253
57545-253 253 253 253 253 253 253 253 253 253 253 253
57546-253 253 253 253 253 253 253 253 253 253 253 253
57547-253 253 253 253 253 253 253 253 253 253 253 253
57548-253 253 253 246 246 246 46 46 46 38 38 38
57549- 42 42 42 14 14 14 38 38 38 14 14 14
57550- 2 2 6 2 2 6 2 2 6 6 6 6
57551- 86 86 86 46 46 46 14 14 14 0 0 0
57552- 0 0 0 0 0 0 0 0 0 0 0 0
57553- 0 0 0 0 0 0 0 0 0 0 0 0
57554- 0 0 0 0 0 0 0 0 0 0 0 0
57555- 0 0 0 0 0 0 0 0 0 0 0 0
57556- 0 0 0 0 0 0 0 0 0 0 0 0
57557- 0 0 0 0 0 0 0 0 0 0 0 0
57558- 0 0 0 0 0 0 0 0 0 0 0 0
57559- 0 0 0 6 6 6 14 14 14 42 42 42
57560- 90 90 90 18 18 18 18 18 18 26 26 26
57561- 2 2 6 116 116 116 253 253 253 253 253 253
57562-253 253 253 253 253 253 253 253 253 253 253 253
57563-253 253 253 253 253 253 250 250 250 238 238 238
57564-253 253 253 253 253 253 253 253 253 253 253 253
57565-253 253 253 253 253 253 253 253 253 253 253 253
57566-253 253 253 253 253 253 253 253 253 253 253 253
57567-253 253 253 253 253 253 253 253 253 253 253 253
57568-253 253 253 253 253 253 94 94 94 6 6 6
57569- 2 2 6 2 2 6 10 10 10 34 34 34
57570- 2 2 6 2 2 6 2 2 6 2 2 6
57571- 74 74 74 58 58 58 22 22 22 6 6 6
57572- 0 0 0 0 0 0 0 0 0 0 0 0
57573- 0 0 0 0 0 0 0 0 0 0 0 0
57574- 0 0 0 0 0 0 0 0 0 0 0 0
57575- 0 0 0 0 0 0 0 0 0 0 0 0
57576- 0 0 0 0 0 0 0 0 0 0 0 0
57577- 0 0 0 0 0 0 0 0 0 0 0 0
57578- 0 0 0 0 0 0 0 0 0 0 0 0
57579- 0 0 0 10 10 10 26 26 26 66 66 66
57580- 82 82 82 2 2 6 38 38 38 6 6 6
57581- 14 14 14 210 210 210 253 253 253 253 253 253
57582-253 253 253 253 253 253 253 253 253 253 253 253
57583-253 253 253 253 253 253 246 246 246 242 242 242
57584-253 253 253 253 253 253 253 253 253 253 253 253
57585-253 253 253 253 253 253 253 253 253 253 253 253
57586-253 253 253 253 253 253 253 253 253 253 253 253
57587-253 253 253 253 253 253 253 253 253 253 253 253
57588-253 253 253 253 253 253 144 144 144 2 2 6
57589- 2 2 6 2 2 6 2 2 6 46 46 46
57590- 2 2 6 2 2 6 2 2 6 2 2 6
57591- 42 42 42 74 74 74 30 30 30 10 10 10
57592- 0 0 0 0 0 0 0 0 0 0 0 0
57593- 0 0 0 0 0 0 0 0 0 0 0 0
57594- 0 0 0 0 0 0 0 0 0 0 0 0
57595- 0 0 0 0 0 0 0 0 0 0 0 0
57596- 0 0 0 0 0 0 0 0 0 0 0 0
57597- 0 0 0 0 0 0 0 0 0 0 0 0
57598- 0 0 0 0 0 0 0 0 0 0 0 0
57599- 6 6 6 14 14 14 42 42 42 90 90 90
57600- 26 26 26 6 6 6 42 42 42 2 2 6
57601- 74 74 74 250 250 250 253 253 253 253 253 253
57602-253 253 253 253 253 253 253 253 253 253 253 253
57603-253 253 253 253 253 253 242 242 242 242 242 242
57604-253 253 253 253 253 253 253 253 253 253 253 253
57605-253 253 253 253 253 253 253 253 253 253 253 253
57606-253 253 253 253 253 253 253 253 253 253 253 253
57607-253 253 253 253 253 253 253 253 253 253 253 253
57608-253 253 253 253 253 253 182 182 182 2 2 6
57609- 2 2 6 2 2 6 2 2 6 46 46 46
57610- 2 2 6 2 2 6 2 2 6 2 2 6
57611- 10 10 10 86 86 86 38 38 38 10 10 10
57612- 0 0 0 0 0 0 0 0 0 0 0 0
57613- 0 0 0 0 0 0 0 0 0 0 0 0
57614- 0 0 0 0 0 0 0 0 0 0 0 0
57615- 0 0 0 0 0 0 0 0 0 0 0 0
57616- 0 0 0 0 0 0 0 0 0 0 0 0
57617- 0 0 0 0 0 0 0 0 0 0 0 0
57618- 0 0 0 0 0 0 0 0 0 0 0 0
57619- 10 10 10 26 26 26 66 66 66 82 82 82
57620- 2 2 6 22 22 22 18 18 18 2 2 6
57621-149 149 149 253 253 253 253 253 253 253 253 253
57622-253 253 253 253 253 253 253 253 253 253 253 253
57623-253 253 253 253 253 253 234 234 234 242 242 242
57624-253 253 253 253 253 253 253 253 253 253 253 253
57625-253 253 253 253 253 253 253 253 253 253 253 253
57626-253 253 253 253 253 253 253 253 253 253 253 253
57627-253 253 253 253 253 253 253 253 253 253 253 253
57628-253 253 253 253 253 253 206 206 206 2 2 6
57629- 2 2 6 2 2 6 2 2 6 38 38 38
57630- 2 2 6 2 2 6 2 2 6 2 2 6
57631- 6 6 6 86 86 86 46 46 46 14 14 14
57632- 0 0 0 0 0 0 0 0 0 0 0 0
57633- 0 0 0 0 0 0 0 0 0 0 0 0
57634- 0 0 0 0 0 0 0 0 0 0 0 0
57635- 0 0 0 0 0 0 0 0 0 0 0 0
57636- 0 0 0 0 0 0 0 0 0 0 0 0
57637- 0 0 0 0 0 0 0 0 0 0 0 0
57638- 0 0 0 0 0 0 0 0 0 6 6 6
57639- 18 18 18 46 46 46 86 86 86 18 18 18
57640- 2 2 6 34 34 34 10 10 10 6 6 6
57641-210 210 210 253 253 253 253 253 253 253 253 253
57642-253 253 253 253 253 253 253 253 253 253 253 253
57643-253 253 253 253 253 253 234 234 234 242 242 242
57644-253 253 253 253 253 253 253 253 253 253 253 253
57645-253 253 253 253 253 253 253 253 253 253 253 253
57646-253 253 253 253 253 253 253 253 253 253 253 253
57647-253 253 253 253 253 253 253 253 253 253 253 253
57648-253 253 253 253 253 253 221 221 221 6 6 6
57649- 2 2 6 2 2 6 6 6 6 30 30 30
57650- 2 2 6 2 2 6 2 2 6 2 2 6
57651- 2 2 6 82 82 82 54 54 54 18 18 18
57652- 6 6 6 0 0 0 0 0 0 0 0 0
57653- 0 0 0 0 0 0 0 0 0 0 0 0
57654- 0 0 0 0 0 0 0 0 0 0 0 0
57655- 0 0 0 0 0 0 0 0 0 0 0 0
57656- 0 0 0 0 0 0 0 0 0 0 0 0
57657- 0 0 0 0 0 0 0 0 0 0 0 0
57658- 0 0 0 0 0 0 0 0 0 10 10 10
57659- 26 26 26 66 66 66 62 62 62 2 2 6
57660- 2 2 6 38 38 38 10 10 10 26 26 26
57661-238 238 238 253 253 253 253 253 253 253 253 253
57662-253 253 253 253 253 253 253 253 253 253 253 253
57663-253 253 253 253 253 253 231 231 231 238 238 238
57664-253 253 253 253 253 253 253 253 253 253 253 253
57665-253 253 253 253 253 253 253 253 253 253 253 253
57666-253 253 253 253 253 253 253 253 253 253 253 253
57667-253 253 253 253 253 253 253 253 253 253 253 253
57668-253 253 253 253 253 253 231 231 231 6 6 6
57669- 2 2 6 2 2 6 10 10 10 30 30 30
57670- 2 2 6 2 2 6 2 2 6 2 2 6
57671- 2 2 6 66 66 66 58 58 58 22 22 22
57672- 6 6 6 0 0 0 0 0 0 0 0 0
57673- 0 0 0 0 0 0 0 0 0 0 0 0
57674- 0 0 0 0 0 0 0 0 0 0 0 0
57675- 0 0 0 0 0 0 0 0 0 0 0 0
57676- 0 0 0 0 0 0 0 0 0 0 0 0
57677- 0 0 0 0 0 0 0 0 0 0 0 0
57678- 0 0 0 0 0 0 0 0 0 10 10 10
57679- 38 38 38 78 78 78 6 6 6 2 2 6
57680- 2 2 6 46 46 46 14 14 14 42 42 42
57681-246 246 246 253 253 253 253 253 253 253 253 253
57682-253 253 253 253 253 253 253 253 253 253 253 253
57683-253 253 253 253 253 253 231 231 231 242 242 242
57684-253 253 253 253 253 253 253 253 253 253 253 253
57685-253 253 253 253 253 253 253 253 253 253 253 253
57686-253 253 253 253 253 253 253 253 253 253 253 253
57687-253 253 253 253 253 253 253 253 253 253 253 253
57688-253 253 253 253 253 253 234 234 234 10 10 10
57689- 2 2 6 2 2 6 22 22 22 14 14 14
57690- 2 2 6 2 2 6 2 2 6 2 2 6
57691- 2 2 6 66 66 66 62 62 62 22 22 22
57692- 6 6 6 0 0 0 0 0 0 0 0 0
57693- 0 0 0 0 0 0 0 0 0 0 0 0
57694- 0 0 0 0 0 0 0 0 0 0 0 0
57695- 0 0 0 0 0 0 0 0 0 0 0 0
57696- 0 0 0 0 0 0 0 0 0 0 0 0
57697- 0 0 0 0 0 0 0 0 0 0 0 0
57698- 0 0 0 0 0 0 6 6 6 18 18 18
57699- 50 50 50 74 74 74 2 2 6 2 2 6
57700- 14 14 14 70 70 70 34 34 34 62 62 62
57701-250 250 250 253 253 253 253 253 253 253 253 253
57702-253 253 253 253 253 253 253 253 253 253 253 253
57703-253 253 253 253 253 253 231 231 231 246 246 246
57704-253 253 253 253 253 253 253 253 253 253 253 253
57705-253 253 253 253 253 253 253 253 253 253 253 253
57706-253 253 253 253 253 253 253 253 253 253 253 253
57707-253 253 253 253 253 253 253 253 253 253 253 253
57708-253 253 253 253 253 253 234 234 234 14 14 14
57709- 2 2 6 2 2 6 30 30 30 2 2 6
57710- 2 2 6 2 2 6 2 2 6 2 2 6
57711- 2 2 6 66 66 66 62 62 62 22 22 22
57712- 6 6 6 0 0 0 0 0 0 0 0 0
57713- 0 0 0 0 0 0 0 0 0 0 0 0
57714- 0 0 0 0 0 0 0 0 0 0 0 0
57715- 0 0 0 0 0 0 0 0 0 0 0 0
57716- 0 0 0 0 0 0 0 0 0 0 0 0
57717- 0 0 0 0 0 0 0 0 0 0 0 0
57718- 0 0 0 0 0 0 6 6 6 18 18 18
57719- 54 54 54 62 62 62 2 2 6 2 2 6
57720- 2 2 6 30 30 30 46 46 46 70 70 70
57721-250 250 250 253 253 253 253 253 253 253 253 253
57722-253 253 253 253 253 253 253 253 253 253 253 253
57723-253 253 253 253 253 253 231 231 231 246 246 246
57724-253 253 253 253 253 253 253 253 253 253 253 253
57725-253 253 253 253 253 253 253 253 253 253 253 253
57726-253 253 253 253 253 253 253 253 253 253 253 253
57727-253 253 253 253 253 253 253 253 253 253 253 253
57728-253 253 253 253 253 253 226 226 226 10 10 10
57729- 2 2 6 6 6 6 30 30 30 2 2 6
57730- 2 2 6 2 2 6 2 2 6 2 2 6
57731- 2 2 6 66 66 66 58 58 58 22 22 22
57732- 6 6 6 0 0 0 0 0 0 0 0 0
57733- 0 0 0 0 0 0 0 0 0 0 0 0
57734- 0 0 0 0 0 0 0 0 0 0 0 0
57735- 0 0 0 0 0 0 0 0 0 0 0 0
57736- 0 0 0 0 0 0 0 0 0 0 0 0
57737- 0 0 0 0 0 0 0 0 0 0 0 0
57738- 0 0 0 0 0 0 6 6 6 22 22 22
57739- 58 58 58 62 62 62 2 2 6 2 2 6
57740- 2 2 6 2 2 6 30 30 30 78 78 78
57741-250 250 250 253 253 253 253 253 253 253 253 253
57742-253 253 253 253 253 253 253 253 253 253 253 253
57743-253 253 253 253 253 253 231 231 231 246 246 246
57744-253 253 253 253 253 253 253 253 253 253 253 253
57745-253 253 253 253 253 253 253 253 253 253 253 253
57746-253 253 253 253 253 253 253 253 253 253 253 253
57747-253 253 253 253 253 253 253 253 253 253 253 253
57748-253 253 253 253 253 253 206 206 206 2 2 6
57749- 22 22 22 34 34 34 18 14 6 22 22 22
57750- 26 26 26 18 18 18 6 6 6 2 2 6
57751- 2 2 6 82 82 82 54 54 54 18 18 18
57752- 6 6 6 0 0 0 0 0 0 0 0 0
57753- 0 0 0 0 0 0 0 0 0 0 0 0
57754- 0 0 0 0 0 0 0 0 0 0 0 0
57755- 0 0 0 0 0 0 0 0 0 0 0 0
57756- 0 0 0 0 0 0 0 0 0 0 0 0
57757- 0 0 0 0 0 0 0 0 0 0 0 0
57758- 0 0 0 0 0 0 6 6 6 26 26 26
57759- 62 62 62 106 106 106 74 54 14 185 133 11
57760-210 162 10 121 92 8 6 6 6 62 62 62
57761-238 238 238 253 253 253 253 253 253 253 253 253
57762-253 253 253 253 253 253 253 253 253 253 253 253
57763-253 253 253 253 253 253 231 231 231 246 246 246
57764-253 253 253 253 253 253 253 253 253 253 253 253
57765-253 253 253 253 253 253 253 253 253 253 253 253
57766-253 253 253 253 253 253 253 253 253 253 253 253
57767-253 253 253 253 253 253 253 253 253 253 253 253
57768-253 253 253 253 253 253 158 158 158 18 18 18
57769- 14 14 14 2 2 6 2 2 6 2 2 6
57770- 6 6 6 18 18 18 66 66 66 38 38 38
57771- 6 6 6 94 94 94 50 50 50 18 18 18
57772- 6 6 6 0 0 0 0 0 0 0 0 0
57773- 0 0 0 0 0 0 0 0 0 0 0 0
57774- 0 0 0 0 0 0 0 0 0 0 0 0
57775- 0 0 0 0 0 0 0 0 0 0 0 0
57776- 0 0 0 0 0 0 0 0 0 0 0 0
57777- 0 0 0 0 0 0 0 0 0 6 6 6
57778- 10 10 10 10 10 10 18 18 18 38 38 38
57779- 78 78 78 142 134 106 216 158 10 242 186 14
57780-246 190 14 246 190 14 156 118 10 10 10 10
57781- 90 90 90 238 238 238 253 253 253 253 253 253
57782-253 253 253 253 253 253 253 253 253 253 253 253
57783-253 253 253 253 253 253 231 231 231 250 250 250
57784-253 253 253 253 253 253 253 253 253 253 253 253
57785-253 253 253 253 253 253 253 253 253 253 253 253
57786-253 253 253 253 253 253 253 253 253 253 253 253
57787-253 253 253 253 253 253 253 253 253 246 230 190
57788-238 204 91 238 204 91 181 142 44 37 26 9
57789- 2 2 6 2 2 6 2 2 6 2 2 6
57790- 2 2 6 2 2 6 38 38 38 46 46 46
57791- 26 26 26 106 106 106 54 54 54 18 18 18
57792- 6 6 6 0 0 0 0 0 0 0 0 0
57793- 0 0 0 0 0 0 0 0 0 0 0 0
57794- 0 0 0 0 0 0 0 0 0 0 0 0
57795- 0 0 0 0 0 0 0 0 0 0 0 0
57796- 0 0 0 0 0 0 0 0 0 0 0 0
57797- 0 0 0 6 6 6 14 14 14 22 22 22
57798- 30 30 30 38 38 38 50 50 50 70 70 70
57799-106 106 106 190 142 34 226 170 11 242 186 14
57800-246 190 14 246 190 14 246 190 14 154 114 10
57801- 6 6 6 74 74 74 226 226 226 253 253 253
57802-253 253 253 253 253 253 253 253 253 253 253 253
57803-253 253 253 253 253 253 231 231 231 250 250 250
57804-253 253 253 253 253 253 253 253 253 253 253 253
57805-253 253 253 253 253 253 253 253 253 253 253 253
57806-253 253 253 253 253 253 253 253 253 253 253 253
57807-253 253 253 253 253 253 253 253 253 228 184 62
57808-241 196 14 241 208 19 232 195 16 38 30 10
57809- 2 2 6 2 2 6 2 2 6 2 2 6
57810- 2 2 6 6 6 6 30 30 30 26 26 26
57811-203 166 17 154 142 90 66 66 66 26 26 26
57812- 6 6 6 0 0 0 0 0 0 0 0 0
57813- 0 0 0 0 0 0 0 0 0 0 0 0
57814- 0 0 0 0 0 0 0 0 0 0 0 0
57815- 0 0 0 0 0 0 0 0 0 0 0 0
57816- 0 0 0 0 0 0 0 0 0 0 0 0
57817- 6 6 6 18 18 18 38 38 38 58 58 58
57818- 78 78 78 86 86 86 101 101 101 123 123 123
57819-175 146 61 210 150 10 234 174 13 246 186 14
57820-246 190 14 246 190 14 246 190 14 238 190 10
57821-102 78 10 2 2 6 46 46 46 198 198 198
57822-253 253 253 253 253 253 253 253 253 253 253 253
57823-253 253 253 253 253 253 234 234 234 242 242 242
57824-253 253 253 253 253 253 253 253 253 253 253 253
57825-253 253 253 253 253 253 253 253 253 253 253 253
57826-253 253 253 253 253 253 253 253 253 253 253 253
57827-253 253 253 253 253 253 253 253 253 224 178 62
57828-242 186 14 241 196 14 210 166 10 22 18 6
57829- 2 2 6 2 2 6 2 2 6 2 2 6
57830- 2 2 6 2 2 6 6 6 6 121 92 8
57831-238 202 15 232 195 16 82 82 82 34 34 34
57832- 10 10 10 0 0 0 0 0 0 0 0 0
57833- 0 0 0 0 0 0 0 0 0 0 0 0
57834- 0 0 0 0 0 0 0 0 0 0 0 0
57835- 0 0 0 0 0 0 0 0 0 0 0 0
57836- 0 0 0 0 0 0 0 0 0 0 0 0
57837- 14 14 14 38 38 38 70 70 70 154 122 46
57838-190 142 34 200 144 11 197 138 11 197 138 11
57839-213 154 11 226 170 11 242 186 14 246 190 14
57840-246 190 14 246 190 14 246 190 14 246 190 14
57841-225 175 15 46 32 6 2 2 6 22 22 22
57842-158 158 158 250 250 250 253 253 253 253 253 253
57843-253 253 253 253 253 253 253 253 253 253 253 253
57844-253 253 253 253 253 253 253 253 253 253 253 253
57845-253 253 253 253 253 253 253 253 253 253 253 253
57846-253 253 253 253 253 253 253 253 253 253 253 253
57847-253 253 253 250 250 250 242 242 242 224 178 62
57848-239 182 13 236 186 11 213 154 11 46 32 6
57849- 2 2 6 2 2 6 2 2 6 2 2 6
57850- 2 2 6 2 2 6 61 42 6 225 175 15
57851-238 190 10 236 186 11 112 100 78 42 42 42
57852- 14 14 14 0 0 0 0 0 0 0 0 0
57853- 0 0 0 0 0 0 0 0 0 0 0 0
57854- 0 0 0 0 0 0 0 0 0 0 0 0
57855- 0 0 0 0 0 0 0 0 0 0 0 0
57856- 0 0 0 0 0 0 0 0 0 6 6 6
57857- 22 22 22 54 54 54 154 122 46 213 154 11
57858-226 170 11 230 174 11 226 170 11 226 170 11
57859-236 178 12 242 186 14 246 190 14 246 190 14
57860-246 190 14 246 190 14 246 190 14 246 190 14
57861-241 196 14 184 144 12 10 10 10 2 2 6
57862- 6 6 6 116 116 116 242 242 242 253 253 253
57863-253 253 253 253 253 253 253 253 253 253 253 253
57864-253 253 253 253 253 253 253 253 253 253 253 253
57865-253 253 253 253 253 253 253 253 253 253 253 253
57866-253 253 253 253 253 253 253 253 253 253 253 253
57867-253 253 253 231 231 231 198 198 198 214 170 54
57868-236 178 12 236 178 12 210 150 10 137 92 6
57869- 18 14 6 2 2 6 2 2 6 2 2 6
57870- 6 6 6 70 47 6 200 144 11 236 178 12
57871-239 182 13 239 182 13 124 112 88 58 58 58
57872- 22 22 22 6 6 6 0 0 0 0 0 0
57873- 0 0 0 0 0 0 0 0 0 0 0 0
57874- 0 0 0 0 0 0 0 0 0 0 0 0
57875- 0 0 0 0 0 0 0 0 0 0 0 0
57876- 0 0 0 0 0 0 0 0 0 10 10 10
57877- 30 30 30 70 70 70 180 133 36 226 170 11
57878-239 182 13 242 186 14 242 186 14 246 186 14
57879-246 190 14 246 190 14 246 190 14 246 190 14
57880-246 190 14 246 190 14 246 190 14 246 190 14
57881-246 190 14 232 195 16 98 70 6 2 2 6
57882- 2 2 6 2 2 6 66 66 66 221 221 221
57883-253 253 253 253 253 253 253 253 253 253 253 253
57884-253 253 253 253 253 253 253 253 253 253 253 253
57885-253 253 253 253 253 253 253 253 253 253 253 253
57886-253 253 253 253 253 253 253 253 253 253 253 253
57887-253 253 253 206 206 206 198 198 198 214 166 58
57888-230 174 11 230 174 11 216 158 10 192 133 9
57889-163 110 8 116 81 8 102 78 10 116 81 8
57890-167 114 7 197 138 11 226 170 11 239 182 13
57891-242 186 14 242 186 14 162 146 94 78 78 78
57892- 34 34 34 14 14 14 6 6 6 0 0 0
57893- 0 0 0 0 0 0 0 0 0 0 0 0
57894- 0 0 0 0 0 0 0 0 0 0 0 0
57895- 0 0 0 0 0 0 0 0 0 0 0 0
57896- 0 0 0 0 0 0 0 0 0 6 6 6
57897- 30 30 30 78 78 78 190 142 34 226 170 11
57898-239 182 13 246 190 14 246 190 14 246 190 14
57899-246 190 14 246 190 14 246 190 14 246 190 14
57900-246 190 14 246 190 14 246 190 14 246 190 14
57901-246 190 14 241 196 14 203 166 17 22 18 6
57902- 2 2 6 2 2 6 2 2 6 38 38 38
57903-218 218 218 253 253 253 253 253 253 253 253 253
57904-253 253 253 253 253 253 253 253 253 253 253 253
57905-253 253 253 253 253 253 253 253 253 253 253 253
57906-253 253 253 253 253 253 253 253 253 253 253 253
57907-250 250 250 206 206 206 198 198 198 202 162 69
57908-226 170 11 236 178 12 224 166 10 210 150 10
57909-200 144 11 197 138 11 192 133 9 197 138 11
57910-210 150 10 226 170 11 242 186 14 246 190 14
57911-246 190 14 246 186 14 225 175 15 124 112 88
57912- 62 62 62 30 30 30 14 14 14 6 6 6
57913- 0 0 0 0 0 0 0 0 0 0 0 0
57914- 0 0 0 0 0 0 0 0 0 0 0 0
57915- 0 0 0 0 0 0 0 0 0 0 0 0
57916- 0 0 0 0 0 0 0 0 0 10 10 10
57917- 30 30 30 78 78 78 174 135 50 224 166 10
57918-239 182 13 246 190 14 246 190 14 246 190 14
57919-246 190 14 246 190 14 246 190 14 246 190 14
57920-246 190 14 246 190 14 246 190 14 246 190 14
57921-246 190 14 246 190 14 241 196 14 139 102 15
57922- 2 2 6 2 2 6 2 2 6 2 2 6
57923- 78 78 78 250 250 250 253 253 253 253 253 253
57924-253 253 253 253 253 253 253 253 253 253 253 253
57925-253 253 253 253 253 253 253 253 253 253 253 253
57926-253 253 253 253 253 253 253 253 253 253 253 253
57927-250 250 250 214 214 214 198 198 198 190 150 46
57928-219 162 10 236 178 12 234 174 13 224 166 10
57929-216 158 10 213 154 11 213 154 11 216 158 10
57930-226 170 11 239 182 13 246 190 14 246 190 14
57931-246 190 14 246 190 14 242 186 14 206 162 42
57932-101 101 101 58 58 58 30 30 30 14 14 14
57933- 6 6 6 0 0 0 0 0 0 0 0 0
57934- 0 0 0 0 0 0 0 0 0 0 0 0
57935- 0 0 0 0 0 0 0 0 0 0 0 0
57936- 0 0 0 0 0 0 0 0 0 10 10 10
57937- 30 30 30 74 74 74 174 135 50 216 158 10
57938-236 178 12 246 190 14 246 190 14 246 190 14
57939-246 190 14 246 190 14 246 190 14 246 190 14
57940-246 190 14 246 190 14 246 190 14 246 190 14
57941-246 190 14 246 190 14 241 196 14 226 184 13
57942- 61 42 6 2 2 6 2 2 6 2 2 6
57943- 22 22 22 238 238 238 253 253 253 253 253 253
57944-253 253 253 253 253 253 253 253 253 253 253 253
57945-253 253 253 253 253 253 253 253 253 253 253 253
57946-253 253 253 253 253 253 253 253 253 253 253 253
57947-253 253 253 226 226 226 187 187 187 180 133 36
57948-216 158 10 236 178 12 239 182 13 236 178 12
57949-230 174 11 226 170 11 226 170 11 230 174 11
57950-236 178 12 242 186 14 246 190 14 246 190 14
57951-246 190 14 246 190 14 246 186 14 239 182 13
57952-206 162 42 106 106 106 66 66 66 34 34 34
57953- 14 14 14 6 6 6 0 0 0 0 0 0
57954- 0 0 0 0 0 0 0 0 0 0 0 0
57955- 0 0 0 0 0 0 0 0 0 0 0 0
57956- 0 0 0 0 0 0 0 0 0 6 6 6
57957- 26 26 26 70 70 70 163 133 67 213 154 11
57958-236 178 12 246 190 14 246 190 14 246 190 14
57959-246 190 14 246 190 14 246 190 14 246 190 14
57960-246 190 14 246 190 14 246 190 14 246 190 14
57961-246 190 14 246 190 14 246 190 14 241 196 14
57962-190 146 13 18 14 6 2 2 6 2 2 6
57963- 46 46 46 246 246 246 253 253 253 253 253 253
57964-253 253 253 253 253 253 253 253 253 253 253 253
57965-253 253 253 253 253 253 253 253 253 253 253 253
57966-253 253 253 253 253 253 253 253 253 253 253 253
57967-253 253 253 221 221 221 86 86 86 156 107 11
57968-216 158 10 236 178 12 242 186 14 246 186 14
57969-242 186 14 239 182 13 239 182 13 242 186 14
57970-242 186 14 246 186 14 246 190 14 246 190 14
57971-246 190 14 246 190 14 246 190 14 246 190 14
57972-242 186 14 225 175 15 142 122 72 66 66 66
57973- 30 30 30 10 10 10 0 0 0 0 0 0
57974- 0 0 0 0 0 0 0 0 0 0 0 0
57975- 0 0 0 0 0 0 0 0 0 0 0 0
57976- 0 0 0 0 0 0 0 0 0 6 6 6
57977- 26 26 26 70 70 70 163 133 67 210 150 10
57978-236 178 12 246 190 14 246 190 14 246 190 14
57979-246 190 14 246 190 14 246 190 14 246 190 14
57980-246 190 14 246 190 14 246 190 14 246 190 14
57981-246 190 14 246 190 14 246 190 14 246 190 14
57982-232 195 16 121 92 8 34 34 34 106 106 106
57983-221 221 221 253 253 253 253 253 253 253 253 253
57984-253 253 253 253 253 253 253 253 253 253 253 253
57985-253 253 253 253 253 253 253 253 253 253 253 253
57986-253 253 253 253 253 253 253 253 253 253 253 253
57987-242 242 242 82 82 82 18 14 6 163 110 8
57988-216 158 10 236 178 12 242 186 14 246 190 14
57989-246 190 14 246 190 14 246 190 14 246 190 14
57990-246 190 14 246 190 14 246 190 14 246 190 14
57991-246 190 14 246 190 14 246 190 14 246 190 14
57992-246 190 14 246 190 14 242 186 14 163 133 67
57993- 46 46 46 18 18 18 6 6 6 0 0 0
57994- 0 0 0 0 0 0 0 0 0 0 0 0
57995- 0 0 0 0 0 0 0 0 0 0 0 0
57996- 0 0 0 0 0 0 0 0 0 10 10 10
57997- 30 30 30 78 78 78 163 133 67 210 150 10
57998-236 178 12 246 186 14 246 190 14 246 190 14
57999-246 190 14 246 190 14 246 190 14 246 190 14
58000-246 190 14 246 190 14 246 190 14 246 190 14
58001-246 190 14 246 190 14 246 190 14 246 190 14
58002-241 196 14 215 174 15 190 178 144 253 253 253
58003-253 253 253 253 253 253 253 253 253 253 253 253
58004-253 253 253 253 253 253 253 253 253 253 253 253
58005-253 253 253 253 253 253 253 253 253 253 253 253
58006-253 253 253 253 253 253 253 253 253 218 218 218
58007- 58 58 58 2 2 6 22 18 6 167 114 7
58008-216 158 10 236 178 12 246 186 14 246 190 14
58009-246 190 14 246 190 14 246 190 14 246 190 14
58010-246 190 14 246 190 14 246 190 14 246 190 14
58011-246 190 14 246 190 14 246 190 14 246 190 14
58012-246 190 14 246 186 14 242 186 14 190 150 46
58013- 54 54 54 22 22 22 6 6 6 0 0 0
58014- 0 0 0 0 0 0 0 0 0 0 0 0
58015- 0 0 0 0 0 0 0 0 0 0 0 0
58016- 0 0 0 0 0 0 0 0 0 14 14 14
58017- 38 38 38 86 86 86 180 133 36 213 154 11
58018-236 178 12 246 186 14 246 190 14 246 190 14
58019-246 190 14 246 190 14 246 190 14 246 190 14
58020-246 190 14 246 190 14 246 190 14 246 190 14
58021-246 190 14 246 190 14 246 190 14 246 190 14
58022-246 190 14 232 195 16 190 146 13 214 214 214
58023-253 253 253 253 253 253 253 253 253 253 253 253
58024-253 253 253 253 253 253 253 253 253 253 253 253
58025-253 253 253 253 253 253 253 253 253 253 253 253
58026-253 253 253 250 250 250 170 170 170 26 26 26
58027- 2 2 6 2 2 6 37 26 9 163 110 8
58028-219 162 10 239 182 13 246 186 14 246 190 14
58029-246 190 14 246 190 14 246 190 14 246 190 14
58030-246 190 14 246 190 14 246 190 14 246 190 14
58031-246 190 14 246 190 14 246 190 14 246 190 14
58032-246 186 14 236 178 12 224 166 10 142 122 72
58033- 46 46 46 18 18 18 6 6 6 0 0 0
58034- 0 0 0 0 0 0 0 0 0 0 0 0
58035- 0 0 0 0 0 0 0 0 0 0 0 0
58036- 0 0 0 0 0 0 6 6 6 18 18 18
58037- 50 50 50 109 106 95 192 133 9 224 166 10
58038-242 186 14 246 190 14 246 190 14 246 190 14
58039-246 190 14 246 190 14 246 190 14 246 190 14
58040-246 190 14 246 190 14 246 190 14 246 190 14
58041-246 190 14 246 190 14 246 190 14 246 190 14
58042-242 186 14 226 184 13 210 162 10 142 110 46
58043-226 226 226 253 253 253 253 253 253 253 253 253
58044-253 253 253 253 253 253 253 253 253 253 253 253
58045-253 253 253 253 253 253 253 253 253 253 253 253
58046-198 198 198 66 66 66 2 2 6 2 2 6
58047- 2 2 6 2 2 6 50 34 6 156 107 11
58048-219 162 10 239 182 13 246 186 14 246 190 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 246 190 14 246 190 14 242 186 14
58052-234 174 13 213 154 11 154 122 46 66 66 66
58053- 30 30 30 10 10 10 0 0 0 0 0 0
58054- 0 0 0 0 0 0 0 0 0 0 0 0
58055- 0 0 0 0 0 0 0 0 0 0 0 0
58056- 0 0 0 0 0 0 6 6 6 22 22 22
58057- 58 58 58 154 121 60 206 145 10 234 174 13
58058-242 186 14 246 186 14 246 190 14 246 190 14
58059-246 190 14 246 190 14 246 190 14 246 190 14
58060-246 190 14 246 190 14 246 190 14 246 190 14
58061-246 190 14 246 190 14 246 190 14 246 190 14
58062-246 186 14 236 178 12 210 162 10 163 110 8
58063- 61 42 6 138 138 138 218 218 218 250 250 250
58064-253 253 253 253 253 253 253 253 253 250 250 250
58065-242 242 242 210 210 210 144 144 144 66 66 66
58066- 6 6 6 2 2 6 2 2 6 2 2 6
58067- 2 2 6 2 2 6 61 42 6 163 110 8
58068-216 158 10 236 178 12 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 239 182 13 230 174 11 216 158 10
58072-190 142 34 124 112 88 70 70 70 38 38 38
58073- 18 18 18 6 6 6 0 0 0 0 0 0
58074- 0 0 0 0 0 0 0 0 0 0 0 0
58075- 0 0 0 0 0 0 0 0 0 0 0 0
58076- 0 0 0 0 0 0 6 6 6 22 22 22
58077- 62 62 62 168 124 44 206 145 10 224 166 10
58078-236 178 12 239 182 13 242 186 14 242 186 14
58079-246 186 14 246 190 14 246 190 14 246 190 14
58080-246 190 14 246 190 14 246 190 14 246 190 14
58081-246 190 14 246 190 14 246 190 14 246 190 14
58082-246 190 14 236 178 12 216 158 10 175 118 6
58083- 80 54 7 2 2 6 6 6 6 30 30 30
58084- 54 54 54 62 62 62 50 50 50 38 38 38
58085- 14 14 14 2 2 6 2 2 6 2 2 6
58086- 2 2 6 2 2 6 2 2 6 2 2 6
58087- 2 2 6 6 6 6 80 54 7 167 114 7
58088-213 154 11 236 178 12 246 190 14 246 190 14
58089-246 190 14 246 190 14 246 190 14 246 190 14
58090-246 190 14 242 186 14 239 182 13 239 182 13
58091-230 174 11 210 150 10 174 135 50 124 112 88
58092- 82 82 82 54 54 54 34 34 34 18 18 18
58093- 6 6 6 0 0 0 0 0 0 0 0 0
58094- 0 0 0 0 0 0 0 0 0 0 0 0
58095- 0 0 0 0 0 0 0 0 0 0 0 0
58096- 0 0 0 0 0 0 6 6 6 18 18 18
58097- 50 50 50 158 118 36 192 133 9 200 144 11
58098-216 158 10 219 162 10 224 166 10 226 170 11
58099-230 174 11 236 178 12 239 182 13 239 182 13
58100-242 186 14 246 186 14 246 190 14 246 190 14
58101-246 190 14 246 190 14 246 190 14 246 190 14
58102-246 186 14 230 174 11 210 150 10 163 110 8
58103-104 69 6 10 10 10 2 2 6 2 2 6
58104- 2 2 6 2 2 6 2 2 6 2 2 6
58105- 2 2 6 2 2 6 2 2 6 2 2 6
58106- 2 2 6 2 2 6 2 2 6 2 2 6
58107- 2 2 6 6 6 6 91 60 6 167 114 7
58108-206 145 10 230 174 11 242 186 14 246 190 14
58109-246 190 14 246 190 14 246 186 14 242 186 14
58110-239 182 13 230 174 11 224 166 10 213 154 11
58111-180 133 36 124 112 88 86 86 86 58 58 58
58112- 38 38 38 22 22 22 10 10 10 6 6 6
58113- 0 0 0 0 0 0 0 0 0 0 0 0
58114- 0 0 0 0 0 0 0 0 0 0 0 0
58115- 0 0 0 0 0 0 0 0 0 0 0 0
58116- 0 0 0 0 0 0 0 0 0 14 14 14
58117- 34 34 34 70 70 70 138 110 50 158 118 36
58118-167 114 7 180 123 7 192 133 9 197 138 11
58119-200 144 11 206 145 10 213 154 11 219 162 10
58120-224 166 10 230 174 11 239 182 13 242 186 14
58121-246 186 14 246 186 14 246 186 14 246 186 14
58122-239 182 13 216 158 10 185 133 11 152 99 6
58123-104 69 6 18 14 6 2 2 6 2 2 6
58124- 2 2 6 2 2 6 2 2 6 2 2 6
58125- 2 2 6 2 2 6 2 2 6 2 2 6
58126- 2 2 6 2 2 6 2 2 6 2 2 6
58127- 2 2 6 6 6 6 80 54 7 152 99 6
58128-192 133 9 219 162 10 236 178 12 239 182 13
58129-246 186 14 242 186 14 239 182 13 236 178 12
58130-224 166 10 206 145 10 192 133 9 154 121 60
58131- 94 94 94 62 62 62 42 42 42 22 22 22
58132- 14 14 14 6 6 6 0 0 0 0 0 0
58133- 0 0 0 0 0 0 0 0 0 0 0 0
58134- 0 0 0 0 0 0 0 0 0 0 0 0
58135- 0 0 0 0 0 0 0 0 0 0 0 0
58136- 0 0 0 0 0 0 0 0 0 6 6 6
58137- 18 18 18 34 34 34 58 58 58 78 78 78
58138-101 98 89 124 112 88 142 110 46 156 107 11
58139-163 110 8 167 114 7 175 118 6 180 123 7
58140-185 133 11 197 138 11 210 150 10 219 162 10
58141-226 170 11 236 178 12 236 178 12 234 174 13
58142-219 162 10 197 138 11 163 110 8 130 83 6
58143- 91 60 6 10 10 10 2 2 6 2 2 6
58144- 18 18 18 38 38 38 38 38 38 38 38 38
58145- 38 38 38 38 38 38 38 38 38 38 38 38
58146- 38 38 38 38 38 38 26 26 26 2 2 6
58147- 2 2 6 6 6 6 70 47 6 137 92 6
58148-175 118 6 200 144 11 219 162 10 230 174 11
58149-234 174 13 230 174 11 219 162 10 210 150 10
58150-192 133 9 163 110 8 124 112 88 82 82 82
58151- 50 50 50 30 30 30 14 14 14 6 6 6
58152- 0 0 0 0 0 0 0 0 0 0 0 0
58153- 0 0 0 0 0 0 0 0 0 0 0 0
58154- 0 0 0 0 0 0 0 0 0 0 0 0
58155- 0 0 0 0 0 0 0 0 0 0 0 0
58156- 0 0 0 0 0 0 0 0 0 0 0 0
58157- 6 6 6 14 14 14 22 22 22 34 34 34
58158- 42 42 42 58 58 58 74 74 74 86 86 86
58159-101 98 89 122 102 70 130 98 46 121 87 25
58160-137 92 6 152 99 6 163 110 8 180 123 7
58161-185 133 11 197 138 11 206 145 10 200 144 11
58162-180 123 7 156 107 11 130 83 6 104 69 6
58163- 50 34 6 54 54 54 110 110 110 101 98 89
58164- 86 86 86 82 82 82 78 78 78 78 78 78
58165- 78 78 78 78 78 78 78 78 78 78 78 78
58166- 78 78 78 82 82 82 86 86 86 94 94 94
58167-106 106 106 101 101 101 86 66 34 124 80 6
58168-156 107 11 180 123 7 192 133 9 200 144 11
58169-206 145 10 200 144 11 192 133 9 175 118 6
58170-139 102 15 109 106 95 70 70 70 42 42 42
58171- 22 22 22 10 10 10 0 0 0 0 0 0
58172- 0 0 0 0 0 0 0 0 0 0 0 0
58173- 0 0 0 0 0 0 0 0 0 0 0 0
58174- 0 0 0 0 0 0 0 0 0 0 0 0
58175- 0 0 0 0 0 0 0 0 0 0 0 0
58176- 0 0 0 0 0 0 0 0 0 0 0 0
58177- 0 0 0 0 0 0 6 6 6 10 10 10
58178- 14 14 14 22 22 22 30 30 30 38 38 38
58179- 50 50 50 62 62 62 74 74 74 90 90 90
58180-101 98 89 112 100 78 121 87 25 124 80 6
58181-137 92 6 152 99 6 152 99 6 152 99 6
58182-138 86 6 124 80 6 98 70 6 86 66 30
58183-101 98 89 82 82 82 58 58 58 46 46 46
58184- 38 38 38 34 34 34 34 34 34 34 34 34
58185- 34 34 34 34 34 34 34 34 34 34 34 34
58186- 34 34 34 34 34 34 38 38 38 42 42 42
58187- 54 54 54 82 82 82 94 86 76 91 60 6
58188-134 86 6 156 107 11 167 114 7 175 118 6
58189-175 118 6 167 114 7 152 99 6 121 87 25
58190-101 98 89 62 62 62 34 34 34 18 18 18
58191- 6 6 6 0 0 0 0 0 0 0 0 0
58192- 0 0 0 0 0 0 0 0 0 0 0 0
58193- 0 0 0 0 0 0 0 0 0 0 0 0
58194- 0 0 0 0 0 0 0 0 0 0 0 0
58195- 0 0 0 0 0 0 0 0 0 0 0 0
58196- 0 0 0 0 0 0 0 0 0 0 0 0
58197- 0 0 0 0 0 0 0 0 0 0 0 0
58198- 0 0 0 6 6 6 6 6 6 10 10 10
58199- 18 18 18 22 22 22 30 30 30 42 42 42
58200- 50 50 50 66 66 66 86 86 86 101 98 89
58201-106 86 58 98 70 6 104 69 6 104 69 6
58202-104 69 6 91 60 6 82 62 34 90 90 90
58203- 62 62 62 38 38 38 22 22 22 14 14 14
58204- 10 10 10 10 10 10 10 10 10 10 10 10
58205- 10 10 10 10 10 10 6 6 6 10 10 10
58206- 10 10 10 10 10 10 10 10 10 14 14 14
58207- 22 22 22 42 42 42 70 70 70 89 81 66
58208- 80 54 7 104 69 6 124 80 6 137 92 6
58209-134 86 6 116 81 8 100 82 52 86 86 86
58210- 58 58 58 30 30 30 14 14 14 6 6 6
58211- 0 0 0 0 0 0 0 0 0 0 0 0
58212- 0 0 0 0 0 0 0 0 0 0 0 0
58213- 0 0 0 0 0 0 0 0 0 0 0 0
58214- 0 0 0 0 0 0 0 0 0 0 0 0
58215- 0 0 0 0 0 0 0 0 0 0 0 0
58216- 0 0 0 0 0 0 0 0 0 0 0 0
58217- 0 0 0 0 0 0 0 0 0 0 0 0
58218- 0 0 0 0 0 0 0 0 0 0 0 0
58219- 0 0 0 6 6 6 10 10 10 14 14 14
58220- 18 18 18 26 26 26 38 38 38 54 54 54
58221- 70 70 70 86 86 86 94 86 76 89 81 66
58222- 89 81 66 86 86 86 74 74 74 50 50 50
58223- 30 30 30 14 14 14 6 6 6 0 0 0
58224- 0 0 0 0 0 0 0 0 0 0 0 0
58225- 0 0 0 0 0 0 0 0 0 0 0 0
58226- 0 0 0 0 0 0 0 0 0 0 0 0
58227- 6 6 6 18 18 18 34 34 34 58 58 58
58228- 82 82 82 89 81 66 89 81 66 89 81 66
58229- 94 86 66 94 86 76 74 74 74 50 50 50
58230- 26 26 26 14 14 14 6 6 6 0 0 0
58231- 0 0 0 0 0 0 0 0 0 0 0 0
58232- 0 0 0 0 0 0 0 0 0 0 0 0
58233- 0 0 0 0 0 0 0 0 0 0 0 0
58234- 0 0 0 0 0 0 0 0 0 0 0 0
58235- 0 0 0 0 0 0 0 0 0 0 0 0
58236- 0 0 0 0 0 0 0 0 0 0 0 0
58237- 0 0 0 0 0 0 0 0 0 0 0 0
58238- 0 0 0 0 0 0 0 0 0 0 0 0
58239- 0 0 0 0 0 0 0 0 0 0 0 0
58240- 6 6 6 6 6 6 14 14 14 18 18 18
58241- 30 30 30 38 38 38 46 46 46 54 54 54
58242- 50 50 50 42 42 42 30 30 30 18 18 18
58243- 10 10 10 0 0 0 0 0 0 0 0 0
58244- 0 0 0 0 0 0 0 0 0 0 0 0
58245- 0 0 0 0 0 0 0 0 0 0 0 0
58246- 0 0 0 0 0 0 0 0 0 0 0 0
58247- 0 0 0 6 6 6 14 14 14 26 26 26
58248- 38 38 38 50 50 50 58 58 58 58 58 58
58249- 54 54 54 42 42 42 30 30 30 18 18 18
58250- 10 10 10 0 0 0 0 0 0 0 0 0
58251- 0 0 0 0 0 0 0 0 0 0 0 0
58252- 0 0 0 0 0 0 0 0 0 0 0 0
58253- 0 0 0 0 0 0 0 0 0 0 0 0
58254- 0 0 0 0 0 0 0 0 0 0 0 0
58255- 0 0 0 0 0 0 0 0 0 0 0 0
58256- 0 0 0 0 0 0 0 0 0 0 0 0
58257- 0 0 0 0 0 0 0 0 0 0 0 0
58258- 0 0 0 0 0 0 0 0 0 0 0 0
58259- 0 0 0 0 0 0 0 0 0 0 0 0
58260- 0 0 0 0 0 0 0 0 0 6 6 6
58261- 6 6 6 10 10 10 14 14 14 18 18 18
58262- 18 18 18 14 14 14 10 10 10 6 6 6
58263- 0 0 0 0 0 0 0 0 0 0 0 0
58264- 0 0 0 0 0 0 0 0 0 0 0 0
58265- 0 0 0 0 0 0 0 0 0 0 0 0
58266- 0 0 0 0 0 0 0 0 0 0 0 0
58267- 0 0 0 0 0 0 0 0 0 6 6 6
58268- 14 14 14 18 18 18 22 22 22 22 22 22
58269- 18 18 18 14 14 14 10 10 10 6 6 6
58270- 0 0 0 0 0 0 0 0 0 0 0 0
58271- 0 0 0 0 0 0 0 0 0 0 0 0
58272- 0 0 0 0 0 0 0 0 0 0 0 0
58273- 0 0 0 0 0 0 0 0 0 0 0 0
58274- 0 0 0 0 0 0 0 0 0 0 0 0
58275+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58276+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58277+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58278+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58279+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58280+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58282+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58283+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58284+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58285+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58286+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58287+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58288+4 4 4 4 4 4
58289+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58290+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58291+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58292+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58293+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58294+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58296+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58297+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58298+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58299+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58300+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58301+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58302+4 4 4 4 4 4
58303+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58304+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58307+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58310+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58311+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58312+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58314+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58315+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58316+4 4 4 4 4 4
58317+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58321+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58324+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58325+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58329+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58330+4 4 4 4 4 4
58331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58335+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58339+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58343+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58344+4 4 4 4 4 4
58345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58349+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58357+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58358+4 4 4 4 4 4
58359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58363+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58364+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58368+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58369+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58370+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58372+4 4 4 4 4 4
58373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58377+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58378+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58379+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58380+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58382+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58383+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58384+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58385+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58386+4 4 4 4 4 4
58387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58391+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58392+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58393+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58396+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58397+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58398+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58399+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58400+4 4 4 4 4 4
58401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58404+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58405+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58406+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58407+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58409+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58410+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58411+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58412+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58413+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58414+4 4 4 4 4 4
58415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58419+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58420+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58421+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58422+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58423+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58424+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58425+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58426+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58427+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58428+4 4 4 4 4 4
58429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58432+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58433+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58434+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58435+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58436+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58437+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58438+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58439+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58440+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58441+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58442+4 4 4 4 4 4
58443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58446+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58447+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58448+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58449+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58450+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58451+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58452+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58453+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58454+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58455+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58456+4 4 4 4 4 4
58457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58459+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58460+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58461+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58462+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58463+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58464+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58465+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58466+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58467+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58468+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58469+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58470+4 4 4 4 4 4
58471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58473+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58474+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58475+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58476+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58477+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58478+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58479+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58480+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58481+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58482+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58483+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58484+4 4 4 4 4 4
58485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58487+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58488+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58489+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58490+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58491+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58492+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58493+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58494+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58495+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58496+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58497+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58498+4 4 4 4 4 4
58499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58500+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58501+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58502+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58503+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58504+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58505+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58506+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58507+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58508+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58509+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58510+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58511+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58512+4 4 4 4 4 4
58513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58514+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58515+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58516+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58517+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58518+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58519+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58520+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58521+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58522+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58523+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58524+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58525+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58526+0 0 0 4 4 4
58527+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58528+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58529+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58530+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58531+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58532+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58533+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58534+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58535+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58536+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58537+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58538+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58539+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58540+2 0 0 0 0 0
58541+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58542+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58543+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58544+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58545+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58546+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58547+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58548+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58549+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58550+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58551+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58552+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58553+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58554+37 38 37 0 0 0
58555+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58556+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58557+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58558+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58559+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58560+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58561+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58562+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58563+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58564+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58565+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58566+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58567+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58568+85 115 134 4 0 0
58569+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58570+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58571+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58572+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58573+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58574+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58575+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58576+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58577+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58578+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58579+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58580+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58581+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58582+60 73 81 4 0 0
58583+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58584+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58585+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58586+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58587+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58588+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58589+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58590+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58591+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58592+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58593+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58594+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58595+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58596+16 19 21 4 0 0
58597+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58598+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58599+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58600+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58601+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58602+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58603+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58604+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58605+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58606+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58607+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58608+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58609+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58610+4 0 0 4 3 3
58611+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58612+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58613+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58615+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58616+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58617+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58618+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58619+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58620+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58621+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58622+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58623+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58624+3 2 2 4 4 4
58625+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58626+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58627+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58628+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58629+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58630+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58631+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58632+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58633+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58634+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58635+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58636+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58637+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58638+4 4 4 4 4 4
58639+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58640+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58641+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58642+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58643+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58644+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58645+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58646+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58647+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58648+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58649+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58650+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58651+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58652+4 4 4 4 4 4
58653+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58654+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58655+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58656+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58657+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58658+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58659+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58660+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58661+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58662+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58663+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58664+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58665+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58666+5 5 5 5 5 5
58667+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58668+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58669+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58670+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58671+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58672+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58673+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58674+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58675+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58676+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58677+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58678+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58679+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58680+5 5 5 4 4 4
58681+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58682+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58683+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58684+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58685+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58686+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58687+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58688+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58689+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58690+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58691+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58692+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58694+4 4 4 4 4 4
58695+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58696+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58697+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58698+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58699+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58700+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58701+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58702+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58703+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58704+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58705+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58706+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58708+4 4 4 4 4 4
58709+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58710+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58711+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58712+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58713+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58714+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58715+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58716+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58717+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58718+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58719+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58722+4 4 4 4 4 4
58723+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58724+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58725+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58726+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58727+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58728+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58729+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58730+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58731+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58732+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58733+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58736+4 4 4 4 4 4
58737+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58738+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58739+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58740+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58741+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58742+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58743+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58744+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58745+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58746+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58747+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58750+4 4 4 4 4 4
58751+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58752+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58753+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58754+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58755+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58756+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58757+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58758+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58759+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58760+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58761+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58764+4 4 4 4 4 4
58765+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58766+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58767+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58768+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58769+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58770+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58771+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58772+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58773+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58774+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58775+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58778+4 4 4 4 4 4
58779+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58780+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58781+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58782+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58783+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58784+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58785+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58786+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58787+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58788+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58789+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58792+4 4 4 4 4 4
58793+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58794+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58795+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58796+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58797+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58798+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58799+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58800+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58801+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58802+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58803+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58806+4 4 4 4 4 4
58807+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58808+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58809+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58810+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58811+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58812+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58813+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58814+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58815+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58816+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58817+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58820+4 4 4 4 4 4
58821+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58822+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58823+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58824+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58825+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58826+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58827+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58828+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58829+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58830+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58831+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58834+4 4 4 4 4 4
58835+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58836+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58837+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58838+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58839+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58840+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58841+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58842+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58843+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58844+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58845+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58848+4 4 4 4 4 4
58849+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58850+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58851+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58852+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58853+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58854+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58855+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58856+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58857+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58858+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58859+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58862+4 4 4 4 4 4
58863+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
58864+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
58865+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58866+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
58867+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
58868+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
58869+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
58870+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
58871+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58872+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58873+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58874+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58876+4 4 4 4 4 4
58877+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
58878+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
58879+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58880+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58881+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58882+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58883+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58884+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58885+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58886+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58887+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58888+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58890+4 4 4 4 4 4
58891+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58892+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
58893+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58894+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
58895+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
58896+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
58897+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
58898+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
58899+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58900+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58901+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58902+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58903+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58904+4 4 4 4 4 4
58905+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
58906+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
58907+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58908+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
58909+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
58910+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
58911+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
58912+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
58913+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
58914+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58915+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58916+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58917+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58918+4 4 4 4 4 4
58919+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58920+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
58921+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
58922+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
58923+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
58924+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
58925+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
58926+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
58927+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58928+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58929+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58930+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58931+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58932+4 4 4 4 4 4
58933+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58934+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
58935+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58936+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
58937+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
58938+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
58939+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
58940+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
58941+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58942+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58943+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58944+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58945+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58946+4 4 4 4 4 4
58947+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58948+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
58949+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
58950+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
58951+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
58952+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
58953+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58954+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
58955+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58956+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58957+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58958+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58960+4 4 4 4 4 4
58961+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58962+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
58963+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
58964+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58965+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
58966+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
58967+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58968+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
58969+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58970+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58971+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58974+4 4 4 4 4 4
58975+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58976+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
58977+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
58978+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
58979+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
58980+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
58981+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
58982+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
58983+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
58984+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58985+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58988+4 4 4 4 4 4
58989+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58990+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
58991+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
58992+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
58993+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
58994+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
58995+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
58996+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
58997+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
58998+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58999+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59002+4 4 4 4 4 4
59003+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59004+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59005+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59006+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59007+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59008+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59009+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59010+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59011+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59012+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59013+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59016+4 4 4 4 4 4
59017+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59018+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59019+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59020+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59021+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59022+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59023+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59024+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59025+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59026+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59027+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59030+4 4 4 4 4 4
59031+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59032+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59033+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59034+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59035+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59036+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59037+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59038+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59039+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59040+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59041+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59044+4 4 4 4 4 4
59045+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59046+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59047+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59048+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59049+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59050+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59051+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59052+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59053+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59054+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59055+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59056+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59057+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59058+4 4 4 4 4 4
59059+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59060+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59061+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59062+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59063+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59064+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59065+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59066+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59067+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59068+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59069+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59070+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59071+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59072+4 4 4 4 4 4
59073+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59074+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59075+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59076+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59077+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59078+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59079+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59080+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59081+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59082+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59083+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59085+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59086+4 4 4 4 4 4
59087+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59088+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59089+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59090+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59091+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59092+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59093+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59094+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59095+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59096+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59097+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59098+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59099+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59100+4 4 4 4 4 4
59101+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59102+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59103+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59104+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59105+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59106+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59107+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59108+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59109+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59110+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59111+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59112+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59113+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59114+4 4 4 4 4 4
59115+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59116+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59117+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59118+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59119+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59120+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59121+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59122+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59123+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59124+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59125+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59126+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59127+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59128+4 4 4 4 4 4
59129+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59130+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59131+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59132+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59133+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59134+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59135+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59136+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59137+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59138+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59139+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59140+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59141+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59142+4 4 4 4 4 4
59143+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59144+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59145+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59146+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59147+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59148+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59149+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59150+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59151+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59152+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59153+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59154+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59155+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59156+4 4 4 4 4 4
59157+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59158+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59159+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59160+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59161+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59162+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59163+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59164+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59165+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59166+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59167+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59168+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59170+4 4 4 4 4 4
59171+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59172+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59173+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59174+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59175+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59176+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59177+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59178+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59179+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59180+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59181+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59182+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59183+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59184+4 4 4 4 4 4
59185+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59186+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59187+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59188+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59189+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59190+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59191+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59192+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59193+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59194+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59195+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59196+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59197+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59198+4 4 4 4 4 4
59199+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59200+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59201+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59202+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59203+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59204+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59205+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59206+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59207+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59208+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59209+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59210+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59211+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59212+4 4 4 4 4 4
59213+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59214+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59215+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59216+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59217+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59218+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59219+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59220+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59221+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59222+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59223+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59224+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59225+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59226+4 4 4 4 4 4
59227+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59228+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59229+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59230+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59231+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59232+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59233+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59234+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59235+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59236+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59237+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59238+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59239+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59240+4 4 4 4 4 4
59241+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59242+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59243+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59244+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59245+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59246+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59247+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59248+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59249+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59250+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59251+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59252+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59253+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59254+4 4 4 4 4 4
59255+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59256+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59257+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59258+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59259+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59260+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59261+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59262+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59263+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59264+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59265+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59266+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59267+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59268+4 4 4 4 4 4
59269+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59270+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59271+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59272+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59273+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59274+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59275+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59276+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59277+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59278+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59279+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59280+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59282+4 4 4 4 4 4
59283+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59284+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59285+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59286+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59287+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59288+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59289+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59290+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59291+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59292+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59293+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59294+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59296+4 4 4 4 4 4
59297+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59298+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59299+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59300+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59301+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59302+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59303+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59304+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59306+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59307+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59308+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59310+4 4 4 4 4 4
59311+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59312+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59314+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59315+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59316+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59317+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59320+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59321+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59322+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59324+4 4 4 4 4 4
59325+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59329+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59330+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59331+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59334+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59335+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59336+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59338+4 4 4 4 4 4
59339+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59343+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59344+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59345+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59349+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59350+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59352+4 4 4 4 4 4
59353+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59357+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59358+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59359+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59364+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59366+4 4 4 4 4 4
59367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59371+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59372+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59380+4 4 4 4 4 4
59381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59385+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59386+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59394+4 4 4 4 4 4
59395diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59396index 3838795..0d48d61 100644
59397--- a/drivers/xen/events/events_base.c
59398+++ b/drivers/xen/events/events_base.c
59399@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59400 restore_pirqs();
59401 }
59402
59403-static struct irq_chip xen_dynamic_chip __read_mostly = {
59404+static struct irq_chip xen_dynamic_chip = {
59405 .name = "xen-dyn",
59406
59407 .irq_disable = disable_dynirq,
59408@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59409 .irq_retrigger = retrigger_dynirq,
59410 };
59411
59412-static struct irq_chip xen_pirq_chip __read_mostly = {
59413+static struct irq_chip xen_pirq_chip = {
59414 .name = "xen-pirq",
59415
59416 .irq_startup = startup_pirq,
59417@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59418 .irq_retrigger = retrigger_dynirq,
59419 };
59420
59421-static struct irq_chip xen_percpu_chip __read_mostly = {
59422+static struct irq_chip xen_percpu_chip = {
59423 .name = "xen-percpu",
59424
59425 .irq_disable = disable_dynirq,
59426diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59427index fef20db..d28b1ab 100644
59428--- a/drivers/xen/xenfs/xenstored.c
59429+++ b/drivers/xen/xenfs/xenstored.c
59430@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59431 static int xsd_kva_open(struct inode *inode, struct file *file)
59432 {
59433 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59434+#ifdef CONFIG_GRKERNSEC_HIDESYM
59435+ NULL);
59436+#else
59437 xen_store_interface);
59438+#endif
59439+
59440 if (!file->private_data)
59441 return -ENOMEM;
59442 return 0;
59443diff --git a/firmware/Makefile b/firmware/Makefile
59444index e297e1b..6900c31 100644
59445--- a/firmware/Makefile
59446+++ b/firmware/Makefile
59447@@ -35,6 +35,7 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59448 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59449 bnx2x/bnx2x-e2-6.2.9.0.fw
59450 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59451+ bnx2/bnx2-mips-09-6.2.1b.fw \
59452 bnx2/bnx2-rv2p-09-6.0.17.fw \
59453 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59454 bnx2/bnx2-mips-06-6.2.1.fw \
59455diff --git a/firmware/WHENCE b/firmware/WHENCE
59456index 0c4d96d..7563083 100644
59457--- a/firmware/WHENCE
59458+++ b/firmware/WHENCE
59459@@ -655,19 +655,20 @@ Driver: BNX2 - Broadcom NetXtremeII
59460 File: bnx2/bnx2-mips-06-6.2.1.fw
59461 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59462 File: bnx2/bnx2-mips-09-6.2.1a.fw
59463+File: bnx2/bnx2-mips-09-6.2.1b.fw
59464 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59465 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59466
59467 Licence:
59468-
59469- This file contains firmware data derived from proprietary unpublished
59470- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59471-
59472- Permission is hereby granted for the distribution of this firmware data
59473- in hexadecimal or equivalent format, provided this copyright notice is
59474- accompanying it.
59475-
59476-Found in hex form in kernel source.
59477+
59478+ This file contains firmware data derived from proprietary unpublished
59479+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59480+
59481+ Permission is hereby granted for the distribution of this firmware data
59482+ in hexadecimal or equivalent format, provided this copyright notice is
59483+ accompanying it.
59484+
59485+Found in hex form in kernel source.
59486
59487 --------------------------------------------------------------------------
59488
59489diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59490new file mode 100644
59491index 0000000..43d7c4f
59492--- /dev/null
59493+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59494@@ -0,0 +1,6496 @@
59495+:10000000080001180800000000005594000000C816
59496+:1000100000000000000000000000000008005594EF
59497+:10002000000000380000565C080000A00800000036
59498+:100030000000574400005694080059200000008436
59499+:100040000000ADD808005744000001C00000AE5CBD
59500+:100050000800321008000000000092580000B01C98
59501+:10006000000000000000000000000000080092589E
59502+:100070000000033C000142740800049008000400E2
59503+:10008000000012FC000145B000000000000000006C
59504+:1000900000000000080016FC00000004000158AC3D
59505+:1000A000080000A80800000000003D00000158B052
59506+:1000B00000000000000000000000000008003D00FB
59507+:1000C00000000030000195B00A000046000000006A
59508+:1000D000000000000000000D636F6D362E322E31DF
59509+:1000E00062000000060201020000000000000003A0
59510+:1000F000000000C800000032000000030000000003
59511+:1001000000000000000000000000000000000000EF
59512+:1001100000000010000001360000EA600000000549
59513+:1001200000000000000000000000000000000008C7
59514+:1001300000000000000000000000000000000000BF
59515+:1001400000000000000000000000000000000000AF
59516+:10015000000000000000000000000000000000009F
59517+:10016000000000020000000000000000000000008D
59518+:10017000000000000000000000000000000000007F
59519+:10018000000000000000000000000010000000005F
59520+:10019000000000000000000000000000000000005F
59521+:1001A000000000000000000000000000000000004F
59522+:1001B000000000000000000000000000000000003F
59523+:1001C000000000000000000000000000000000002F
59524+:1001D000000000000000000000000000000000001F
59525+:1001E0000000000010000003000000000000000DEF
59526+:1001F0000000000D3C020800244256083C030800A1
59527+:1002000024635754AC4000000043202B1480FFFDB2
59528+:10021000244200043C1D080037BD9FFC03A0F021D0
59529+:100220003C100800261001183C1C0800279C5608AA
59530+:100230000E000256000000000000000D27BDFFB4B4
59531+:10024000AFA10000AFA20004AFA30008AFA4000C50
59532+:10025000AFA50010AFA60014AFA70018AFA8001CF0
59533+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
59534+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
59535+:10028000AFB90040AFBC0044AFBF00480E001544FA
59536+:10029000000000008FBF00488FBC00448FB90040B1
59537+:1002A0008FB8003C8FAF00388FAE00348FAD003078
59538+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
59539+:1002C0008FA8001C8FA700188FA600148FA5001000
59540+:1002D0008FA4000C8FA300088FA200048FA1000040
59541+:1002E00027BD004C3C1B60108F7A5030377B502864
59542+:1002F00003400008AF7A00008F82002427BDFFE092
59543+:10030000AFB00010AFBF0018AFB100148C42000CAA
59544+:100310003C1080008E110100104000348FBF001887
59545+:100320000E000D84000000008F85002024047FFF54
59546+:100330000091202BACB100008E030104960201084D
59547+:1003400000031C003042FFFF00621825ACA300042C
59548+:100350009202010A96030114304200FF3063FFFF4E
59549+:100360000002140000431025ACA200089603010C03
59550+:100370009602010E00031C003042FFFF00621825A8
59551+:10038000ACA3000C960301109602011200031C009E
59552+:100390003042FFFF00621825ACA300108E02011846
59553+:1003A000ACA200148E02011CACA20018148000083C
59554+:1003B0008F820024978200003C0420050044182509
59555+:1003C00024420001ACA3001C0A0000C6A782000062
59556+:1003D0003C0340189442001E00431025ACA2001CB0
59557+:1003E0000E000DB8240400018FBF00188FB1001457
59558+:1003F0008FB000100000102103E0000827BD00208E
59559+:100400003C0780008CE202B834E50100044100089A
59560+:10041000240300013C0208008C42006024420001D9
59561+:100420003C010800AC22006003E0000800601021DD
59562+:100430003C0208008C42005C8CA4002094A30016AF
59563+:100440008CA6000494A5000E24420001ACE40280B6
59564+:100450002463FFFC3C010800AC22005C3C0210005D
59565+:10046000A4E30284A4E5028600001821ACE6028819
59566+:10047000ACE202B803E000080060102127BDFFE0F5
59567+:100480003C028000AFB0001034420100AFBF001C3E
59568+:10049000AFB20018AFB100148C43000094450008BF
59569+:1004A0002462FE002C42038110400003000381C23D
59570+:1004B0000A00010226100004240201001462000553
59571+:1004C0003C1180003C02800890420004305000FF44
59572+:1004D0003C11800036320100964300143202000FB6
59573+:1004E00000021500004310253C0308008C63004403
59574+:1004F00030A40004AE220080246300013C01080007
59575+:10050000AC2300441080000730A200028FBF001C03
59576+:100510008FB200188FB100148FB000100A0000CE07
59577+:1005200027BD00201040002D0000182130A20080BF
59578+:1005300010400005362200708E44001C0E000C672F
59579+:10054000240500A0362200708C4400008F82000C2D
59580+:10055000008210232C43012C10600004AF82001095
59581+:10056000240300010A000145AF84000C8E42000400
59582+:100570003C036020AF84000CAC6200143C02080015
59583+:100580008C42005850400015000018218C62000475
59584+:10059000240301FE304203FF144300100000182121
59585+:1005A0002E020004104000032E0200080A00014041
59586+:1005B0000000802114400003000000000A000140F8
59587+:1005C0002610FFF90000000D2402000202021004B0
59588+:1005D0003C036000AC626914000018218FBF001C4E
59589+:1005E0008FB200188FB100148FB00010006010217E
59590+:1005F00003E0000827BD00203C0480008C8301003C
59591+:1006000024020100506200033C0280080000000D3B
59592+:100610003C02800890430004000010213063000F6A
59593+:1006200000031D0003E00008AC8300800004188074
59594+:100630002782FF9C00621821000410C00044102390
59595+:100640008C640000000210C03C030800246356E4E0
59596+:10065000004310213C038000AC64009003E00008DC
59597+:10066000AF8200243C0208008C42011410400019A3
59598+:100670003084400030A2007F000231C03C02020002
59599+:100680001080001400A218253C026020AC43001426
59600+:100690003C0408008C8456B83C0308008C630110AD
59601+:1006A0003C02800024050900AC4500200086202182
59602+:1006B000246300013C028008AC4400643C01080053
59603+:1006C000AC2301103C010800AC2456B803E000083C
59604+:1006D000000000003C02602003E00008AC4500146C
59605+:1006E00003E000080000102103E0000800001021D2
59606+:1006F00030A2000810400008240201003C0208005B
59607+:100700008C42010C244200013C010800AC22010C87
59608+:1007100003E0000800000000148200080000000050
59609+:100720003C0208008C4200FC244200013C0108000D
59610+:10073000AC2200FC0A0001A330A200203C02080009
59611+:100740008C420084244200013C010800AC22008459
59612+:1007500030A200201040000830A200103C02080027
59613+:100760008C420108244200013C010800AC2201082F
59614+:1007700003E0000800000000104000080000000036
59615+:100780003C0208008C420104244200013C010800A4
59616+:10079000AC22010403E00008000000003C02080055
59617+:1007A0008C420100244200013C010800AC220100FF
59618+:1007B00003E000080000000027BDFFE0AFB1001417
59619+:1007C0003C118000AFB20018AFBF001CAFB00010EA
59620+:1007D0003632010096500008320200041040000733
59621+:1007E000320300028FBF001C8FB200188FB10014BB
59622+:1007F0008FB000100A0000CE27BD00201060000B53
59623+:10080000020028218E2401000E00018A0000000051
59624+:100810003202008010400003240500A10E000C6786
59625+:100820008E44001C0A0001E3240200018E2301040F
59626+:100830008F82000810430006020028218E24010048
59627+:100840000E00018A000000008E220104AF82000821
59628+:10085000000010218FBF001C8FB200188FB1001450
59629+:100860008FB0001003E0000827BD00202C82000498
59630+:1008700014400002000018212483FFFD240200021E
59631+:10088000006210043C03600003E00008AC626914DD
59632+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
59633+:1008A000AFB000103C048000948201083043700017
59634+:1008B000240220001062000A2862200154400052E5
59635+:1008C0008FBF001C24024000106200482402600018
59636+:1008D0001062004A8FBF001C0A0002518FB200183C
59637+:1008E00034820100904300098C5000189451000C90
59638+:1008F000240200091062001C0000902128620009F7
59639+:10090000144000218F8200242402000A5062001249
59640+:10091000323100FF2402000B1062000F00000000C3
59641+:100920002402000C146200188F8200243C0208008C
59642+:100930008C4256B824030900AC83002000501021DB
59643+:100940003C038008AC6200643C010800AC2256B84D
59644+:100950000A0002508FBF001C0E0001E900102602A1
59645+:100960000A0002308F8200240E0001E900102602E6
59646+:100970003C0380089462001A8C72000C3042FFFF26
59647+:10098000020280258F8200248C42000C5040001E01
59648+:100990008FBF001C0E000D84000000003C02800090
59649+:1009A00034420100944300088F82002400031C009D
59650+:1009B0009444001E8F82002000641825AC50000073
59651+:1009C00024040001AC510004AC520008AC40000CFF
59652+:1009D000AC400010AC400014AC4000180E000DB844
59653+:1009E000AC43001C0A0002508FBF001C0E000440E4
59654+:1009F000000000000A0002508FBF001C0E000C9F78
59655+:100A0000000000008FBF001C8FB200188FB10014CF
59656+:100A10008FB000100000102103E0000827BD002067
59657+:100A200027BDFFD8AFB400203C036010AFBF002447
59658+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
59659+:100A40008C6450002402FF7F3C1408002694563822
59660+:100A5000008220243484380CAC6450003C028000B6
59661+:100A6000240300370E0014B0AC4300083C07080014
59662+:100A700024E70618028010212404001D2484FFFFAF
59663+:100A8000AC4700000481FFFD244200043C02080042
59664+:100A9000244207C83C010800AC2256403C02080032
59665+:100AA000244202303C030800246306203C04080072
59666+:100AB000248403B43C05080024A506F03C06080085
59667+:100AC00024C62C9C3C010800AC2256803C02080045
59668+:100AD000244205303C010800AC2756843C01080044
59669+:100AE000AC2656943C010800AC23569C3C010800FF
59670+:100AF000AC2456A03C010800AC2556A43C010800DB
59671+:100B0000AC2256A83C010800AC23563C3C0108002E
59672+:100B1000AC2456443C010800AC2056603C0108005F
59673+:100B2000AC2556643C010800AC2056703C0108001E
59674+:100B3000AC27567C3C010800AC2656903C010800CE
59675+:100B4000AC2356980E00056E00000000AF80000C2C
59676+:100B50003C0280008C5300008F8300043C0208009C
59677+:100B60008C420020106200213262000700008821C0
59678+:100B70002792FF9C3C100800261056E43C02080017
59679+:100B80008C42002024050001022518040043202483
59680+:100B90008F820004004310245044000C26310001D1
59681+:100BA00010800008AF9000248E4300003C028000BB
59682+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
59683+:100BC00026310001AE00000C263100012E22000269
59684+:100BD000261000381440FFE9265200043C020800A9
59685+:100BE0008C420020AF820004326200071040FFD91F
59686+:100BF0003C028000326200011040002D326200028F
59687+:100C00003C0580008CA2010000002021ACA2002045
59688+:100C10008CA301042C42078110400008ACA300A85B
59689+:100C200094A2010824032000304270001443000302
59690+:100C30003C02800890420005304400FF0E0001593C
59691+:100C4000000000003C0280009042010B304300FF96
59692+:100C50002C62001E54400004000310800E00018628
59693+:100C60000A0002EC00000000005410218C42000039
59694+:100C70000040F80900000000104000043C02800021
59695+:100C80008C4301043C026020AC4300143C02080089
59696+:100C90008C4200343C0440003C03800024420001AC
59697+:100CA000AC6401383C010800AC220034326200021E
59698+:100CB00010400010326200043C1080008E0201409F
59699+:100CC000000020210E000159AE0200200E00038317
59700+:100CD000000000003C024000AE0201783C02080027
59701+:100CE0008C420038244200013C010800AC2200384C
59702+:100CF000326200041040FF973C0280003C108000EC
59703+:100D00008E020180000020210E000159AE02002059
59704+:100D10008E03018024020F00546200073C02800809
59705+:100D20008E0201883C0300E03042FFFF00431025A3
59706+:100D30000A000328AE020080344200809042000086
59707+:100D400024030050304200FF14430007000000005D
59708+:100D50000E000362000000001440000300000000C9
59709+:100D60000E000971000000003C0208008C42003CAB
59710+:100D70003C0440003C03800024420001AC6401B804
59711+:100D80003C010800AC22003C0A0002A33C028000A7
59712+:100D90003C02900034420001008220253C02800089
59713+:100DA000AC4400203C0380008C6200200440FFFE25
59714+:100DB0000000000003E00008000000003C0280008A
59715+:100DC000344300010083202503E00008AC440020E8
59716+:100DD00027BDFFE0AFB10014AFB000100080882144
59717+:100DE000AFBF00180E00033230B000FF8F83FF94B6
59718+:100DF000022020219062002502028025A07000259B
59719+:100E00008C7000183C0280000E00033D020280241A
59720+:100E10001600000B8FBF00183C0480008C8201F884
59721+:100E20000440FFFE348201C024030002AC510000E4
59722+:100E3000A04300043C021000AC8201F88FBF0018F0
59723+:100E40008FB100148FB0001003E0000827BD002010
59724+:100E500027BDFFE83C028000AFBF00103442018094
59725+:100E6000944300048C4400083063020010600005C5
59726+:100E7000000028210E00100C000000000A0003787A
59727+:100E8000240500013C02FF000480000700821824B2
59728+:100E90003C02040014620004240500018F82FF94C8
59729+:100EA00090420008240500018FBF001000A010210F
59730+:100EB00003E0000827BD00188F82FF982405000179
59731+:100EC000A040001A3C028000344201400A00034264
59732+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
59733+:100EE000AFB20018AFB10014AFB0001090A2000074
59734+:100EF000304400FF38830020388200300003182B74
59735+:100F00000002102B0062182410600003240200501D
59736+:100F1000148200A88FBF001C90A20005304200017F
59737+:100F2000104000A48FBF001C3C02800034420140EE
59738+:100F3000904200082443FFFF2C6200051040009EF1
59739+:100F40008FB20018000310803C030800246355ACE6
59740+:100F5000004310218C420000004000080000000007
59741+:100F60003C028000345101400E0003328E24000008
59742+:100F70008F92FF948E2200048E50000C1602000205
59743+:100F800024020001AE42000C0E00033D8E2400003E
59744+:100F90008E220004145000068FBF001C8FB2001870
59745+:100FA0008FB100148FB000100A000F7827BD002009
59746+:100FB0008E42000C0A000419000000003C0480006E
59747+:100FC0003482014094A300108C4200043063FFFF80
59748+:100FD0001443001C0000000024020001A4A2001021
59749+:100FE0008C8202380441000F3C0380003C02003F29
59750+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
59751+:1010000000461824004810240002130200031D8229
59752+:10101000106200583C0280008C8202380440FFF7C6
59753+:101020003C038000346201408C44000034620200C2
59754+:10103000AC4400003C021000AC6202380A00043BE1
59755+:101040008FBF001C94A200100A00041900000000C9
59756+:10105000240200201482000F3C0280003C03800028
59757+:1010600094A20012346301408C6300043042FFFFFD
59758+:10107000146200050000000024020001A4A2001276
59759+:101080000A0004028FBF001C94A200120A00041977
59760+:1010900000000000345101400E0003328E24000095
59761+:1010A0008F92FF948E230004964200123050FFFF6F
59762+:1010B0001603000224020001A64200120E00033DA6
59763+:1010C0008E2400008E220004160200068FBF001C32
59764+:1010D0008FB200188FB100148FB000100A00037C8B
59765+:1010E00027BD0020964200120A00041900000000EB
59766+:1010F0003C03800094A20014346301408C6300041C
59767+:101100003042FFFF14620008240200018FBF001C60
59768+:101110008FB200188FB100148FB00010A4A2001479
59769+:101120000A00146327BD002094A20014144000217B
59770+:101130008FBF001C0A000435000000003C03800043
59771+:1011400094A20016346301408C6300043042FFFF18
59772+:101150001462000D240200018FBF001C8FB2001822
59773+:101160008FB100148FB00010A4A200160A000B1457
59774+:1011700027BD00209442007824420004A4A200105D
59775+:101180000A00043B8FBF001C94A200162403000138
59776+:101190003042FFFF144300078FBF001C3C020800D1
59777+:1011A0008C420070244200013C010800AC22007017
59778+:1011B0008FBF001C8FB200188FB100148FB00010C9
59779+:1011C00003E0000827BD002027BDFFD8AFB20018FC
59780+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
59781+:1011E000AFB000103C028000345101008C5001006F
59782+:1011F0009242000092230009304400FF2402001FA5
59783+:10120000106200AB28620020104000192402003850
59784+:101210002862000A1040000D2402000B286200081A
59785+:101220001040002E8F820024046001042862000216
59786+:101230001440002A8F820024240200061062002637
59787+:101240008FBF00200A00055F8FB3001C1062006092
59788+:101250002862000B144000FA8FBF00202402000E09
59789+:10126000106200788F8200240A00055F8FB3001C93
59790+:10127000106200D2286200391040000A2402008067
59791+:1012800024020036106200E528620037104000C3D7
59792+:1012900024020035106200D98FBF00200A00055FCC
59793+:1012A0008FB3001C1062002D2862008110400006E0
59794+:1012B000240200C824020039106200C98FBF002038
59795+:1012C0000A00055F8FB3001C106200A28FBF0020D0
59796+:1012D0000A00055F8FB3001C8F8200248C42000C33
59797+:1012E000104000D78FBF00200E000D8400000000CA
59798+:1012F0003C038000346301008C6200008F85002075
59799+:10130000946700089466000CACA200008C64000492
59800+:101310008F82002400063400ACA400049448001E10
59801+:101320008C62001800073C0000E83825ACA20008D9
59802+:101330008C62001C24040001ACA2000C9062000A24
59803+:1013400000C23025ACA60010ACA00014ACA0001860
59804+:10135000ACA7001C0A00051D8FBF00208F8200244F
59805+:101360008C42000C104000B68FBF00200E000D8490
59806+:10137000000000008F820024962400089625000CAF
59807+:101380009443001E000422029626000E8F82002045
59808+:10139000000426000083202500052C003C0300806B
59809+:1013A00000A6282500832025AC400000AC400004A6
59810+:1013B000AC400008AC40000CAC450010AC40001440
59811+:1013C000AC400018AC44001C0A00051C24040001B9
59812+:1013D0009622000C14400018000000009242000504
59813+:1013E0003042001014400014000000000E000332D0
59814+:1013F0000200202192420005020020213442001008
59815+:101400000E00033DA242000592420000240300208A
59816+:10141000304200FF10430089020020218FBF0020CE
59817+:101420008FB3001C8FB200188FB100148FB0001062
59818+:101430000A00107527BD00280000000D0A00055E97
59819+:101440008FBF00208C42000C1040007D8FBF002019
59820+:101450000E000D84000000008E2200048F84002006
59821+:101460009623000CAC8200003C0280089445002CBE
59822+:101470008F82002400031C0030A5FFFF9446001E4D
59823+:101480003C02400E0065182500C23025AC830004E4
59824+:10149000AC800008AC80000CAC800010AC80001464
59825+:1014A000AC800018AC86001C0A00051C2404000156
59826+:1014B0000E000332020020218F93FF9802002021AA
59827+:1014C0000E00033DA660000C020020210E00034226
59828+:1014D000240500018F8200248C42000C104000582B
59829+:1014E0008FBF00200E000D84000000009622000C2B
59830+:1014F0008F83002000021400AC700000AC62000476
59831+:10150000AC6000088E4400388F820024AC64000C6C
59832+:101510008E46003C9445001E3C02401FAC66001005
59833+:1015200000A228258E62000424040001AC6200148D
59834+:10153000AC600018AC65001C8FBF00208FB3001C8E
59835+:101540008FB200188FB100148FB000100A000DB8D0
59836+:1015500027BD0028240200201082003A8FB3001C0F
59837+:101560000E000F5E00000000104000358FBF00200D
59838+:101570003C0480008C8201F80440FFFE348201C0EC
59839+:1015800024030002AC500000A04300043C02100001
59840+:10159000AC8201F80A00055E8FBF00200200202106
59841+:1015A0008FBF00208FB3001C8FB200188FB10014C2
59842+:1015B0008FB000100A000EA727BD00289625000C4A
59843+:1015C000020020218FBF00208FB3001C8FB20018B3
59844+:1015D0008FB100148FB000100A000ECC27BD002878
59845+:1015E000020020218FB3001C8FB200188FB10014AD
59846+:1015F0008FB000100A000EF727BD00289225000DBD
59847+:10160000020020218FB3001C8FB200188FB100148C
59848+:101610008FB000100A000F4827BD002802002021CB
59849+:101620008FBF00208FB3001C8FB200188FB1001441
59850+:101630008FB000100A000F1F27BD00288FBF0020A9
59851+:101640008FB3001C8FB200188FB100148FB0001040
59852+:1016500003E0000827BD00283C0580008CA202782A
59853+:101660000440FFFE34A2024024030002AC44000008
59854+:10167000A04300043C02100003E00008ACA2027882
59855+:10168000A380001803E00008A38000193C03800039
59856+:101690008C6202780440FFFE8F82001CAC62024024
59857+:1016A00024020002A06202443C02100003E0000891
59858+:1016B000AC6202783C02600003E000088C425404F3
59859+:1016C0009083003024020005008040213063003FF9
59860+:1016D0000000482114620005000050219082004C57
59861+:1016E0009483004E304900FF306AFFFFAD00000CCC
59862+:1016F000AD000010AD000024950200148D05001C03
59863+:101700008D0400183042FFFF004910230002110031
59864+:10171000000237C3004038210086202300A2102B8E
59865+:101720000082202300A72823AD05001CAD0400186B
59866+:10173000A5090014A5090020A50A001603E0000869
59867+:10174000A50A002203E000080000000027BDFFD822
59868+:10175000AFB200183C128008AFB40020AFB3001C39
59869+:10176000AFB10014AFBF0024AFB00010365101007C
59870+:101770003C0260008C4254049222000C3C1408008D
59871+:10178000929400F7304300FF2402000110620032FF
59872+:101790000080982124020002146200353650008037
59873+:1017A0000E00143D000000009202004C2403FF8054
59874+:1017B0003C0480003042007F000211C024420240FD
59875+:1017C0000262102100431824AC8300949245000863
59876+:1017D0009204004C3042007F3C03800614850007D1
59877+:1017E000004380212402FFFFA22200112402FFFFF8
59878+:1017F000A62200120A0005D22402FFFF9602002052
59879+:10180000A222001196020022A62200128E020024BB
59880+:101810003C048008AE2200143485008090A2004C65
59881+:1018200034830100A06200108CA2003CAC6200185E
59882+:101830008C820068AC6200F48C820064AC6200F0C0
59883+:101840008C82006CAC6200F824020001A0A2006847
59884+:101850000A0005EE3C0480080E001456000000004B
59885+:1018600036420080A04000680A0005EE3C04800873
59886+:10187000A2000068A20000690A0006293C02800854
59887+:10188000348300808C62003834850100AC62006CC7
59888+:1018900024020001A062006990A200D59083000894
59889+:1018A000305100FF3072007F12320019001111C058
59890+:1018B00024420240026210212403FF8000431824C6
59891+:1018C0003C048000AC8300943042007F3C038006DF
59892+:1018D000004380218E02000C1040000D02002021E8
59893+:1018E0000E00057E0000000026220001305100FF9E
59894+:1018F0009203003C023410260002102B0002102339
59895+:101900003063007F022288240A0005F8A203003C0D
59896+:101910003C088008350401008C8200E03507008017
59897+:10192000ACE2003C8C8200E0AD02000090E5004C8F
59898+:10193000908600D590E3004C908400D52402FF806F
59899+:1019400000A228243063007F308400FF00A62825F1
59900+:101950000064182A1060000230A500FF38A500803E
59901+:10196000A0E5004CA10500093C0280089043000E50
59902+:10197000344400803C058000A043000A8C8300189A
59903+:101980003C027FFF3442FFFF00621824AC83001842
59904+:101990008CA201F80440FFFE00000000ACB301C0BF
59905+:1019A0008FBF00248FB400208FB3001C8FB20018AB
59906+:1019B0008FB100148FB0001024020002A0A201C455
59907+:1019C00027BD00283C02100003E00008ACA201F88B
59908+:1019D00090A2000024420001A0A200003C030800E5
59909+:1019E0008C6300F4304200FF144300020080302179
59910+:1019F000A0A0000090A200008F84001C000211C073
59911+:101A00002442024024830040008220212402FF80DF
59912+:101A1000008220243063007F3C02800A006218218B
59913+:101A20003C028000AC44002403E00008ACC300008A
59914+:101A300094820006908300058C85000C8C86001033
59915+:101A40008C8700188C88001C8C8400203C010800C6
59916+:101A5000A42256C63C010800A02356C53C0108003C
59917+:101A6000AC2556CC3C010800AC2656D03C01080001
59918+:101A7000AC2756D83C010800AC2856DC3C010800D5
59919+:101A8000AC2456E003E00008000000003C0280089F
59920+:101A9000344201008C4400343C038000346504006F
59921+:101AA000AC6400388C420038AF850028AC62003C42
59922+:101AB0003C020005AC6200300000000000000000A5
59923+:101AC00003E00008000000003C020006308400FF34
59924+:101AD000008220253C028000AC4400300000000061
59925+:101AE00000000000000000003C0380008C62000049
59926+:101AF000304200101040FFFD3462040003E0000893
59927+:101B0000AF82002894C200003C080800950800CA73
59928+:101B100030E7FFFF0080482101021021A4C200002D
59929+:101B200094C200003042FFFF00E2102B544000013D
59930+:101B3000A4C7000094A200003C0308008C6300CC02
59931+:101B400024420001A4A2000094A200003042FFFF42
59932+:101B5000144300073C0280080107102BA4A00000DA
59933+:101B60005440000101003821A4C700003C02800855
59934+:101B7000344601008CC3002894A200003C0480007D
59935+:101B80003042FFFE000210C000621021AC82003C17
59936+:101B90008C82003C006218231860000400000000E2
59937+:101BA0008CC200240A0006BA244200018CC2002420
59938+:101BB000AC8200383C020050344200103C038000EC
59939+:101BC000AC620030000000000000000000000000D7
59940+:101BD0008C620000304200201040FFFD0000000039
59941+:101BE00094A200003C04800030420001000210C0BA
59942+:101BF000004410218C430400AD2300008C420404F7
59943+:101C0000AD2200043C02002003E00008AC8200305A
59944+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
59945+:101C2000AFBF001C94C2000000C080213C1208001D
59946+:101C3000965200C624420001A6020000960300004E
59947+:101C400094E2000000E03021144300058FB1003021
59948+:101C50000E00068F024038210A0006F10000000045
59949+:101C60008C8300048C82000424420040046100073D
59950+:101C7000AC8200048C8200040440000400000000D8
59951+:101C80008C82000024420001AC8200009602000019
59952+:101C90003042FFFF50520001A600000096220000D3
59953+:101CA00024420001A62200003C02800834420100C8
59954+:101CB000962300009442003C144300048FBF001C94
59955+:101CC00024020001A62200008FBF001C8FB2001862
59956+:101CD0008FB100148FB0001003E0000827BD002072
59957+:101CE00027BDFFE03C028008AFBF0018344201006E
59958+:101CF0008C4800343C03800034690400AC68003830
59959+:101D00008C42003830E700FFAF890028AC62003C0D
59960+:101D10003C020005AC620030000000000000000042
59961+:101D200000000000000000000000000000000000B3
59962+:101D30008C82000C8C82000C97830016AD22000070
59963+:101D40008C82001000604021AD2200048C820018BB
59964+:101D5000AD2200088C82001CAD22000C8CA2001465
59965+:101D6000AD2200108C820020AD220014908200056C
59966+:101D7000304200FF00021200AD2200188CA20018B1
59967+:101D8000AD22001C8CA2000CAD2200208CA2001001
59968+:101D9000AD2200248CA2001CAD2200288CA20020C1
59969+:101DA000AD22002C3402FFFFAD260030AD20003400
59970+:101DB000506200013408FFFFAD28003850E00011E8
59971+:101DC0003C0280083C048008348401009482005066
59972+:101DD0003042FFFFAD22003C9483004494850044D0
59973+:101DE000240200013063FFFF000318C200641821C1
59974+:101DF0009064006430A5000700A210040A00075C8C
59975+:101E00000044102534420100AD20003C94430044BE
59976+:101E1000944400443063FFFF000318C2006218219D
59977+:101E200030840007906500642402000100821004E1
59978+:101E30000002102700451024A0620064000000008A
59979+:101E400000000000000000003C0200063442004098
59980+:101E50003C038000AC620030000000000000000085
59981+:101E6000000000008C620000304200101040FFFDB6
59982+:101E70003C06800834C201503463040034C7014A70
59983+:101E800034C4013434C5014034C60144AFA200104B
59984+:101E90000E0006D2AF8300288FBF001803E00008B1
59985+:101EA00027BD00208F8300143C0608008CC600E884
59986+:101EB0008F82001C30633FFF000319800046102111
59987+:101EC000004310212403FF80004318243C068000B7
59988+:101ED000ACC300283042007F3C03800C004330211B
59989+:101EE00090C2000D30A500FF0000382134420010E0
59990+:101EF000A0C2000D8F8900143C028008344201000A
59991+:101F00009443004400091382304800032402000176
59992+:101F1000A4C3000E1102000B2902000210400005AC
59993+:101F2000240200021100000C240300010A0007A48F
59994+:101F30000000182111020006000000000A0007A49A
59995+:101F4000000018218CC2002C0A0007A424430001C1
59996+:101F50008CC20014244300018CC200180043102BD3
59997+:101F60005040000A240700012402002714A20003A5
59998+:101F70003C0380080A0007B1240700013463010014
59999+:101F80009462004C24420001A462004C00091382B8
60000+:101F9000304300032C620002104000090080282119
60001+:101FA000146000040000000094C200340A0007C15D
60002+:101FB0003046FFFF8CC600380A0007C10080282188
60003+:101FC000000030213C040800248456C00A000706A3
60004+:101FD0000000000027BDFF90AFB60068AFB50064F9
60005+:101FE000AFB40060AFB3005CAFB20058AFB1005403
60006+:101FF000AFBF006CAFB000508C9000000080B021EB
60007+:102000003C0208008C4200E8960400328F83001CDA
60008+:102010002414FF8030843FFF0062182100042180D7
60009+:1020200000641821007410243C13800000A090214B
60010+:1020300090A50000AE620028920400323C02800CA1
60011+:102040003063007F00628821308400C02402004099
60012+:10205000148200320000A8218E3500388E2200182C
60013+:102060001440000224020001AE2200189202003C3B
60014+:10207000304200201440000E8F83001C000511C068
60015+:102080002442024000621821306400783C02008043
60016+:102090000082202500741824AE630800AE64081086
60017+:1020A0008E2200188E03000800431021AE22001873
60018+:1020B0008E22002C8E230018244200010062182B6F
60019+:1020C0001060004300000000924200002442000122
60020+:1020D000A24200003C0308008C6300F4304200FF81
60021+:1020E00050430001A2400000924200008F84001C77
60022+:1020F000000211C024420240248300403063007F6C
60023+:10210000008220213C02800A0094202400621821D1
60024+:10211000AE6400240A0008D2AEC30000920300326D
60025+:102120002402FFC000431024304200FF1440000589
60026+:1021300024020001AE220018962200340A00084250
60027+:102140003055FFFF8E22001424420001AE220018F9
60028+:102150009202003000021600000216030441001C27
60029+:10216000000000009602003227A400100080282101
60030+:10217000A7A20016960200320000302124070001B9
60031+:102180003042FFFFAF8200140E000706AFA0001C14
60032+:10219000960200328F83001C3C0408008C8400E807
60033+:1021A00030423FFF000211800064182100621821B4
60034+:1021B00000741024AE62002C3063007F3C02800E5D
60035+:1021C000006218219062000D3042007FA062000D75
60036+:1021D0009222000D304200105040007892420000E0
60037+:1021E0003C028008344401009482004C8EC30000FD
60038+:1021F0003C130800967300C62442FFFFA482004CE3
60039+:10220000946200329623000E3054FFFF3070FFFFBF
60040+:102210003C0308008C6300D000701807A7A30038A7
60041+:102220009482003E3063FFFF3042FFFF14620007DC
60042+:10223000000000008C8200303C038000244200300B
60043+:10224000AC62003C0A00086A8C82002C9482004038
60044+:102250003042FFFF5462000927A400408C820038FE
60045+:102260003C03800024420030AC62003C8C8200348D
60046+:10227000AC6200380A0008793C03800027A50038CA
60047+:1022800027A60048026038210E00068FA7A000484C
60048+:102290008FA300403C02800024630030AC43003830
60049+:1022A0008FA30044AC43003C3C0380003C0200058B
60050+:1022B000AC6200303C028008344401009482004249
60051+:1022C000346304003042FFFF0202102B1440000769
60052+:1022D000AF8300289482004E9483004202021021B2
60053+:1022E000004310230A00088F3043FFFF9483004E01
60054+:1022F00094820042026318210050102300621823C8
60055+:102300003063FFFF3C028008344401009482003CAB
60056+:102310003042FFFF14430003000000000A00089F42
60057+:10232000240300019482003C3042FFFF0062102B26
60058+:10233000144000058F8200289482003C0062102324
60059+:102340003043FFFF8F820028AC550000AC400004F2
60060+:10235000AC540008AC43000C3C02000634420010B0
60061+:102360003C038000AC620030000000000000000070
60062+:10237000000000008C620000304200101040FFFDA1
60063+:102380003C04800834840100001018C20064182145
60064+:102390009065006432020007240600010046100424
60065+:1023A00000451025A0620064948300429622000E2E
60066+:1023B00050430001A386001892420000244200010D
60067+:1023C000A24200003C0308008C6300F4304200FF8E
60068+:1023D00050430001A2400000924200008F84001C84
60069+:1023E000000211C0244202402483004000822021C8
60070+:1023F0002402FF80008220243063007F3C02800A98
60071+:10240000006218213C028000AC440024AEC30000EE
60072+:102410008FBF006C8FB600688FB500648FB400600A
60073+:102420008FB3005C8FB200588FB100548FB0005052
60074+:1024300003E0000827BD007027BDFFD8AFB3001C24
60075+:10244000AFB20018AFB10014AFB00010AFBF0020A2
60076+:102450000080982100E0802130B1FFFF0E000D8444
60077+:1024600030D200FF0000000000000000000000006B
60078+:102470008F8200208F830024AC510000AC520004F6
60079+:10248000AC530008AC40000CAC400010AC40001451
60080+:10249000AC4000189463001E02038025AC50001C61
60081+:1024A0000000000000000000000000002404000103
60082+:1024B0008FBF00208FB3001C8FB200188FB10014A3
60083+:1024C0008FB000100A000DB827BD002830A5FFFF0F
60084+:1024D0000A0008DC30C600FF3C02800834430100DB
60085+:1024E0009462000E3C080800950800C63046FFFFC5
60086+:1024F00014C000043402FFFF946500EA0A000929B1
60087+:102500008F84001C10C20027000000009462004E5F
60088+:102510009464003C3045FFFF00A6102300A6182B52
60089+:102520003087FFFF106000043044FFFF00C5102318
60090+:1025300000E210233044FFFF0088102B1040000EF3
60091+:1025400000E810233C028008344401002403000109
60092+:1025500034420080A44300162402FFFFA482000E30
60093+:10256000948500EA8F84001C0000302130A5FFFF15
60094+:102570000A0009013C0760200044102A10400009AD
60095+:102580003C0280083443008094620016304200010F
60096+:10259000104000043C0280009442007E244200145B
60097+:1025A000A462001603E000080000000027BDFFE061
60098+:1025B0003C028008AFBF001CAFB0001834420100DD
60099+:1025C000944300429442004C104000193068FFFFD1
60100+:1025D0009383001824020001146200298FBF001C9D
60101+:1025E0003C06800834D00100000810C200501021C1
60102+:1025F000904200643103000734C70148304200FFB5
60103+:10260000006210073042000134C9014E34C4012C6D
60104+:1026100034C5013E1040001634C601420E0006D2F9
60105+:10262000AFA90010960200420A0009463048FFFF99
60106+:102630003C028008344401009483004494820042A8
60107+:102640001043000F8FBF001C94820044A4820042FC
60108+:1026500094820050A482004E8C820038AC820030FC
60109+:1026600094820040A482003E9482004AA4820048E2
60110+:102670008FBF001C8FB000180A00090427BD00207E
60111+:102680008FB0001803E0000827BD002027BDFFA081
60112+:10269000AFB1004C3C118000AFBF0058AFB3005445
60113+:1026A000AFB20050AFB000483626018890C2000398
60114+:1026B0003044007FA3A400108E32018090C200003D
60115+:1026C0003043007F240200031062003BAF92001CE5
60116+:1026D00028620004104000062402000424020002C4
60117+:1026E000106200098FBF00580A000B0F8FB300540F
60118+:1026F0001062004D240200051062014E8FBF005889
60119+:102700000A000B0F8FB30054000411C002421021C5
60120+:102710002404FF8024420240004410242643004049
60121+:10272000AE2200243063007F3C02800A0062182140
60122+:102730009062003CAFA3003C00441025A062003C26
60123+:102740008FA3003C9062003C304200401040016C7E
60124+:102750008FBF00583C108008A3800018361001007D
60125+:102760008E0200E08C63003427A4003C27A50010F3
60126+:10277000004310210E0007C3AE0200E093A2001038
60127+:102780003C038000A20200D58C6202780440FFFE68
60128+:102790008F82001CAC62024024020002A06202444C
60129+:1027A0003C021000AC6202780E0009390000000003
60130+:1027B0000A000B0E8FBF00583C05800890C3000133
60131+:1027C00090A2000B1443014E8FBF005834A4008028
60132+:1027D0008C8200189082004C90A200083C0260009D
60133+:1027E0008C4254048C8300183C027FFF3442FFFF6C
60134+:1027F000006218243C0208008C4200B4AC8300182C
60135+:102800003C038000244200013C010800AC2200B4DB
60136+:102810008C6201F80440FFFE8F82001CAC6201C094
60137+:102820000A000AD6240200023C10800890C300016E
60138+:102830009202000B144301328FBF005827A40018E6
60139+:1028400036050110240600033C0260008C4254044B
60140+:102850000E000E470000000027A40028360501F0F6
60141+:102860000E000E47240600038FA200283603010045
60142+:10287000AE0200648FA2002CAE0200688FA200306E
60143+:10288000AE02006C93A40018906300D52402FF8070
60144+:102890000082102400431025304900FF3084007F5F
60145+:1028A0003122007F0082102A544000013929008023
60146+:1028B000000411C0244202402403FF800242102180
60147+:1028C00000431024AE220094264200403042007F94
60148+:1028D0003C038006004340218FA3001C2402FFFF1D
60149+:1028E000AFA800403C130800927300F71062003359
60150+:1028F00093A2001995030014304400FF3063FFFFDA
60151+:102900000064182B106000100000000095040014F3
60152+:102910008D07001C8D0600183084FFFF0044202323
60153+:102920000004210000E438210000102100E4202BE5
60154+:1029300000C2302100C43021AD07001CAD060018D4
60155+:102940000A000A2F93A20019950400148D07001C99
60156+:102950008D0600183084FFFF008220230004210030
60157+:10296000000010210080182100C2302300E4202B39
60158+:1029700000C4302300E33823AD07001CAD06001867
60159+:1029800093A200198FA30040A462001497A2001A1A
60160+:10299000A46200168FA2001CAC6200108FA2001C63
60161+:1029A000AC62000C93A20019A462002097A2001A46
60162+:1029B000A46200228FA2001CAC6200243C048008A8
60163+:1029C000348300808C6200388FA20020012088218F
60164+:1029D000AC62003C8FA20020AC82000093A20018E1
60165+:1029E000A062004C93A20018A0820009A0600068B9
60166+:1029F00093A20018105100512407FF803229007F54
60167+:102A0000000911C024420240024210213046007FDA
60168+:102A10003C03800000471024AC6200943C02800616
60169+:102A200000C2302190C2003CAFA60040000020212F
60170+:102A300000471025A0C2003C8FA80040950200026C
60171+:102A4000950300148D07001C3042FFFF3063FFFF29
60172+:102A50008D060018004310230002110000E2382107
60173+:102A600000E2102B00C4302100C23021AD07001C51
60174+:102A7000AD06001895020002A5020014A50000167C
60175+:102A80008D020008AD0200108D020008AD02000C9E
60176+:102A900095020002A5020020A50000228D02000878
60177+:102AA000AD0200249102003C304200401040001A68
60178+:102AB000262200013C108008A3A90038A38000183A
60179+:102AC000361001008E0200E08D03003427A4004080
60180+:102AD00027A50038004310210E0007C3AE0200E016
60181+:102AE00093A200383C038000A20200D58C620278D9
60182+:102AF0000440FFFE8F82001CAC62024024020002F0
60183+:102B0000A06202443C021000AC6202780E00093957
60184+:102B100000000000262200013043007F14730004EF
60185+:102B2000004020212403FF8002231024004320269C
60186+:102B300093A200180A000A4B309100FF93A40018DA
60187+:102B40008FA3001C2402FFFF1062000A308900FFDF
60188+:102B500024820001248300013042007F14530005C9
60189+:102B6000306900FF2403FF800083102400431026F7
60190+:102B7000304900FF3C028008904200080120882173
60191+:102B8000305000FF123000193222007F000211C0C5
60192+:102B900002421021244202402403FF8000431824F3
60193+:102BA0003C048000AC8300943042007F3C038006EC
60194+:102BB000004310218C43000C004020211060000BCA
60195+:102BC000AFA200400E00057E000000002623000199
60196+:102BD0002405FF803062007F145300020225202468
60197+:102BE000008518260A000AAF307100FF3C048008F7
60198+:102BF000348400808C8300183C027FFF3442FFFF46
60199+:102C000000621824AC8300183C0380008C6201F839
60200+:102C10000440FFFE00000000AC7201C0240200026C
60201+:102C2000A06201C43C021000AC6201F80A000B0E65
60202+:102C30008FBF00583C04800890C300019082000BB5
60203+:102C40001443002F8FBF0058349000809202000878
60204+:102C500030420040104000200000000092020008B6
60205+:102C60000002160000021603044100050240202164
60206+:102C70000E000ECC240500930A000B0E8FBF0058E7
60207+:102C80009202000924030018304200FF1443000D93
60208+:102C900002402021240500390E000E64000030217E
60209+:102CA0000E0003328F84001C8F82FF9424030012D5
60210+:102CB000A04300090E00033D8F84001C0A000B0E88
60211+:102CC0008FBF0058240500360E000E64000030212E
60212+:102CD0000A000B0E8FBF00580E0003320240202165
60213+:102CE000920200058F84001C344200200E00033D38
60214+:102CF000A20200050E0010758F84001C8FBF0058C3
60215+:102D00008FB300548FB200508FB1004C8FB0004889
60216+:102D100003E0000827BD00603C0280083445010044
60217+:102D20003C0280008C42014094A3000E0000302140
60218+:102D300000402021AF82001C3063FFFF3402FFFF00
60219+:102D4000106200063C0760202402FFFFA4A2000ED0
60220+:102D500094A500EA0A00090130A5FFFF03E000087E
60221+:102D60000000000027BDFFC83C0280003C06800830
60222+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
60223+:102D8000AFB30024AFB20020AFB00018345101003F
60224+:102D900034C501008C4301008E2200148CA400E491
60225+:102DA0000000A821AF83001C0044102318400052EB
60226+:102DB000A38000188E22001400005021ACA200E471
60227+:102DC00090C3000890A200D53073007FA3A200102A
60228+:102DD0008CB200E08CB400E4304200FF1053003BA2
60229+:102DE00093A200108F83001C2407FF80000211C0F3
60230+:102DF0000062102124420240246300400047102456
60231+:102E00003063007F3C0980003C08800A006818217C
60232+:102E1000AD2200248C62003427A4001427A50010E2
60233+:102E2000024280210290102304400028AFA3001426
60234+:102E30009062003C00E21024304200FF1440001970
60235+:102E4000020090219062003C34420040A062003CAD
60236+:102E50008F86001C93A3001024C200403042007FE4
60237+:102E6000004828213C0208008C4200F42463000141
60238+:102E7000306400FF14820002A3A30010A3A000107E
60239+:102E800093A20010AFA50014000211C0244202401A
60240+:102E900000C2102100471024AD2200240A000B4577
60241+:102EA00093A200100E0007C3000000003C0280083F
60242+:102EB00034420100AC5000E093A30010240A00014A
60243+:102EC000A04300D50A000B4593A200102402000184
60244+:102ED000154200093C0380008C6202780440FFFE2A
60245+:102EE0008F82001CAC62024024020002A0620244F5
60246+:102EF0003C021000AC6202789222000B2403000214
60247+:102F0000304200FF144300720000000096220008C7
60248+:102F1000304300FF24020082146200402402008437
60249+:102F20003C028000344901008D22000C95230006EC
60250+:102F3000000216023063FFFF3045003F24020027E5
60251+:102F400010A2000FAF83001428A200281040000830
60252+:102F5000240200312402002110A2000924020025CD
60253+:102F600010A20007938200190A000BBD00000000A8
60254+:102F700010A20007938200190A000BBD0000000098
60255+:102F80000E000777012020210A000C3D0000000000
60256+:102F90003C0380008C6202780440FFFE8F82001C9C
60257+:102FA000AC62024024020002A06202443C02100013
60258+:102FB000AC6202780A000C3D000000009523000678
60259+:102FC000912400058D25000C8D2600108D270018FA
60260+:102FD0008D28001C8D290020244200013C0108009E
60261+:102FE000A42356C63C010800A02456C53C01080095
60262+:102FF000AC2556CC3C010800AC2656D03C0108005C
60263+:10300000AC2756D83C010800AC2856DC3C0108002F
60264+:10301000AC2956E00A000C3DA38200191462000A94
60265+:10302000240200813C02800834420100944500EAF9
60266+:10303000922600058F84001C30A5FFFF30C600FFDC
60267+:103040000A000BFE3C0760211462005C00000000D7
60268+:103050009222000A304300FF306200201040000737
60269+:10306000306200403C02800834420100944500EA8E
60270+:103070008F84001C0A000BFC24060040104000074F
60271+:10308000000316003C02800834420100944500EA27
60272+:103090008F84001C0A000BFC24060041000216036A
60273+:1030A000044100463C02800834420100944500EA95
60274+:1030B0008F84001C2406004230A5FFFF3C076019E6
60275+:1030C0000E000901000000000A000C3D0000000095
60276+:1030D0009222000B24040016304200FF1044000628
60277+:1030E0003C0680009222000B24030017304200FFB0
60278+:1030F000144300320000000034C5010090A2000B10
60279+:10310000304200FF1444000B000080218CA20020FC
60280+:103110008CA400202403FF800043102400021140EF
60281+:103120003084007F004410253C032000004310251C
60282+:10313000ACC2083094A2000800021400000214037C
60283+:10314000044200012410000194A2000830420080D3
60284+:103150005040001A0200A82194A20008304220002A
60285+:10316000504000160200A8218CA300183C021C2D20
60286+:10317000344219ED106200110200A8213C0208003F
60287+:103180008C4200D4104000053C0280082403000457
60288+:1031900034420100A04300FC3C028008344201009C
60289+:1031A000944500EA8F84001C2406000630A5FFFF2A
60290+:1031B0000E0009013C0760210200A8210E00093918
60291+:1031C000000000009222000A304200081040000473
60292+:1031D00002A010210E0013790000000002A01021AF
60293+:1031E0008FBF00308FB5002C8FB400288FB3002420
60294+:1031F0008FB200208FB1001C8FB0001803E00008D0
60295+:1032000027BD00382402FF80008220243C02900069
60296+:1032100034420007008220253C028000AC4400209C
60297+:103220003C0380008C6200200440FFFE0000000090
60298+:1032300003E00008000000003C0380002402FF803F
60299+:10324000008220243462000700822025AC64002024
60300+:103250008C6200200440FFFE0000000003E0000834
60301+:103260000000000027BDFFD8AFB3001CAFB10014B1
60302+:10327000AFB00010AFBF0020AFB200183C1180000B
60303+:103280003C0280088E32002034530100AE2400201E
60304+:10329000966300EA000514003C074000004738250B
60305+:1032A00000A08021000030210E0009013065FFFFE1
60306+:1032B000240200A1160200022402FFFFA2620009FC
60307+:1032C000AE3200208FBF00208FB3001C8FB20018D9
60308+:1032D0008FB100148FB0001003E0000827BD002854
60309+:1032E0003C0280082403000527BDFFE834420100AA
60310+:1032F000A04300FCAFBF00103C0280008C420100E4
60311+:10330000240500A1004020210E000C67AF82001CA4
60312+:103310003C0380008C6202780440FFFE8F82001C18
60313+:103320008FBF001027BD0018AC62024024020002CB
60314+:10333000A06202443C021000AC62027803E0000884
60315+:103340000000000027BDFFE83C068000AFBF001072
60316+:1033500034C7010094E20008304400FF3883008243
60317+:10336000388200842C6300012C4200010062182581
60318+:103370001060002D24020083938200195040003B0E
60319+:103380008FBF00103C020800904256CC8CC4010054
60320+:103390003C06080094C656C63045003F38A30032AC
60321+:1033A00038A2003F2C6300012C4200010062182566
60322+:1033B000AF84001CAF860014A380001914600007BE
60323+:1033C00000E020212402002014A2001200000000CE
60324+:1033D0003402FFFF14C2000F00000000240200208E
60325+:1033E00014A2000500E028218CE300142402FFFF52
60326+:1033F0005062000B8FBF00103C040800248456C0AC
60327+:10340000000030210E000706240700010A000CD638
60328+:103410008FBF00100E000777000000008FBF001064
60329+:103420000A00093927BD001814820004240200850F
60330+:103430008CC501040A000CE1000020211482000662
60331+:103440002482FF808CC50104240440008FBF00103B
60332+:103450000A00016727BD0018304200FF2C4200021D
60333+:1034600010400004240200228FBF00100A000B2726
60334+:1034700027BD0018148200048F8200248FBF001023
60335+:103480000A000C8627BD00188C42000C1040001E5C
60336+:1034900000E0282190E300092402001814620003D0
60337+:1034A000240200160A000CFC240300081462000722
60338+:1034B00024020017240300123C02800834420080DA
60339+:1034C000A04300090A000D0994A7000854620007F0
60340+:1034D00094A700088F82FF942404FFFE9043000508
60341+:1034E00000641824A043000594A7000890A6001BC0
60342+:1034F0008CA4000094A500068FBF001000073C00BC
60343+:103500000A0008DC27BD00188FBF001003E0000888
60344+:1035100027BD00188F8500243C04800094A2002A57
60345+:103520008CA30034000230C02402FFF000C210243B
60346+:1035300000621821AC83003C8CA200303C03800068
60347+:10354000AC8200383C02005034420010AC620030C3
60348+:103550000000000000000000000000008C6200007D
60349+:10356000304200201040FFFD30C20008104000062D
60350+:103570003C0280008C620408ACA200208C62040C27
60351+:103580000A000D34ACA200248C430400ACA300203C
60352+:103590008C420404ACA200243C0300203C028000C6
60353+:1035A000AC4300303C0480008C8200300043102487
60354+:1035B0001440FFFD8F8600243C020040AC820030A6
60355+:1035C00094C3002A94C2002894C4002C94C5002EF1
60356+:1035D00024630001004410213064FFFFA4C20028CE
60357+:1035E00014850002A4C3002AA4C0002A03E0000836
60358+:1035F000000000008F84002427BDFFE83C05800404
60359+:1036000024840010AFBF00100E000E472406000AED
60360+:103610008F840024948200129483002E3042000F85
60361+:10362000244200030043180424027FFF0043102BB0
60362+:1036300010400002AC8300000000000D0E000D13CE
60363+:10364000000000008F8300248FBF001027BD0018EA
60364+:10365000946200149463001A3042000F00021500B7
60365+:10366000006218253C02800003E00008AC4300A083
60366+:103670008F8300243C028004944400069462001A64
60367+:103680008C650000A4640016004410233042FFFF44
60368+:103690000045102B03E00008384200018F8400240D
60369+:1036A0003C0780049486001A8C85000094E2000692
60370+:1036B000A482001694E3000600C310233042FFFFEB
60371+:1036C0000045102B384200011440FFF8A483001677
60372+:1036D00003E00008000000008F8400243C02800406
60373+:1036E000944200069483001A8C850000A482001680
60374+:1036F000006210233042FFFF0045102B38420001CA
60375+:103700005040000D8F850024006030213C0780046C
60376+:1037100094E20006A482001694E3000600C310237E
60377+:103720003042FFFF0045102B384200011440FFF8E3
60378+:10373000A48300168F8500243C03800034620400BB
60379+:103740008CA40020AF820020AC6400388CA200243E
60380+:10375000AC62003C3C020005AC62003003E00008B3
60381+:10376000ACA000048F8400243C0300068C8200047B
60382+:1037700000021140004310253C038000AC62003081
60383+:103780000000000000000000000000008C6200004B
60384+:10379000304200101040FFFD34620400AC80000491
60385+:1037A00003E00008AF8200208F86002427BDFFE0E1
60386+:1037B000AFB10014AFB00010AFBF00188CC300044D
60387+:1037C0008CC500248F820020309000FF94C4001A22
60388+:1037D00024630001244200202484000124A7002047
60389+:1037E000ACC30004AF820020A4C4001AACC70024FC
60390+:1037F00004A100060000882104E2000594C2001A1A
60391+:103800008CC2002024420001ACC2002094C2001AE5
60392+:1038100094C300282E040001004310262C4200010E
60393+:10382000004410245040000594C2001A24020001F4
60394+:10383000ACC2000894C2001A94C300280010202BC8
60395+:10384000004310262C4200010044102514400007BC
60396+:10385000000000008CC20008144000042402001084
60397+:103860008CC300041462000F8F8500240E000DA786
60398+:10387000241100018F820024944300289442001AEE
60399+:1038800014430003000000000E000D1300000000B0
60400+:10389000160000048F8500240E000D840000000037
60401+:1038A0008F85002494A2001E94A4001C24420001D1
60402+:1038B0003043FFFF14640002A4A2001EA4A0001E57
60403+:1038C0001200000A3C02800494A2001494A3001A7F
60404+:1038D0003042000F00021500006218253C028000F3
60405+:1038E000AC4300A00A000E1EACA0000894420006E3
60406+:1038F00094A3001A8CA40000A4A200160062102356
60407+:103900003042FFFF0044102B384200011040000DF0
60408+:1039100002201021006030213C07800494E2000660
60409+:10392000A4A2001694E3000600C310233042FFFF58
60410+:103930000044102B384200011440FFF8A4A30016E5
60411+:10394000022010218FBF00188FB100148FB000101B
60412+:1039500003E0000827BD002003E00008000000008D
60413+:103960008F82002C3C03000600021140004310250A
60414+:103970003C038000AC62003000000000000000004A
60415+:10398000000000008C620000304200101040FFFD7B
60416+:1039900034620400AF82002803E00008AF80002CEE
60417+:1039A00003E000080000102103E000080000000010
60418+:1039B0003084FFFF30A5FFFF0000182110800007B2
60419+:1039C000000000003082000110400002000420428C
60420+:1039D000006518210A000E3D0005284003E000089C
60421+:1039E0000060102110C0000624C6FFFF8CA200005A
60422+:1039F00024A50004AC8200000A000E4724840004C1
60423+:103A000003E000080000000010A0000824A3FFFF4E
60424+:103A1000AC86000000000000000000002402FFFF50
60425+:103A20002463FFFF1462FFFA2484000403E000080B
60426+:103A3000000000003C0280083442008024030001A2
60427+:103A4000AC43000CA4430010A4430012A443001490
60428+:103A500003E00008A44300168F82002427BDFFD88E
60429+:103A6000AFB3001CAFB20018AFB10014AFB000107C
60430+:103A7000AFBF00208C47000C248200802409FF8007
60431+:103A80003C08800E3043007F008080213C0A80008B
60432+:103A9000004920240068182130B100FF30D200FF17
60433+:103AA00010E000290000982126020100AD44002CFE
60434+:103AB000004928243042007F004820219062000005
60435+:103AC00024030050304200FF1443000400000000B3
60436+:103AD000AD45002C948200EA3053FFFF0E000D84A8
60437+:103AE000000000008F8200248F83002000112C0032
60438+:103AF0009442001E001224003484000100A22825F4
60439+:103B00003C02400000A22825AC7000008FBF0020BE
60440+:103B1000AC6000048FB20018AC7300088FB10014C1
60441+:103B2000AC60000C8FB3001CAC6400108FB00010B0
60442+:103B3000AC60001424040001AC60001827BD00280C
60443+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
60444+:103B50008FB200188FB100148FB0001003E000087E
60445+:103B600027BD00283C06800034C201009043000FAE
60446+:103B7000240200101062000E2865001110A000073A
60447+:103B800024020012240200082405003A10620006F4
60448+:103B90000000302103E0000800000000240500358B
60449+:103BA0001462FFFC000030210A000E6400000000D7
60450+:103BB0008CC200748F83FF9424420FA003E000089E
60451+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
60452+:103BD000240500013C0480088FBF0010240200016E
60453+:103BE00034830080A462001227BD00182402000163
60454+:103BF00003E00008A080001A27BDFFE0AFB2001864
60455+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
60456+:103C10000E000332008088213C028008345000806E
60457+:103C20009202000924030004304200FF1443000CF8
60458+:103C30003C028008124000082402000A0E000E5BBD
60459+:103C400000000000920200052403FFFE0043102440
60460+:103C5000A202000524020012A20200093C02800810
60461+:103C600034420080022020210E00033DA0400027A6
60462+:103C700016400003022020210E000EBF00000000AD
60463+:103C800002202021324600FF8FBF001C8FB2001897
60464+:103C90008FB100148FB00010240500380A000E64A4
60465+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
60466+:103CB000AFB10014AFB000100E00033200808021BD
60467+:103CC0000E000E5B000000003C02800834450080BE
60468+:103CD00090A2000924120018305100FF1232000394
60469+:103CE0000200202124020012A0A2000990A20005D7
60470+:103CF0002403FFFE004310240E00033DA0A2000594
60471+:103D00000200202124050020163200070000302187
60472+:103D10008FBF001C8FB200188FB100148FB000103D
60473+:103D20000A00034227BD00208FBF001C8FB200187D
60474+:103D30008FB100148FB00010240500390A000E6402
60475+:103D400027BD002027BDFFE83C028000AFB0001077
60476+:103D5000AFBF0014344201009442000C2405003629
60477+:103D60000080802114400012304600FF0E00033214
60478+:103D7000000000003C02800834420080240300124E
60479+:103D8000A043000990430005346300100E000E5B51
60480+:103D9000A04300050E00033D020020210200202167
60481+:103DA0000E000342240500200A000F3C0000000022
60482+:103DB0000E000E64000000000E00033202002021FD
60483+:103DC0003C0280089043001B2405FF9F0200202135
60484+:103DD000006518248FBF00148FB00010A043001B93
60485+:103DE0000A00033D27BD001827BDFFE0AFBF001844
60486+:103DF000AFB10014AFB0001030B100FF0E000332BD
60487+:103E0000008080213C02800824030012344200809C
60488+:103E10000E000E5BA04300090E00033D02002021AE
60489+:103E200002002021022030218FBF00188FB1001422
60490+:103E30008FB00010240500350A000E6427BD002055
60491+:103E40003C0480089083000E9082000A1443000B0B
60492+:103E5000000028218F82FF942403005024050001D4
60493+:103E600090420000304200FF1443000400000000B4
60494+:103E70009082000E24420001A082000E03E00008A0
60495+:103E800000A010213C0380008C6201F80440FFFE7A
60496+:103E900024020002AC6401C0A06201C43C02100014
60497+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
60498+:103EB0003C128008AFB10014AFBF001CAFB00010BF
60499+:103EC00036510080922200092403000A304200FF8C
60500+:103ED0001443003E000000008E4300048E22003890
60501+:103EE000506200808FBF001C92220000240300500B
60502+:103EF000304200FF144300253C0280008C42014008
60503+:103F00008E4300043642010002202821AC43001CED
60504+:103F10009622005C8E2300383042FFFF00021040E2
60505+:103F200000621821AE23001C8E4300048E2400384A
60506+:103F30009622005C006418233042FFFF0003184300
60507+:103F4000000210400043102A10400006000000004C
60508+:103F50008E4200048E230038004310230A000FAA6B
60509+:103F6000000220439622005C3042FFFF0002204006
60510+:103F70003C0280083443010034420080ACA4002C91
60511+:103F8000A040002424020001A062000C0E000F5E7D
60512+:103F900000000000104000538FBF001C3C02800056
60513+:103FA0008C4401403C0380008C6201F80440FFFE19
60514+:103FB00024020002AC6401C0A06201C43C021000F3
60515+:103FC000AC6201F80A0010078FBF001C92220009A2
60516+:103FD00024030010304200FF144300043C02800020
60517+:103FE0008C4401400A000FEE0000282192220009B3
60518+:103FF00024030016304200FF14430006240200147C
60519+:10400000A22200093C0280008C4401400A001001F9
60520+:104010008FBF001C8E2200388E23003C00431023EB
60521+:10402000044100308FBF001C92220027244200016F
60522+:10403000A2220027922200272C42000414400016DE
60523+:104040003C1080009222000924030004304200FF4B
60524+:10405000144300093C0280008C4401408FBF001CC7
60525+:104060008FB200188FB100148FB000102405009398
60526+:104070000A000ECC27BD00208C440140240500938B
60527+:104080008FBF001C8FB200188FB100148FB00010CA
60528+:104090000A000F4827BD00208E0401400E000332A5
60529+:1040A000000000008E4200042442FFFFAE420004E4
60530+:1040B0008E22003C2442FFFFAE22003C0E00033D56
60531+:1040C0008E0401408E0401408FBF001C8FB2001887
60532+:1040D0008FB100148FB00010240500040A000342C1
60533+:1040E00027BD00208FB200188FB100148FB00010D0
60534+:1040F00003E0000827BD00203C0680008CC2018838
60535+:104100003C038008346500809063000E00021402B6
60536+:10411000304400FF306300FF1464000E3C0280084E
60537+:1041200090A20026304200FF104400098F82FF94C5
60538+:10413000A0A400262403005090420000304200FF5B
60539+:1041400014430006000000000A0005A18CC4018091
60540+:104150003C02800834420080A044002603E00008AE
60541+:104160000000000027BDFFE030E700FFAFB20018FD
60542+:10417000AFBF001CAFB10014AFB0001000809021A1
60543+:1041800014E0000630C600FF000000000000000D33
60544+:10419000000000000A001060240001163C038008A3
60545+:1041A0009062000E304200FF14460023346200800B
60546+:1041B00090420026304200FF1446001F000000001D
60547+:1041C0009062000F304200FF1446001B0000000008
60548+:1041D0009062000A304200FF144600038F90FF9463
60549+:1041E0000000000D8F90FF948F82FF983C1180009B
60550+:1041F000AE05003CAC450000A066000A0E0003328C
60551+:104200008E240100A20000240E00033D8E24010034
60552+:104210003C0380008C6201F80440FFFE240200028F
60553+:10422000AC7201C0A06201C43C021000AC6201F893
60554+:104230000A0010618FBF001C000000000000000D8C
60555+:10424000000000002400013F8FBF001C8FB2001847
60556+:104250008FB100148FB0001003E0000827BD0020CC
60557+:104260008F83FF943C0280008C44010034420100A3
60558+:104270008C65003C9046001B0A00102724070001B3
60559+:104280003C0280089043000E9042000A0043102632
60560+:10429000304200FF03E000080002102B27BDFFE0C2
60561+:1042A0003C028008AFB10014AFB00010AFBF0018DF
60562+:1042B0003450008092020005240300303042003068
60563+:1042C00014430085008088218F8200248C42000CDA
60564+:1042D000104000828FBF00180E000D840000000007
60565+:1042E0008F860020ACD100009202000892030009E2
60566+:1042F000304200FF00021200306300FF004310252F
60567+:10430000ACC200049202004D000216000002160327
60568+:1043100004410005000000003C0308008C630048D5
60569+:104320000A00109F3C1080089202000830420040B2
60570+:10433000144000030000182192020027304300FFC0
60571+:104340003C108008361100809222004D00031E00B0
60572+:10435000304200FF0002140000621825ACC30008C0
60573+:104360008E2400308F820024ACC4000C8E250034D3
60574+:104370009443001E3C02C00BACC50010006218251F
60575+:104380008E22003800002021ACC200148E22003C96
60576+:10439000ACC200180E000DB8ACC3001C8E020004A5
60577+:1043A0008F8400203C058000AC8200008E2200201B
60578+:1043B000AC8200048E22001CAC8200088E220058C1
60579+:1043C0008CA3007400431021AC82000C8E22002CC0
60580+:1043D000AC8200108E2200408E23004400021400A4
60581+:1043E00000431025AC8200149222004D240300806B
60582+:1043F000304200FF1443000400000000AC800018AD
60583+:104400000A0010E38F8200248E23000C2402000196
60584+:104410001062000E2402FFFF92220008304200408A
60585+:104420001440000A2402FFFF8E23000C8CA20074AB
60586+:10443000006218233C0208000062102414400002AD
60587+:10444000000028210060282100051043AC820018DC
60588+:104450008F820024000020219443001E3C02C00CE7
60589+:10446000006218258F8200200E000DB8AC43001C9E
60590+:104470003C038008346201008C4200008F850020DC
60591+:10448000346300808FBF0018ACA20000ACA0000411
60592+:104490008C6400488F8200248FB10014ACA4000803
60593+:1044A000ACA0000CACA00010906300059446001E68
60594+:1044B0003C02400D00031E0000C23025ACA30014D6
60595+:1044C0008FB00010ACA0001824040001ACA6001CA2
60596+:1044D0000A000DB827BD00208FBF00188FB100144F
60597+:1044E0008FB0001003E0000827BD00203C028000D0
60598+:1044F0009443007C3C02800834460100308400FF75
60599+:104500003065FFFF2402000524A34650A0C4000C20
60600+:104510005482000C3065FFFF90C2000D2C42000752
60601+:104520001040000724A30A0090C3000D24020014C9
60602+:104530000062100400A210210A00111F3045FFFF85
60603+:104540003065FFFF3C0280083442008003E0000831
60604+:10455000A44500143C03800834680080AD05003891
60605+:10456000346701008CE2001C308400FF00A210239D
60606+:104570001840000330C600FF24A2FFFCACE2001C80
60607+:1045800030820001504000083C0380088D02003C4E
60608+:1045900000A2102304410012240400058C620004D0
60609+:1045A00010A2000F3C0380088C62000414A2001EBD
60610+:1045B000000000003C0208008C4200D8304200207D
60611+:1045C000104000093C0280083462008090630008BB
60612+:1045D0009042004C144300043C0280082404000470
60613+:1045E0000A00110900000000344300803442010039
60614+:1045F000A040000C24020001A462001410C0000AB4
60615+:104600003C0280008C4401003C0380008C6201F875
60616+:104610000440FFFE24020002AC6401C0A06201C499
60617+:104620003C021000AC6201F803E00008000000004A
60618+:1046300027BDFFE800A61823AFBF00101860008058
60619+:10464000308800FF3C02800834470080A0E000244E
60620+:1046500034440100A0E000278C82001C00A210233B
60621+:1046600004400056000000008CE2003C94E3005C33
60622+:104670008CE4002C004530233063FFFF00C3182179
60623+:104680000083202B1080000400E018218CE2002C15
60624+:104690000A00117800A2102194E2005C3042FFFF72
60625+:1046A00000C2102100A21021AC62001C3C02800854
60626+:1046B000344400809482005C8C83001C3042FFFFF5
60627+:1046C0000002104000A210210043102B10400004F3
60628+:1046D000000000008C82001C0A00118B3C06800840
60629+:1046E0009482005C3042FFFF0002104000A21021C3
60630+:1046F0003C06800834C3010034C70080AC82001C33
60631+:10470000A060000CACE500388C62001C00A21023F5
60632+:104710001840000224A2FFFCAC62001C3102000120
60633+:10472000104000083C0380088CE2003C00A21023EB
60634+:1047300004410012240400058CC2000410A20010E1
60635+:104740008FBF00108C62000414A2004F8FBF0010B6
60636+:104750003C0208008C4200D8304200201040000A81
60637+:104760003C02800834620080906300089042004C54
60638+:10477000144300053C028008240400048FBF00108D
60639+:104780000A00110927BD001834430080344201009B
60640+:10479000A040000C24020001A46200143C0280002E
60641+:1047A0008C4401003C0380008C6201F80440FFFE51
60642+:1047B000240200020A0011D8000000008CE2001C54
60643+:1047C000004610230043102B54400001ACE5001CB0
60644+:1047D00094E2005C3042FFFF0062102B144000079F
60645+:1047E0002402000294E2005C8CE3001C3042FFFFD4
60646+:1047F00000621821ACE3001C24020002ACE5003882
60647+:104800000E000F5EA082000C1040001F8FBF001032
60648+:104810003C0280008C4401003C0380008C6201F863
60649+:104820000440FFFE24020002AC6401C0A06201C487
60650+:104830003C021000AC6201F80A0011F08FBF0010BA
60651+:1048400031020010104000108FBF00103C028008A1
60652+:10485000344500808CA3001C94A2005C00661823E1
60653+:104860003042FFFF006218213C023FFF3444FFFF4B
60654+:104870000083102B544000010080182100C3102138
60655+:10488000ACA2001C8FBF001003E0000827BD001879
60656+:1048900027BDFFE800C0402100A63023AFBF0010B5
60657+:1048A00018C00026308A00FF3C028008344900808E
60658+:1048B0008D24001C8D23002C008820230064182BDD
60659+:1048C0001060000F344701008CE2002000461021E8
60660+:1048D000ACE200208CE200200044102B1440000BBE
60661+:1048E0003C023FFF8CE2002000441023ACE2002099
60662+:1048F0009522005C3042FFFF0A0012100082202146
60663+:10490000ACE00020008620213C023FFF3443FFFF43
60664+:104910000064102B54400001006020213C028008FC
60665+:104920003442008000851821AC43001CA0400024C4
60666+:10493000A04000270A0012623C03800831420010A8
60667+:10494000104000433C0380083C06800834C40080CB
60668+:104950008C82003C004810235840003E34660080A2
60669+:104960009082002424420001A0820024908200242E
60670+:104970003C0308008C630024304200FF0043102BEE
60671+:10498000144000688FBF001034C201008C42001C2C
60672+:1049900000A2102318400063000000008CC3000434
60673+:1049A0009482005C006818233042FFFF0003184324
60674+:1049B000000210400043102A1040000500000000D3
60675+:1049C0008CC20004004810230A0012450002104364
60676+:1049D0009482005C3042FFFF000210403C068008D9
60677+:1049E000AC82002C34C5008094A2005C8CA4002C06
60678+:1049F00094A3005C3042FFFF00021040008220219F
60679+:104A00003063FFFF0083202101041021ACA2001CB1
60680+:104A10008CC2000434C60100ACC2001C2402000297
60681+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
60682+:104A30003C0280008C4401003C0380008C6201F841
60683+:104A40000440FFFE240200020A001292000000004F
60684+:104A500034660080ACC50038346401008C82001CD0
60685+:104A600000A210231840000224A2FFFCAC82001C0C
60686+:104A7000314200015040000A3C0380088CC2003CD7
60687+:104A800000A2102304430014240400058C620004D7
60688+:104A900014A200033C0380080A00128424040005C9
60689+:104AA0008C62000414A2001F8FBF00103C0208009B
60690+:104AB0008C4200D8304200201040000A3C0280089E
60691+:104AC00034620080906300089042004C144300055B
60692+:104AD0003C028008240400048FBF00100A00110962
60693+:104AE00027BD00183443008034420100A040000C70
60694+:104AF00024020001A46200143C0280008C440100E6
60695+:104B00003C0380008C6201F80440FFFE2402000296
60696+:104B1000AC6401C0A06201C43C021000AC6201F8A8
60697+:104B20008FBF001003E0000827BD001827BDFFE875
60698+:104B30003C0A8008AFBF0010354900808D22003C40
60699+:104B400000C04021308400FF004610231840009D23
60700+:104B500030E700FF354701002402000100A63023A2
60701+:104B6000A0E0000CA0E0000DA522001418C0002455
60702+:104B7000308200108D23001C8D22002C0068182329
60703+:104B80000043102B1040000F000000008CE20020BA
60704+:104B900000461021ACE200208CE200200043102BE4
60705+:104BA0001440000B3C023FFF8CE200200043102326
60706+:104BB000ACE200209522005C3042FFFF0A0012C1E7
60707+:104BC00000621821ACE00020006618213C023FFF83
60708+:104BD0003446FFFF00C3102B5440000100C01821D1
60709+:104BE0003C0280083442008000651821AC43001C60
60710+:104BF000A0400024A04000270A00130F3C038008B7
60711+:104C0000104000403C0380088D22003C00481023E7
60712+:104C10005840003D34670080912200242442000166
60713+:104C2000A1220024912200243C0308008C6300246C
60714+:104C3000304200FF0043102B1440009A8FBF001039
60715+:104C40008CE2001C00A21023184000960000000017
60716+:104C50008D4300049522005C006818233042FFFF5A
60717+:104C600000031843000210400043102A10400005C2
60718+:104C7000012020218D420004004810230A0012F276
60719+:104C8000000210439522005C3042FFFF00021040FA
60720+:104C90003C068008AC82002C34C5008094A2005CE5
60721+:104CA0008CA4002C94A3005C3042FFFF0002104053
60722+:104CB000008220213063FFFF0083182101031021AF
60723+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
60724+:104CD000240200020E000F5EA0C2000C1040007102
60725+:104CE0008FBF00103C0280008C4401003C03800018
60726+:104CF0008C6201F80440FFFE240200020A0013390E
60727+:104D00000000000034670080ACE500383466010024
60728+:104D10008CC2001C00A210231840000224A2FFFC39
60729+:104D2000ACC2001C30820001504000083C038008E7
60730+:104D30008CE2003C00A2102304430051240400052F
60731+:104D40008C62000410A2003E3C0380088C620004C8
60732+:104D500054A200548FBF00103C0208008C4200D8BF
60733+:104D600030420020104000063C028008346200807F
60734+:104D7000906300089042004C104300403C028008C1
60735+:104D80003443008034420100A040000C24020001A2
60736+:104D9000A46200143C0280008C4401003C038000AB
60737+:104DA0008C6201F80440FFFE24020002AC6401C0E2
60738+:104DB000A06201C43C021000AC6201F80A00137743
60739+:104DC0008FBF001024020005A120002714E2000A72
60740+:104DD0003C038008354301009062000D2C42000620
60741+:104DE000504000053C0380089062000D2442000101
60742+:104DF000A062000D3C03800834670080ACE50038F9
60743+:104E0000346601008CC2001C00A21023184000026E
60744+:104E100024A2FFFCACC2001C308200015040000AFA
60745+:104E20003C0380088CE2003C00A2102304410014E3
60746+:104E3000240400058C62000414A200033C038008D3
60747+:104E40000A00136E240400058C62000414A20015ED
60748+:104E50008FBF00103C0208008C4200D83042002076
60749+:104E60001040000A3C028008346200809063000811
60750+:104E70009042004C144300053C02800824040004C6
60751+:104E80008FBF00100A00110927BD001834430080AD
60752+:104E900034420100A040000C24020001A46200146E
60753+:104EA0008FBF001003E0000827BD00183C0B8008EE
60754+:104EB00027BDFFE83C028000AFBF00103442010074
60755+:104EC000356A00809044000A356901008C45001461
60756+:104ED0008D4800389123000C308400FF0105102319
60757+:104EE0001C4000B3306700FF2CE20006504000B1C8
60758+:104EF0008FBF00102402000100E2300430C2000322
60759+:104F00005440000800A8302330C2000C144000A117
60760+:104F100030C20030144000A38FBF00100A00143BC1
60761+:104F20000000000018C00024308200108D43001CD7
60762+:104F30008D42002C006818230043102B1040000FF6
60763+:104F4000000000008D22002000461021AD2200202C
60764+:104F50008D2200200043102B1440000B3C023FFF29
60765+:104F60008D22002000431023AD2200209542005CDA
60766+:104F70003042FFFF0A0013AF00621821AD2000206D
60767+:104F8000006618213C023FFF3446FFFF00C3102B90
60768+:104F90005440000100C018213C02800834420080C7
60769+:104FA00000651821AC43001CA0400024A04000274D
60770+:104FB0000A0013FD3C038008104000403C038008B9
60771+:104FC0008D42003C004810231840003D34670080AB
60772+:104FD0009142002424420001A14200249142002475
60773+:104FE0003C0308008C630024304200FF0043102B78
60774+:104FF000144000708FBF00108D22001C00A21023EF
60775+:105000001840006C000000008D6300049542005CB5
60776+:10501000006818233042FFFF0003184300021040CD
60777+:105020000043102A10400005014020218D62000439
60778+:10503000004810230A0013E0000210439542005C70
60779+:105040003042FFFF000210403C068008AC82002C7A
60780+:1050500034C5008094A2005C8CA4002C94A3005C56
60781+:105060003042FFFF00021040008220213063FFFF2A
60782+:105070000083182101031021ACA2001C8CC2000483
60783+:1050800034C60100ACC2001C240200020E000F5EF8
60784+:10509000A0C2000C104000478FBF00103C028000EF
60785+:1050A0008C4401003C0380008C6201F80440FFFE48
60786+:1050B000240200020A00142D000000003467008062
60787+:1050C000ACE50038346601008CC2001C00A210233D
60788+:1050D0001840000224A2FFFCACC2001C3082000178
60789+:1050E0005040000A3C0380088CE2003C00A21023E0
60790+:1050F00004430014240400058C62000414A200037D
60791+:105100003C0380080A00141F240400058C6200047C
60792+:1051100014A200288FBF00103C0208008C4200D867
60793+:10512000304200201040000A3C02800834620080B7
60794+:10513000906300089042004C144300053C02800834
60795+:10514000240400048FBF00100A00110927BD0018B5
60796+:105150003443008034420100A040000C24020001CE
60797+:10516000A46200143C0280008C4401003C038000D7
60798+:105170008C6201F80440FFFE24020002AC6401C00E
60799+:10518000A06201C43C021000AC6201F80A00143BAA
60800+:105190008FBF00108FBF0010010030210A00115A8C
60801+:1051A00027BD0018010030210A00129927BD001800
60802+:1051B0008FBF001003E0000827BD00183C038008E3
60803+:1051C0003464010024020003A082000C8C620004FD
60804+:1051D00003E00008AC82001C3C05800834A300807A
60805+:1051E0009062002734A501002406004324420001F8
60806+:1051F000A0620027906300273C0208008C42004810
60807+:10520000306300FF146200043C07602194A500EAAB
60808+:105210000A00090130A5FFFF03E0000800000000BC
60809+:1052200027BDFFE8AFBF00103C0280000E00144411
60810+:105230008C4401803C02800834430100A060000CD3
60811+:105240008C4200048FBF001027BD001803E0000847
60812+:10525000AC62001C27BDFFE03C028008AFBF001815
60813+:10526000AFB10014AFB000103445008034460100E7
60814+:105270003C0880008D09014090C3000C8CA4003CC8
60815+:105280008CA200381482003B306700FF9502007C3E
60816+:1052900090A30027146000093045FFFF2402000599
60817+:1052A00054E200083C04800890C2000D2442000132
60818+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
60819+:1052C0003C048008348201009042000C2403000555
60820+:1052D000304200FF1443000A24A205DC348300801E
60821+:1052E000906200272C4200075040000524A20A00CB
60822+:1052F00090630027240200140062100400A2102111
60823+:105300003C108008361000803045FFFF012020212E
60824+:105310000E001444A60500149602005C8E030038AB
60825+:105320003C1180003042FFFF000210400062182153
60826+:10533000AE03001C0E0003328E24014092020025B1
60827+:1053400034420040A20200250E00033D8E2401409D
60828+:105350008E2401403C0380008C6201F80440FFFE73
60829+:1053600024020002AC6401C0A06201C43C0210002F
60830+:10537000AC6201F88FBF00188FB100148FB000101D
60831+:1053800003E0000827BD00203C0360103C02080039
60832+:1053900024420174AC62502C8C6250003C048000AA
60833+:1053A00034420080AC6250003C0208002442547C2D
60834+:1053B0003C010800AC2256003C020800244254384C
60835+:1053C0003C010800AC2256043C020002AC840008F8
60836+:1053D000AC82000C03E000082402000100A0302190
60837+:1053E0003C1C0800279C56083C0200023C050400B7
60838+:1053F00000852826008220260004102B2CA5000101
60839+:105400002C840001000210803C0308002463560035
60840+:105410000085202500431821108000030000102182
60841+:10542000AC6600002402000103E000080000000058
60842+:105430003C1C0800279C56083C0200023C05040066
60843+:1054400000852826008220260004102B2CA50001B0
60844+:105450002C840001000210803C03080024635600E5
60845+:105460000085202500431821108000050000102130
60846+:105470003C02080024425438AC62000024020001BF
60847+:1054800003E00008000000003C0200023C030400AE
60848+:1054900000821026008318262C4200012C63000194
60849+:1054A000004310251040000B000028213C1C080080
60850+:1054B000279C56083C0380008C62000824050001EC
60851+:1054C00000431025AC6200088C62000C00441025DB
60852+:1054D000AC62000C03E0000800A010213C1C080096
60853+:1054E000279C56083C0580008CA3000C0004202754
60854+:1054F000240200010064182403E00008ACA3000C9F
60855+:105500003C020002148200063C0560008CA208D018
60856+:105510002403FFFE0043102403E00008ACA208D0DF
60857+:105520003C02040014820005000000008CA208D098
60858+:105530002403FFFD00431024ACA208D003E00008C0
60859+:10554000000000003C02601A344200108C430080CE
60860+:1055500027BDFFF88C440084AFA3000093A3000094
60861+:10556000240200041462001AAFA4000493A20001F4
60862+:105570001040000797A300023062FFFC3C0380004C
60863+:10558000004310218C4200000A001536AFA200042F
60864+:105590003062FFFC3C03800000431021AC4400005B
60865+:1055A000A3A000003C0560008CA208D02403FFFEED
60866+:1055B0003C04601A00431024ACA208D08FA300045E
60867+:1055C0008FA2000034840010AC830084AC82008081
60868+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
60869+:1055E0003C1C0800279C56083C0280008C43000CA1
60870+:1055F0008C420004004318243C0200021060001496
60871+:10560000006228243C0204003C04000210A00005B3
60872+:10561000006210243C0208008C4256000A00155B10
60873+:1056200000000000104000073C0404003C02080099
60874+:105630008C4256040040F809000000000A00156082
60875+:10564000000000000000000D3C1C0800279C5608CC
60876+:105650008FBF001003E0000827BD0018800802403B
60877+:1056600080080100800800808008000000000C8095
60878+:105670000000320008000E9808000EF408000F88A1
60879+:1056800008001028080010748008010080080080BD
60880+:10569000800800000A000028000000000000000050
60881+:1056A0000000000D6370362E322E316200000000C3
60882+:1056B00006020104000000000000000000000000DD
60883+:1056C000000000000000000038003C000000000066
60884+:1056D00000000000000000000000000000000020AA
60885+:1056E00000000000000000000000000000000000BA
60886+:1056F00000000000000000000000000000000000AA
60887+:10570000000000000000000021003800000000013F
60888+:105710000000002B000000000000000400030D400A
60889+:105720000000000000000000000000000000000079
60890+:105730000000000000000000100000030000000056
60891+:105740000000000D0000000D3C020800244259AC8E
60892+:105750003C03080024635BF4AC4000000043202BB2
60893+:105760001480FFFD244200043C1D080037BD9FFC4F
60894+:1057700003A0F0213C100800261000A03C1C0800EB
60895+:10578000279C59AC0E0002F6000000000000000D3E
60896+:1057900027BDFFB4AFA10000AFA20004AFA3000873
60897+:1057A000AFA4000CAFA50010AFA60014AFA700185F
60898+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
60899+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
60900+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
60901+:1057E0000E000820000000008FBF00488FBC00445E
60902+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
60903+:105800008FAD00308FAC002C8FAB00288FAA002406
60904+:105810008FA900208FA8001C8FA700188FA6001446
60905+:105820008FA500108FA4000C8FA300088FA2000486
60906+:105830008FA1000027BD004C3C1B60188F7A5030B0
60907+:10584000377B502803400008AF7A000000A01821E1
60908+:1058500000801021008028213C0460003C0760008B
60909+:105860002406000810600006348420788C42000072
60910+:10587000ACE220088C63000003E00008ACE3200CDD
60911+:105880000A000F8100000000240300403C02600079
60912+:1058900003E00008AC4320003C0760008F86000452
60913+:1058A0008CE520740086102100A2182B14600007DC
60914+:1058B000000028218F8AFDA024050001A1440013C7
60915+:1058C0008F89000401244021AF88000403E0000810
60916+:1058D00000A010218F84FDA08F8500049086001306
60917+:1058E00030C300FF00A31023AF82000403E00008D0
60918+:1058F000A08000138F84FDA027BDFFE8AFB000108B
60919+:10590000AFBF001490890011908700112402002875
60920+:10591000312800FF3906002830E300FF2485002CE1
60921+:105920002CD00001106200162484001C0E00006EB2
60922+:10593000000000008F8FFDA03C05600024020204DF
60923+:1059400095EE003E95ED003C000E5C0031ACFFFF93
60924+:10595000016C5025ACAA2010520000012402000462
60925+:10596000ACA22000000000000000000000000000C9
60926+:105970008FBF00148FB0001003E0000827BD00188F
60927+:105980000A0000A6000028218F85FDA027BDFFD8B2
60928+:10599000AFBF0020AFB3001CAFB20018AFB100140E
60929+:1059A000AFB000100080982190A4001124B0001C1A
60930+:1059B00024B1002C308300FF386200280E000090D4
60931+:1059C0002C5200010E00009800000000020020216F
60932+:1059D0001240000202202821000028210E00006E43
60933+:1059E000000000008F8DFDA03C0880003C05600099
60934+:1059F00095AC003E95AB003C02683025000C4C0095
60935+:105A0000316AFFFF012A3825ACA7201024020202C8
60936+:105A1000ACA6201452400001240200028FBF0020D7
60937+:105A20008FB3001C8FB200188FB100148FB000101C
60938+:105A300027BD002803E00008ACA2200027BDFFE03E
60939+:105A4000AFB20018AFB10014AFB00010AFBF001C70
60940+:105A50003C1160008E2320748F82000430D0FFFF41
60941+:105A600030F2FFFF1062000C2406008F0E00006E63
60942+:105A7000000000003C06801F0010440034C5FF00F9
60943+:105A80000112382524040002AE2720100000302126
60944+:105A9000AE252014AE2420008FBF001C8FB200184A
60945+:105AA0008FB100148FB0001000C0102103E0000877
60946+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
60947+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
60948+:105AD00000102400009180253C036000AC70201071
60949+:105AE0008FBF00188FB100148FB000102402000483
60950+:105AF000AC62200027BD002003E000080000102158
60951+:105B000027BDFFE03C046018AFBF0018AFB1001420
60952+:105B1000AFB000108C8850002403FF7F34028071E6
60953+:105B20000103382434E5380C241F00313C1980006F
60954+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
60955+:105B40000E00054CAF9100400E00050A3C116000AC
60956+:105B50000E00007D000000008E3008083C0F570941
60957+:105B60002418FFF00218602435EEE00035EDF00057
60958+:105B7000018E5026018D58262D4600012D69000109
60959+:105B8000AF86004C0E000D09AF8900503C06601630
60960+:105B90008CC700003C0860148D0500A03C03FFFF8B
60961+:105BA00000E320243C02535300052FC2108200550D
60962+:105BB00034D07C00960201F2A780006C10400003F4
60963+:105BC000A780007C384B1E1EA78B006C960201F844
60964+:105BD000104000048F8D0050384C1E1EA78C007C96
60965+:105BE0008F8D005011A000058F83004C240E0020E3
60966+:105BF000A78E007CA78E006C8F83004C1060000580
60967+:105C00009785007C240F0020A78F007CA78F006C55
60968+:105C10009785007C2CB8008153000001240500808A
60969+:105C20009784006C2C91040152200001240404008C
60970+:105C30001060000B3C0260008FBF00188FB1001491
60971+:105C40008FB0001027BD0020A784006CA785007CC2
60972+:105C5000A380007EA780007403E00008A780009264
60973+:105C60008C4704382419103C30FFFFFF13F9000360
60974+:105C700030A8FFFF1100004624030050A380007EDF
60975+:105C80009386007E50C00024A785007CA780007CFE
60976+:105C90009798007CA780006CA7800074A780009272
60977+:105CA0003C010800AC3800800E00078700000000AF
60978+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
60979+:105CC000260C0388356A00100000482100002821B6
60980+:105CD00001AE20243C105709AF8C0010AF8A004859
60981+:105CE000AF89001810900023AF8500148FBF0018F3
60982+:105CF0008FB100148FB0001027BD002003E0000812
60983+:105D0000AF80005400055080014648218D260004D4
60984+:105D10000A00014800D180219798007CA784006C7C
60985+:105D2000A7800074A78000923C010800AC38008076
60986+:105D30000E000787000000003C0F60008DED080892
60987+:105D4000240EFFF03C0B600E260C0388356A001011
60988+:105D5000000048210000282101AE20243C105709F2
60989+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
60990+:105D7000AF85001424110001AF9100548FBF0018AB
60991+:105D80008FB100148FB0001003E0000827BD002081
60992+:105D90000A00017BA383007E3083FFFF8F880040D1
60993+:105DA0008F87003C000321403C0580003C020050EE
60994+:105DB000008248253C0660003C0A010034AC040027
60995+:105DC0008CCD08E001AA58241160000500000000F5
60996+:105DD0008CCF08E024E7000101EA7025ACCE08E092
60997+:105DE0008D19001001805821ACB900388D180014AD
60998+:105DF000ACB8003CACA9003000000000000000007E
60999+:105E00000000000000000000000000000000000092
61000+:105E100000000000000000003C0380008C640000D3
61001+:105E2000308200201040FFFD3C0F60008DED08E047
61002+:105E30003C0E010001AE18241460FFE100000000D8
61003+:105E4000AF87003C03E00008AF8B00588F8500400F
61004+:105E5000240BFFF03C06800094A7001A8CA90024B4
61005+:105E600030ECFFFF000C38C000EB5024012A402129
61006+:105E7000ACC8003C8CA400248CC3003C00831023DD
61007+:105E800018400033000000008CAD002025A2000166
61008+:105E90003C0F0050ACC2003835EE00103C068000CC
61009+:105EA000ACCE003000000000000000000000000048
61010+:105EB00000000000000000000000000000000000E2
61011+:105EC000000000003C0480008C9900003338002062
61012+:105ED0001300FFFD30E20008104000173C0980006D
61013+:105EE0008C880408ACA800108C83040CACA30014AC
61014+:105EF0003C1900203C188000AF19003094AE001807
61015+:105F000094AF001C01CF3021A4A6001894AD001A54
61016+:105F100025A70001A4A7001A94AB001A94AC001E98
61017+:105F2000118B00030000000003E0000800000000E7
61018+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
61019+:105F40008D240404ACA400140A0002183C1900209B
61020+:105F50008CA200200A0002003C0F00500A0001EE53
61021+:105F60000000000027BDFFE8AFBF00100E000232A6
61022+:105F7000000000008F8900408FBF00103C038000AC
61023+:105F8000A520000A9528000A9527000427BD0018BF
61024+:105F90003105FFFF30E6000F0006150000A22025A6
61025+:105FA00003E00008AC6400803C0508008CA50020DC
61026+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
61027+:105FC00010A300100000802124040001020430040A
61028+:105FD00000A6202400C3102450440006261000010F
61029+:105FE000001018802787FDA41480000A006718217C
61030+:105FF000261000012E0900025520FFF38F83000CAC
61031+:10600000AF85000C8FBF00148FB0001003E00008B4
61032+:1060100027BD00188C6800003C058000ACA8002457
61033+:106020000E000234261000013C0508008CA500205B
61034+:106030000A0002592E0900022405000100851804F7
61035+:106040003C0408008C84002027BDFFC8AFBF00348B
61036+:1060500000831024AFBE0030AFB7002CAFB60028CD
61037+:10606000AFB50024AFB40020AFB3001CAFB200182E
61038+:10607000AFB1001410400051AFB000108F84004049
61039+:10608000948700069488000A00E8302330D5FFFF8B
61040+:1060900012A0004B8FBF0034948B0018948C000A20
61041+:1060A000016C50233142FFFF02A2482B1520000251
61042+:1060B00002A02021004020212C8F000515E00002C5
61043+:1060C00000809821241300040E0001C102602021E9
61044+:1060D0008F87004002609021AF80004494F4000A52
61045+:1060E000026080211260004E3291FFFF3C1670006A
61046+:1060F0003C1440003C1E20003C1760008F99005863
61047+:106100008F380000031618241074004F0283F82BF8
61048+:1061100017E0003600000000107E00478F86004424
61049+:1061200014C0003A2403000102031023022320219B
61050+:106130003050FFFF1600FFF13091FFFF8F870040C6
61051+:106140003C1100203C108000AE11003094EB000A9E
61052+:106150003C178000024B5021A4EA000A94E9000A8F
61053+:1061600094E800043123FFFF3106000F00062D00E4
61054+:106170000065F025AEFE008094F3000A94F6001846
61055+:1061800012D30036001221408CFF00148CF4001052
61056+:1061900003E468210000C02101A4782B029870213B
61057+:1061A00001CF6021ACED0014ACEC001002B238233A
61058+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
61059+:1061C0008FBE00308FB7002C8FB600288FB500240B
61060+:1061D0008FB400208FB3001C8FB200188FB1001451
61061+:1061E0008FB0001003E0000827BD00381477FFCC03
61062+:1061F0008F8600440E000EE202002021004018218C
61063+:106200008F86004410C0FFC9020310230270702360
61064+:106210008F87004001C368210A0002E431B2FFFF0A
61065+:106220008F86004414C0FFC93C1100203C10800040
61066+:106230000A0002AEAE1100300E00046602002021FA
61067+:106240000A0002DB00401821020020210E0009395B
61068+:10625000022028210A0002DB004018210E0001EE76
61069+:10626000000000000A0002C702B2382327BDFFC8A1
61070+:10627000AFB7002CAFB60028AFB50024AFB40020F4
61071+:10628000AFB3001CAFB20018AFB10014AFB0001034
61072+:10629000AFBF00300E00011B241300013C047FFF40
61073+:1062A0003C0380083C0220003C010800AC20007048
61074+:1062B0003496FFFF34770080345200033C1512C03F
61075+:1062C000241400013C1080002411FF800E000245C0
61076+:1062D000000000008F8700488F8B00188F89001402
61077+:1062E0008CEA00EC8CE800E8014B302B01092823F4
61078+:1062F00000A6102314400006014B18231440000E82
61079+:106300003C05800002A3602B1180000B0000000000
61080+:106310003C0560008CEE00EC8CED00E88CA4180CC1
61081+:10632000AF8E001804800053AF8D00148F8F0010C3
61082+:10633000ADF400003C0580008CBF00003BF900017B
61083+:10634000333800011700FFE13C0380008C6201003C
61084+:1063500024060C0010460009000000008C680100B3
61085+:106360002D043080548000103C0480008C690100B2
61086+:106370002D2331811060000C3C0480008CAA0100A8
61087+:1063800011460004000020218CA6010024C5FF81D5
61088+:1063900030A400FF8E0B01000E000269AE0B00243A
61089+:1063A0000A00034F3C0480008C8D01002DAC3300AB
61090+:1063B00011800022000000003C0708008CE70098D4
61091+:1063C00024EE00013C010800AC2E00983C04800043
61092+:1063D0008C8201001440000300000000566000148D
61093+:1063E0003C0440008C9F01008C9801000000982123
61094+:1063F00003F1C82400193940330F007F00EF7025E6
61095+:1064000001D26825AC8D08308C8C01008C85010090
61096+:10641000258B0100017130240006514030A3007F1C
61097+:106420000143482501324025AC8808303C04400037
61098+:10643000AE0401380A00030E000000008C99010030
61099+:10644000240F0020AC99002092F80000330300FFD5
61100+:10645000106F000C241F0050547FFFDD3C048000AF
61101+:106460008C8401000E00154E000000000A00034F4E
61102+:106470003C04800000963824ACA7180C0A000327BF
61103+:106480008F8F00108C8501000E0008F72404008017
61104+:106490000A00034F3C04800000A4102B24030001D9
61105+:1064A00010400009000030210005284000A4102BF6
61106+:1064B00004A00003000318405440FFFC00052840DE
61107+:1064C0005060000A0004182B0085382B54E00004AB
61108+:1064D0000003184200C33025008520230003184222
61109+:1064E0001460FFF9000528420004182B03E000089F
61110+:1064F00000C310213084FFFF30C600FF3C0780003E
61111+:106500008CE201B80440FFFE00064C000124302557
61112+:106510003C08200000C820253C031000ACE00180AE
61113+:10652000ACE50184ACE4018803E00008ACE301B809
61114+:106530003C0660008CC5201C2402FFF03083020062
61115+:10654000308601001060000E00A2282434A500014E
61116+:106550003087300010E0000530830C0034A50004C3
61117+:106560003C04600003E00008AC85201C1060FFFDC7
61118+:106570003C04600034A5000803E00008AC85201C42
61119+:1065800054C0FFF334A500020A0003B03087300086
61120+:1065900027BDFFE8AFB00010AFBF00143C0760009C
61121+:1065A000240600021080001100A080218F83005873
61122+:1065B0000E0003A78C6400188F8200580000202171
61123+:1065C000240600018C45000C0E000398000000001A
61124+:1065D0001600000224020003000010218FBF0014E7
61125+:1065E0008FB0001003E0000827BD00188CE8201CC5
61126+:1065F0002409FFF001092824ACE5201C8F870058EE
61127+:106600000A0003CD8CE5000C3C02600E00804021A6
61128+:1066100034460100240900180000000000000000BA
61129+:10662000000000003C0A00503C0380003547020097
61130+:10663000AC68003834640400AC65003CAC670030E2
61131+:106640008C6C0000318B00201160FFFD2407FFFFE0
61132+:106650002403007F8C8D00002463FFFF248400044A
61133+:10666000ACCD00001467FFFB24C60004000000004E
61134+:10667000000000000000000024A402000085282B78
61135+:106680003C0300203C0E80002529FFFF010540212E
61136+:10669000ADC300301520FFE00080282103E0000892
61137+:1066A000000000008F82005827BDFFD8AFB3001C48
61138+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
61139+:1066C00094460002008098218C5200182CC300814F
61140+:1066D0008C4800048C4700088C51000C8C49001039
61141+:1066E000106000078C4A00142CC4000414800013AE
61142+:1066F00030EB000730C5000310A0001000000000C0
61143+:106700002410008B02002021022028210E00039873
61144+:10671000240600031660000224020003000010217A
61145+:106720008FBF00208FB3001C8FB200188FB10014F0
61146+:106730008FB0001003E0000827BD00281560FFF1AE
61147+:106740002410008B3C0C80003C030020241F00011F
61148+:10675000AD830030AF9F0044000000000000000047
61149+:10676000000000002419FFF024D8000F031978243A
61150+:106770003C1000D0AD88003801F0702524CD000316
61151+:106780003C08600EAD87003C35850400AD8E0030BE
61152+:10679000000D38823504003C3C0380008C6B000007
61153+:1067A000316200201040FFFD0000000010E00008F2
61154+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
61155+:1067C00024A50004AC8800001467FFFB24840004A7
61156+:1067D0003C05600EACA60038000000000000000080
61157+:1067E000000000008F8600543C0400203C0780001D
61158+:1067F000ACE4003054C000060120202102402021DA
61159+:106800000E0003A7000080210A00041D02002021C1
61160+:106810000E0003DD01402821024020210E0003A7C5
61161+:10682000000080210A00041D0200202127BDFFE096
61162+:10683000AFB200183092FFFFAFB10014AFBF001C21
61163+:10684000AFB000101640000D000088210A0004932C
61164+:106850000220102124050003508500278CE5000C40
61165+:106860000000000D262800013111FFFF24E2002066
61166+:106870000232802B12000019AF8200588F82004430
61167+:10688000144000168F8700583C0670003C0320001F
61168+:106890008CE5000000A62024148300108F84006083
61169+:1068A000000544023C09800000A980241480FFE90F
61170+:1068B000310600FF2CCA000B5140FFEB26280001D7
61171+:1068C000000668803C0E080025CE575801AE6021B6
61172+:1068D0008D8B0000016000080000000002201021E4
61173+:1068E0008FBF001C8FB200188FB100148FB0001042
61174+:1068F00003E0000827BD00200E0003982404008454
61175+:106900001600FFD88F8700580A000474AF8000601B
61176+:10691000020028210E0003BF240400018F870058C5
61177+:106920000A000474AF820060020028210E0003BF39
61178+:10693000000020210A0004A38F8700580E000404E1
61179+:10694000020020218F8700580A000474AF82006083
61180+:1069500030AFFFFF000F19C03C0480008C9001B8DD
61181+:106960000600FFFE3C1920043C181000AC83018097
61182+:10697000AC800184AC990188AC9801B80A00047518
61183+:106980002628000190E2000390E30002000020218D
61184+:106990000002FE0000033A0000FF2825240600083C
61185+:1069A0000E000398000000001600FFDC2402000324
61186+:1069B0008F870058000010210A000474AF82006025
61187+:1069C00090E8000200002021240600090A0004C308
61188+:1069D00000082E0090E4000C240900FF308500FF21
61189+:1069E00010A900150000302190F9000290F8000372
61190+:1069F000308F00FF94EB000400196E000018740043
61191+:106A0000000F62000186202501AE5025014B28258C
61192+:106A10003084FF8B0A0004C32406000A90E30002BE
61193+:106A200090FF0004000020210003360000DF28252D
61194+:106A30000A0004C32406000B0A0004D52406008BB8
61195+:106A4000000449C23127003F000443423C02800059
61196+:106A500000082040240316802CE60020AC43002CC4
61197+:106A600024EAFFE02482000114C0000330A900FFE3
61198+:106A700000801021314700FF000260803C0D800043
61199+:106A8000240A0001018D20213C0B000E00EA28049D
61200+:106A9000008B302111200005000538278CCE000026
61201+:106AA00001C5382503E00008ACC700008CD8000001
61202+:106AB0000307782403E00008ACCF000027BDFFE007
61203+:106AC000AFB10014AFB00010AFBF00183C076000BA
61204+:106AD0008CE408083402F0003C1160003083F000C0
61205+:106AE000240501C03C04800E000030211062000625
61206+:106AF000241000018CEA08083149F0003928E00030
61207+:106B00000008382B000780403C0D0200AE2D081411
61208+:106B1000240C16803C0B80008E2744000E000F8B47
61209+:106B2000AD6C002C120000043C02169124050001FB
61210+:106B3000120500103C023D2C345800E0AE384408E9
61211+:106B40003C1108008E31007C8FBF00183C066000AD
61212+:106B500000118540360F16808FB100148FB00010E1
61213+:106B60003C0E020027BD0020ACCF442003E000080B
61214+:106B7000ACCE08103C0218DA345800E0AE384408B5
61215+:106B80003C1108008E31007C8FBF00183C0660006D
61216+:106B900000118540360F16808FB100148FB00010A1
61217+:106BA0003C0E020027BD0020ACCF442003E00008CB
61218+:106BB000ACCE08100A0004EB240500010A0004EB27
61219+:106BC0000000282124020400A7820024A780001CC2
61220+:106BD000000020213C06080024C65A582405FFFF67
61221+:106BE00024890001000440803124FFFF01061821A0
61222+:106BF0002C87002014E0FFFAAC6500002404040098
61223+:106C0000A7840026A780001E000020213C06080063
61224+:106C100024C65AD82405FFFF248D0001000460809B
61225+:106C200031A4FFFF018658212C8A00201540FFFA6D
61226+:106C3000AD650000A7800028A7800020A780002263
61227+:106C4000000020213C06080024C65B582405FFFFF5
61228+:106C5000249900010004C0803324FFFF030678213B
61229+:106C60002C8E000415C0FFFAADE500003C05600065
61230+:106C70008CA73D002403E08F00E31024344601403C
61231+:106C800003E00008ACA63D002487007F000731C266
61232+:106C900024C5FFFF000518C2246400013082FFFFF5
61233+:106CA000000238C0A78400303C010800AC27003047
61234+:106CB000AF80002C0000282100002021000030219E
61235+:106CC0002489000100A728213124FFFF2CA81701E7
61236+:106CD000110000032C8300801460FFF924C600011A
61237+:106CE00000C02821AF86002C10C0001DA786002AF6
61238+:106CF00024CAFFFF000A11423C08080025085B581F
61239+:106D00001040000A00002021004030212407FFFF2E
61240+:106D1000248E00010004688031C4FFFF01A86021B7
61241+:106D20000086582B1560FFFAAD87000030A2001FC7
61242+:106D30005040000800043080240300010043C804D0
61243+:106D400000041080004878212738FFFF03E0000886
61244+:106D5000ADF8000000C820212405FFFFAC8500002D
61245+:106D600003E000080000000030A5FFFF30C6FFFF71
61246+:106D700030A8001F0080602130E700FF0005294295
61247+:106D80000000502110C0001D24090001240B000147
61248+:106D900025180001010B2004330800FF0126782686
61249+:106DA000390E00202DED00012DC2000101A2182591
61250+:106DB0001060000D014450250005C880032C4021BF
61251+:106DC0000100182110E0000F000A20278D040000A8
61252+:106DD000008A1825AD03000024AD00010000402109
61253+:106DE0000000502131A5FFFF252E000131C9FFFF12
61254+:106DF00000C9102B1040FFE72518000103E0000830
61255+:106E0000000000008D0A0000014440240A0005D162
61256+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
61257+:106E2000AFB00010AFBF001430E7FFFF00005021EB
61258+:106E30003410FFFF0000602124AF001F00C0482174
61259+:106E4000241800012419002005E0001601E010219B
61260+:106E50000002F943019F682A0009702B01AE40240B
61261+:106E600011000017000C18800064102110E00005CC
61262+:106E70008C4B000000F840040008382301675824B8
61263+:106E800000003821154000410000402155600016E7
61264+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
61265+:106EA00001E0102124A2003E0002F943019F682A5C
61266+:106EB0000009702B01AE40241500FFEB000C188078
61267+:106EC000154600053402FFFF020028210E0005B51B
61268+:106ED00000003821020010218FBF00148FB0001075
61269+:106EE00003E0000827BD00181520000301601821E9
61270+:106EF000000B1C0224080010306A00FF154000053A
61271+:106F0000306E000F250D000800031A0231A800FFA3
61272+:106F1000306E000F15C00005307F000325100004FF
61273+:106F200000031902320800FF307F000317E000055C
61274+:106F3000386900012502000200031882304800FF72
61275+:106F4000386900013123000110600004310300FFA3
61276+:106F5000250A0001314800FF310300FF000C6940A1
61277+:106F600001A34021240A000110CAFFD53110FFFF00
61278+:106F7000246E000131C800FF1119FFC638C9000195
61279+:106F80002D1F002053E0001C258B0001240D000163
61280+:106F90000A000648240E002051460017258B0001E8
61281+:106FA00025090001312800FF2D0900205120001281
61282+:106FB000258B000125430001010D5004014B1024D5
61283+:106FC000250900011440FFF4306AFFFF3127FFFF5D
61284+:106FD00010EE000C2582FFFF304CFFFF0000502117
61285+:106FE0003410FFFF312800FF2D0900205520FFF24B
61286+:106FF00025430001258B0001014648260A000602B0
61287+:10700000316CFFFF00003821000050210A000654B7
61288+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
61289+:10702000AFB10014001039423211FFE000071080A8
61290+:10703000AFB3001C00B1282330D3FFFFAFB200185C
61291+:1070400030A5FFFF00809021026030210044202104
61292+:10705000AFBF00200E0005E03207001F022288218A
61293+:107060003403FFFF0240202102002821026030216A
61294+:1070700000003821104300093231FFFF02201021A7
61295+:107080008FBF00208FB3001C8FB200188FB1001487
61296+:107090008FB0001003E0000827BD00280E0005E0B7
61297+:1070A0000000000000408821022010218FBF002036
61298+:1070B0008FB3001C8FB200188FB100148FB0001076
61299+:1070C00003E0000827BD0028000424003C03600002
61300+:1070D000AC603D0810A00002348210063482101605
61301+:1070E00003E00008AC623D0427BDFFE0AFB0001034
61302+:1070F000309000FF2E020006AFBF001810400008BD
61303+:10710000AFB10014001030803C03080024635784A2
61304+:1071100000C328218CA400000080000800000000AB
61305+:10712000000020218FBF00188FB100148FB0001015
61306+:107130000080102103E0000827BD00209791002A5D
61307+:1071400016200051000020213C020800904200332C
61308+:107150000A0006BB00000000978D002615A0003134
61309+:10716000000020210A0006BB2402000897870024A3
61310+:1071700014E0001A00001821006020212402000100
61311+:107180001080FFE98FBF0018000429C2004530219C
61312+:1071900000A6582B1160FFE43C0880003C0720004B
61313+:1071A000000569C001A76025AD0C00203C038008E4
61314+:1071B0002402001F2442FFFFAC6000000441FFFDD9
61315+:1071C0002463000424A5000100A6702B15C0FFF560
61316+:1071D000000569C00A0006A58FBF00189787001C2C
61317+:1071E0003C04080024845A58240504000E0006605C
61318+:1071F00024060001978B002424440001308AFFFFFD
61319+:107200002569FFFF2D48040000402821150000409B
61320+:10721000A789002424AC3800000C19C00A0006B964
61321+:10722000A780001C9787001E3C04080024845AD8BD
61322+:10723000240504000E00066024060001979900262C
61323+:10724000244400013098FFFF272FFFFF2F0E04007A
61324+:107250000040882115C0002CA78F0026A780001EA3
61325+:107260003A020003262401003084FFFF0E00068D41
61326+:107270002C4500010011F8C027F00100001021C0CA
61327+:107280000A0006BB240200089785002E978700227B
61328+:107290003C04080024845B580E00066024060001AC
61329+:1072A0009787002A8F89002C2445000130A8FFFF12
61330+:1072B00024E3FFFF0109302B0040802114C0001897
61331+:1072C000A783002AA7800022978500300E000F7543
61332+:1072D00002002021244A05003144FFFF0E00068DE4
61333+:1072E000240500013C05080094A500320E000F752E
61334+:1072F00002002021244521003C0208009042003376
61335+:107300000A0006BB000521C00A0006F3A784001E80
61336+:1073100024AC3800000C19C00A0006B9A784001C70
61337+:107320000A00070DA7850022308400FF27BDFFE873
61338+:107330002C820006AFBF0014AFB000101040001543
61339+:1073400000A03821000440803C0308002463579CBF
61340+:10735000010328218CA40000008000080000000028
61341+:1073600024CC007F000751C2000C59C23170FFFFCE
61342+:107370002547C40030E5FFFF2784001C02003021B0
61343+:107380000E0005B52407000197860028020620217B
61344+:10739000A78400288FBF00148FB0001003E00008FE
61345+:1073A00027BD00183C0508008CA50030000779C2F5
61346+:1073B0000E00038125E4DF003045FFFF3C04080098
61347+:1073C00024845B58240600010E0005B52407000143
61348+:1073D000978E002A8FBF00148FB0001025CD0001BA
61349+:1073E00027BD001803E00008A78D002A0007C9C2C6
61350+:1073F0002738FF00001878C231F0FFFF3C04080076
61351+:1074000024845AD802002821240600010E0005B564
61352+:1074100024070001978D0026260E0100000E84002F
61353+:1074200025AC00013C0B6000A78C0026AD603D0838
61354+:1074300036040006000030213C0760008CE23D0469
61355+:10744000305F000617E0FFFD24C9000100061B00A5
61356+:10745000312600FF006440252CC50004ACE83D0443
61357+:1074600014A0FFF68FBF00148FB0001003E00008D7
61358+:1074700027BD0018000751C22549C8002406000195
61359+:10748000240700013C04080024845A580E0005B566
61360+:107490003125FFFF978700248FBF00148FB00010A5
61361+:1074A00024E6000127BD001803E00008A786002499
61362+:1074B0003C0660183C090800252900FCACC9502C8A
61363+:1074C0008CC850003C0580003C020002350700805B
61364+:1074D000ACC750003C04080024841FE03C030800B3
61365+:1074E00024631F98ACA50008ACA2000C3C01080066
61366+:1074F000AC2459A43C010800AC2359A803E00008BF
61367+:107500002402000100A030213C1C0800279C59AC3B
61368+:107510003C0C04003C0B0002008B3826008C4026FB
61369+:107520002CE200010007502B2D050001000A4880C5
61370+:107530003C030800246359A4004520250123182199
61371+:107540001080000300001021AC660000240200013E
61372+:1075500003E00008000000003C1C0800279C59AC18
61373+:107560003C0B04003C0A0002008A3026008B3826BF
61374+:107570002CC200010006482B2CE5000100094080C8
61375+:107580003C030800246359A4004520250103182169
61376+:1075900010800005000010213C0C0800258C1F986D
61377+:1075A000AC6C00002402000103E0000800000000B1
61378+:1075B0003C0900023C080400008830260089382677
61379+:1075C0002CC30001008028212CE400010083102539
61380+:1075D0001040000B000030213C1C0800279C59ACD7
61381+:1075E0003C0A80008D4E00082406000101CA68256F
61382+:1075F000AD4D00088D4C000C01855825AD4B000C9D
61383+:1076000003E0000800C010213C1C0800279C59AC76
61384+:107610003C0580008CA6000C0004202724020001F9
61385+:1076200000C4182403E00008ACA3000C3C020002D4
61386+:107630001082000B3C0560003C070400108700032B
61387+:107640000000000003E00008000000008CA908D042
61388+:10765000240AFFFD012A402403E00008ACA808D05A
61389+:107660008CA408D02406FFFE0086182403E000083E
61390+:10767000ACA308D03C05601A34A600108CC300806F
61391+:1076800027BDFFF88CC50084AFA3000093A40000C1
61392+:107690002402001010820003AFA5000403E00008DC
61393+:1076A00027BD000893A7000114E0001497AC000266
61394+:1076B00097B800023C0F8000330EFFFC01CF682119
61395+:1076C000ADA50000A3A000003C0660008CC708D058
61396+:1076D0002408FFFE3C04601A00E82824ACC508D04A
61397+:1076E0008FA300048FA200003499001027BD00086A
61398+:1076F000AF22008003E00008AF2300843C0B800031
61399+:10770000318AFFFC014B48218D2800000A00080C3B
61400+:10771000AFA8000427BDFFE8AFBF00103C1C080065
61401+:10772000279C59AC3C0580008CA4000C8CA2000462
61402+:107730003C0300020044282410A0000A00A31824DF
61403+:107740003C0604003C0400021460000900A610245A
61404+:107750001440000F3C0404000000000D3C1C080015
61405+:10776000279C59AC8FBF001003E0000827BD00180C
61406+:107770003C0208008C4259A40040F80900000000B7
61407+:107780003C1C0800279C59AC0A0008358FBF00102C
61408+:107790003C0208008C4259A80040F8090000000093
61409+:1077A0000A00083B000000003C0880008D0201B880
61410+:1077B0000440FFFE35090180AD2400003C031000A9
61411+:1077C00024040040AD250004A1240008A1260009DE
61412+:1077D000A527000A03E00008AD0301B83084FFFFCD
61413+:1077E0000080382130A5FFFF000020210A00084555
61414+:1077F000240600803087FFFF8CA400002406003898
61415+:107800000A000845000028218F8300788F860070C9
61416+:107810001066000B008040213C07080024E75B68ED
61417+:10782000000328C000A710218C440000246300013D
61418+:10783000108800053063000F5466FFFA000328C06B
61419+:1078400003E00008000010213C07080024E75B6CFF
61420+:1078500000A7302103E000088CC200003C03900028
61421+:1078600034620001008220253C038000AC640020CB
61422+:107870008C65002004A0FFFE0000000003E000086B
61423+:10788000000000003C0280003443000100832025FA
61424+:1078900003E00008AC44002027BDFFE0AFB10014B6
61425+:1078A0003091FFFFAFB00010AFBF001812200013DF
61426+:1078B00000A080218CA20000240400022406020003
61427+:1078C0001040000F004028210E0007250000000096
61428+:1078D00000001021AE000000022038218FBF0018E8
61429+:1078E0008FB100148FB0001000402021000028212B
61430+:1078F000000030210A00084527BD00208CA20000AE
61431+:10790000022038218FBF00188FB100148FB00010F3
61432+:107910000040202100002821000030210A000845F5
61433+:1079200027BD002000A010213087FFFF8CA5000498
61434+:107930008C4400000A000845240600068F83FD9C45
61435+:1079400027BDFFE8AFBF0014AFB00010906700087C
61436+:10795000008010210080282130E600400000202116
61437+:1079600010C000088C5000000E0000BD0200202155
61438+:10797000020020218FBF00148FB000100A000548BC
61439+:1079800027BD00180E0008A4000000000E0000BD76
61440+:1079900002002021020020218FBF00148FB00010B0
61441+:1079A0000A00054827BD001827BDFFE0AFB0001052
61442+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
61443+:1079C00092060001008088210E00087230D2000467
61444+:1079D00092040005001129C2A6050000348300406E
61445+:1079E000A20300050E00087C022020210E00054A9B
61446+:1079F0000220202124020001AE02000C02202821D6
61447+:107A0000A602001024040002A602001224060200AE
61448+:107A1000A60200140E000725A60200161640000F4D
61449+:107A20008FBF001C978C00743C0B08008D6B007896
61450+:107A30002588FFFF3109FFFF256A0001012A382B45
61451+:107A400010E00006A78800743C0F6006240E0016A4
61452+:107A500035ED0010ADAE00508FBF001C8FB2001886
61453+:107A60008FB100148FB0001003E0000827BD002084
61454+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
61455+:107A80001080000400A088212402008010820007DA
61456+:107A9000000000000000000D8FBF00188FB100141F
61457+:107AA0008FB0001003E0000827BD00200E00087210
61458+:107AB00000A020218F86FD9C0220202190C500057A
61459+:107AC0000E00087C30B000FF2403003E1603FFF1D7
61460+:107AD0003C0680008CC401780480FFFE34C801405D
61461+:107AE000240900073C071000AD11000002202021EE
61462+:107AF000A10900048FBF00188FB100148FB00010CF
61463+:107B0000ACC701780A0008C527BD002027BDFFE0EB
61464+:107B1000AFB00010AFBF0018AFB100143C10800030
61465+:107B20008E110020000000000E00054AAE04002067
61466+:107B3000AE1100208FBF00188FB100148FB000105D
61467+:107B400003E0000827BD00203084FFFF00803821BB
61468+:107B50002406003500A020210A0008450000282145
61469+:107B60003084FFFF008038212406003600A0202149
61470+:107B70000A0008450000282127BDFFD0AFB500242A
61471+:107B80003095FFFFAFB60028AFB40020AFBF002C88
61472+:107B9000AFB3001CAFB20018AFB10014AFB000100B
61473+:107BA00030B6FFFF12A000270000A0218F920058DE
61474+:107BB0008E4300003C0680002402004000033E0289
61475+:107BC00000032C0230E4007F006698241482001D1C
61476+:107BD00030A500FF8F8300682C68000A1100001098
61477+:107BE0008F8D0044000358803C0C0800258C57B84A
61478+:107BF000016C50218D4900000120000800000000A8
61479+:107C000002D4302130C5FFFF0E0008522404008446
61480+:107C1000166000028F920058AF8000688F8D00447C
61481+:107C20002659002026980001032090213314FFFFDD
61482+:107C300015A00004AF9900580295202B1480FFDC9A
61483+:107C400000000000028010218FBF002C8FB600289A
61484+:107C50008FB500248FB400208FB3001C8FB20018A2
61485+:107C60008FB100148FB0001003E0000827BD003072
61486+:107C70002407003414A70149000000009247000EB9
61487+:107C80008F9FFDA08F90FD9C24181600A3E700197C
61488+:107C90009242000D3C0880003C07800CA3E20018D3
61489+:107CA000964A00123C0D60003C117FFFA60A005C62
61490+:107CB000964400103623FFFF240200053099FFFF91
61491+:107CC000AE1900548E46001CAD1800288CEF000041
61492+:107CD0008DAE444801E6482601C93021AE06003881
61493+:107CE0008E05003824CB00013C0E7F00AE05003C21
61494+:107CF0008E0C003CAFEC0004AE0B00208E13002075
61495+:107D0000AE13001CA3E0001BAE03002CA3E2001284
61496+:107D10008E4A001424130050AE0A00348E0400343E
61497+:107D2000AFE400148E590018AE1900489258000CA8
61498+:107D3000A218004E920D000835AF0020A20F0008D7
61499+:107D40008E090018012E282434AC4000AE0C001817
61500+:107D5000920B0000317200FF1253027F2403FF8058
61501+:107D60003C04080024845BE80E0008AA0000000020
61502+:107D70003C1108008E315BE80E00087202202021C1
61503+:107D80002405000424080001A2050025022020216A
61504+:107D90000E00087CA20800053C0580008CB001782C
61505+:107DA0000600FFFE8F92005834AE0140240F0002FF
61506+:107DB0003C091000ADD10000A1CF0004ACA90178AE
61507+:107DC0000A000962AF8000682CAD003751A0FF9413
61508+:107DD0008F8D0044000580803C110800263157E05B
61509+:107DE000021178218DEE000001C0000800000000A3
61510+:107DF0002411000414B1008C3C0780003C080800EA
61511+:107E00008D085BE88F86FD9CACE800208E4500085D
61512+:107E10008F99FDA0240D0050ACC500308E4C000899
61513+:107E2000ACCC00508E4B000CACCB00348E43001019
61514+:107E3000ACC300388E4A0010ACCA00548E42001405
61515+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
61516+:107E5000ACD0002090C40000309800FF130D024AFF
61517+:107E6000000000008CC400348CD00030009030231F
61518+:107E700004C000F12404008C126000EE2402000310
61519+:107E80000A000962AF8200682419000514B900666F
61520+:107E90003C0580003C0808008D085BE88F86FD9C4F
61521+:107EA000ACA800208E4C00048F8AFDA0240720007F
61522+:107EB000ACCC001C924B000824120008A14B001906
61523+:107EC0008F82005890430009A14300188F85005805
61524+:107ED00090BF000A33E400FF1092001028890009C7
61525+:107EE000152000BA240E0002240D0020108D000B76
61526+:107EF000340780002898002117000008240740005C
61527+:107F000024100040109000053C0700012419008057
61528+:107F1000109900023C070002240740008CC20018A0
61529+:107F20003C03FF00004350240147F825ACDF001854
61530+:107F300090B2000BA0D200278F8300589464000CED
61531+:107F4000108001FE000000009467000C3C1F8000C0
61532+:107F50002405FFBFA4C7005C9063000E2407000443
61533+:107F6000A0C300088F820058904A000FA0CA0009E1
61534+:107F70008F8900588D3200108FE400740244C823AA
61535+:107F8000ACD900588D300014ACD0002C95380018B6
61536+:107F9000330DFFFFACCD00409531001A322FFFFFAB
61537+:107FA000ACCF00448D2E001CACCE00489128000EB2
61538+:107FB000A0C8000890CC000801855824126001B6C2
61539+:107FC000A0CB00088F9200580A000962AF870068B2
61540+:107FD0002406000614A600143C0E80003C0F080086
61541+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
61542+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
61543+:1080000024040005ACA800048CCC003C1260008164
61544+:10801000AD6C00000A000962AF84006824110007FB
61545+:1080200010B1004B240400063C05080024A55BE8C1
61546+:108030000E000881240400818F9200580013102B39
61547+:108040000A000962AF820068241F002314BFFFF6F4
61548+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
61549+:10806000AD8500208F91FD9C8E4600042564002084
61550+:1080700026450014AE260028240600030E000F81BA
61551+:10808000257000308F87005802002021240600034D
61552+:108090000E000F8124E500083C04080024845BE8FE
61553+:1080A0000E0008AA0000000092230000240A0050DD
61554+:1080B000306200FF544AFFE18F9200580E000F6CAF
61555+:1080C000000000000A000A6A8F920058240800335A
61556+:1080D00014A800323C0380003C1108008E315BE89C
61557+:1080E0008F8FFDA0AC7100208E420008240D002867
61558+:1080F0008F89FD9CADE200308E4A000C24060009F9
61559+:10810000ADEA00348E5F0010ADFF00388E440014DD
61560+:10811000ADE400208E590018ADF900248E58001CE3
61561+:10812000ADF80028A1ED00118E4E00041260003160
61562+:10813000AD2E00288F9200580A000962AF860068B1
61563+:10814000240D002214ADFFB8000000002404000735
61564+:108150003C1008008E105BE83C188000AF10002037
61565+:108160005660FEAEAF8400683C04080024845BE8DF
61566+:108170000E0008AA241300508F84FD9C90920000EA
61567+:10818000325900FF1333014B000000008F9200585A
61568+:10819000000020210A000962AF8400683C05080045
61569+:1081A00024A55BE80E000858240400810A000A6A2E
61570+:1081B0008F92005802D498213265FFFF0E000852BA
61571+:1081C000240400840A0009628F920058108EFF5325
61572+:1081D000240704002887000310E00179241100041B
61573+:1081E000240F0001548FFF4D240740000A000A228B
61574+:1081F000240701003C05080024A55BE80E0008A444
61575+:10820000240400828F920058000030210A00096285
61576+:10821000AF8600683C04080024845BE88CC2003808
61577+:108220000E0008AA8CC3003C8F9200580A000AC0B6
61578+:1082300000002021240400823C05080024A55BE8FE
61579+:108240000E0008A4000000008F92005800001021CA
61580+:108250000A000962AF8200688E5000048F91FD9C75
61581+:108260003C078000ACF00020922C00050200282181
61582+:10827000318B0002156001562404008A8F92FDA004
61583+:108280002404008D9245001B30A6002014C001502C
61584+:1082900002002821922E00092408001231C900FF93
61585+:1082A0001128014B240400810E00087202002021D5
61586+:1082B0009258001B240F000402002021370D0042B9
61587+:1082C000A24D001B0E00087CA22F00253C0580005B
61588+:1082D0008CA401780480FFFE34B90140241F000201
61589+:1082E000AF300000A33F00048F9200583C101000F4
61590+:1082F000ACB001780A000A6B0013102B8E500004FA
61591+:108300008F91FD9C3C038000AC700020922A0005F8
61592+:108310000200282131420002144000172404008A80
61593+:10832000922C00092412000402002821318B00FF46
61594+:1083300011720011240400810E0008720200202135
61595+:108340008F89FDA0240800122405FFFE912F001B39
61596+:108350000200202135EE0020A12E001BA2280009DA
61597+:108360009226000500C538240E00087CA2270005CF
61598+:1083700002002821000020210E0009330000000027
61599+:108380000A000A6A8F9200588E4C00043C07800055
61600+:108390003C10080026105BE8ACEC00203C01080013
61601+:1083A000AC2C5BE8924B0003317100041220013BBE
61602+:1083B0008F84FD9C24020006A0820009924F001BBE
61603+:1083C000240EFFC031E9003F012E4025A08800089F
61604+:1083D0009245000330A6000114C0013200000000E5
61605+:1083E0008E420008AE0200083C0208008C425BF09E
61606+:1083F000104001318F90FDA0000219C28F8DFD9CAD
61607+:10840000A603000C8E4A000C24180001240400145A
61608+:10841000AE0A002C8E420010AE02001C965F0016C1
61609+:10842000A61F003C96590014A619003EADB8000CDA
61610+:10843000A5B80010A5B80012A5B80014A5B800167C
61611+:1084400012600144A2040011925100033232000272
61612+:108450002E5300018F920058266200080A0009621C
61613+:10846000AF8200688E4400043C1980003C068008FE
61614+:10847000AF2400208E45000890D80000240D005045
61615+:10848000331100FF122D009C2407008824060009E8
61616+:108490000E000845000000000A000A6A8F9200588A
61617+:1084A0008E5000043C0980003C118008AD30002053
61618+:1084B0009228000024050050310400FF10850110AF
61619+:1084C0002407008802002021000028210E00084512
61620+:1084D0002406000E922D00002418FF80020028219F
61621+:1084E00001B8802524040004240600300E0007256E
61622+:1084F000A23000000A000A6A8F9200588E500004D1
61623+:108500008F91FDA03C028000AC500020923F001BE8
61624+:1085100033F900101320006C240700810200202191
61625+:10852000000028212406001F0E000845000000005E
61626+:108530000A000A6A8F9200588E44001C0E00085DE3
61627+:1085400000000000104000E3004048218F880058E0
61628+:1085500024070089012020218D05001C240600012C
61629+:108560000E000845000000000A000A6A8F920058B9
61630+:10857000964900023C10080026105BE831280004F0
61631+:10858000110000973C0460008E4E001C3C0F8000E0
61632+:10859000ADEE00203C010800AC2E5BE896470002DF
61633+:1085A00030E40001148000E6000000008E42000468
61634+:1085B000AE0200083C1008008E105BF0120000ECC8
61635+:1085C0003C0F80008F92FD9C241000018E4E0018FD
61636+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
61637+:1085E000A2400005AE50000C3C0808008D085BF06E
61638+:1085F0008F840058A6500010000839C2A6500012FF
61639+:10860000A6500014A6500016A5A7000C8C8C0008DC
61640+:108610008F8B00588F8A0058ADAC002C8D63000CF6
61641+:1086200024070002ADA3001C91460010A1A6001172
61642+:108630008F82005890450011A3E500088F990058DB
61643+:1086400093380012A258004E8F910058922F0013B9
61644+:10865000A1AF00128F920058964E0014A5AE003CB8
61645+:1086600096490016A5A9003E8E480018ADA8001432
61646+:108670005660FD6AAF8700683C05080024A55BE8EA
61647+:108680000E000881000020218F9200580000382140
61648+:108690000A000962AF8700683C05080024A55BE872
61649+:1086A0000E0008A4240400828F9200580A000A4D8C
61650+:1086B000000038210E000F6C000000008F9200585F
61651+:1086C0000A000AC0000020210E00087202002021CA
61652+:1086D0009223001B02002021346A00100E00087C47
61653+:1086E000A22A001B000038210200202100002821BE
61654+:1086F0000A000BA52406001F9242000C305F000107
61655+:1087000013E0000300000000964A000EA4CA002CEB
61656+:10871000924B000C316300025060000600003821CB
61657+:108720008E470014964C0012ACC7001CA4CC001A53
61658+:10873000000038210A000B7F240600093C050800D0
61659+:1087400024A55BE80E0008A42404008B8F92005837
61660+:108750000A000A4D0013382B3C0C08008D8C5BE896
61661+:1087600024DFFFFE25930100326B007F016790211B
61662+:1087700002638824AD110028AE4600E0AE4000E45C
61663+:108780000A0009B3AE5F001CACC000543C0D0800E9
61664+:108790008DAD5BE83C18800C37090100ACED00287A
61665+:1087A0008E510014AD3100E08E4F0014AD2F00E467
61666+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
61667+:1087C0005491FDD6240740000A000A222407100015
61668+:1087D0000E00092D000000000A000A6A8F9200585E
61669+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
61670+:1087F000AC205BE810710062000000003C196C6264
61671+:1088000037387970147800082404000297850074C2
61672+:108810009782006C2404009200A2F82B13E0001948
61673+:1088200002002821240400020E00069524050200FF
61674+:108830003C068000ACC200203C010800AC225BE892
61675+:108840001040000D8F8C0058240A002824040003D7
61676+:10885000918B0010316300FF546A00012404000171
61677+:108860000E0000810000000010400004240400837A
61678+:108870000A000BC28F920058240400833C050800B4
61679+:1088800024A55BE80E000881000000008F920058CC
61680+:108890000013382B0A000962AF8700680A000B49F1
61681+:1088A000240200128E4400080E00085D0000000043
61682+:1088B0000A000B55AE0200083C05080024A55BE841
61683+:1088C0000E000858240400878F9200580A000B728B
61684+:1088D0000013102B240400040E000695240500301C
61685+:1088E0001440002A004048218F8800582407008344
61686+:1088F000012020218D05001C0A000BB32406000175
61687+:108900008F8300788F8600701066FEEE000038219D
61688+:108910003C07080024E75B6C000320C00087282187
61689+:108920008CAE000011D0005D246F000131E3000F18
61690+:108930005466FFFA000320C00A000B8C00003821A7
61691+:108940008E4400040E00085D000000000A000BC801
61692+:10895000AE0200083C05080024A55BE80E0008A450
61693+:10896000240400828F9200580A000B72000010212C
61694+:108970003C05080024A55BE80A000C7C2404008761
61695+:108980008C83442C0A000C5B3C196C628F88005865
61696+:108990003C0780083C0C8000240B0050240A000196
61697+:1089A000AD820020A0EB0000A0EA000191030004CA
61698+:1089B000A0E3001891040005A0E400199106000648
61699+:1089C0003C04080024845B6CA0E6001A91020007B6
61700+:1089D0003C06080024C65B68A0E2001B9105000865
61701+:1089E000A0E5001C911F0009A0FF001D9119000ABD
61702+:1089F000A0F9001E9118000BA0F8001F9112000CA6
61703+:108A0000A0F200209111000DA0F100219110000EA4
61704+:108A1000A0F00022910F000FA0EF0023910E001094
61705+:108A2000A0EE0024910D0011A0ED0025950C00147E
61706+:108A3000A4EC0028950B00168F8A00708F920078A6
61707+:108A4000A4EB002A95030018000A10C02545000178
61708+:108A5000A4E3002C8D1F001C0044C0210046C82147
61709+:108A600030A5000FAF3F0000AF09000010B20006B4
61710+:108A7000AF850070000038218D05001C01202021E9
61711+:108A80000A000BB32406000124AD000131A7000F3A
61712+:108A9000AF8700780A000CF9000038213C06080076
61713+:108AA00024C65B680086902100003821ACA000003D
61714+:108AB0000A000B8CAE4000003C0482013C036000C5
61715+:108AC00034820E02AC603D68AF80009803E000087D
61716+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
61717+:108AE000001018422C620041AFBF00141440000275
61718+:108AF00024040080240300403C010800AC300060E6
61719+:108B00003C010800AC2300640E000F7500602821B2
61720+:108B1000244802BF2409FF8001092824001039805D
61721+:108B2000001030408FBF00148FB0001000A720212C
61722+:108B300000861821AF8300803C010800AC25005856
61723+:108B40003C010800AC24005C03E0000827BD0018CD
61724+:108B5000308300FF30C6FFFF30E400FF3C08800098
61725+:108B60008D0201B80440FFFE000354000144382583
61726+:108B70003C09600000E920253C031000AD050180A0
61727+:108B8000AD060184AD04018803E00008AD0301B81F
61728+:108B90008F8500583C0A6012354800108CAC0004E8
61729+:108BA0003C0D600E35A60010318B00062D690001CA
61730+:108BB000AD0900C48CA70004ACC731808CA20008AA
61731+:108BC00094A40002ACC231848CA3001C0460000396
61732+:108BD000A784009003E00008000000008CAF00189C
61733+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
61734+:108BF0008F8500588F87FF288F86FF308CAE00044A
61735+:108C00003C0F601235E80010ACEE00788CAD000827
61736+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
61737+:108C2000ACCB004894CA00543C0208008C4200447B
61738+:108C300025490001A4C9005494C400543083FFFFA7
61739+:108C400010620017000000003C0208008C42004047
61740+:108C5000A4C200528CA30018ACE300308CA2001414
61741+:108C6000ACE2002C8CB90018ACF900388CB80014B8
61742+:108C700024050001ACF800348D0600BC50C5001975
61743+:108C80008D0200B48D0200B8A4E2004894E40048CC
61744+:108C9000A4E4004A94E800EA03E000083102FFFF80
61745+:108CA0003C0208008C420024A4C00054A4C200521C
61746+:108CB0008CA30018ACE300308CA20014ACE2002CB2
61747+:108CC0008CB90018ACF900388CB8001424050001E8
61748+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
61749+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
61750+:108CF00094E800EA03E000083102FFFF8F86005885
61751+:108D00003C0480008CC900088CC80008000929C0F8
61752+:108D1000000839C0AC87002090C30007306200040F
61753+:108D20001040003EAF85009490CB0007316A0008E8
61754+:108D30001140003D8F87FF2C8CCD000C8CCE001491
61755+:108D400001AE602B11800036000000008CC2000CC8
61756+:108D5000ACE200708CCB00188F85FF288F88FF3025
61757+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
61758+:108D70008CC9000CAD0900608CC4001CACA400D0F0
61759+:108D800090E3007C0062C824A0F9007C90D8000722
61760+:108D9000330F000811E000040000000090ED007C9B
61761+:108DA00035AC0001A0EC007C90CF000731EE000153
61762+:108DB00011C000060000000090E3007C241800347D
61763+:108DC00034790002A0F9007CACB800DC90C2000746
61764+:108DD0003046000210C000040000000090E8007C53
61765+:108DE00035040004A0E4007C90ED007D3C0B600E97
61766+:108DF000356A001031AC003FA0EC007D8D4931D4C4
61767+:108E00003127000110E00002240E0001A0AE00098D
61768+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
61769+:108E20000A000DAF8CC200140A000DB0ACE0007057
61770+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
61771+:108E4000AFB00010AFBF0020AFB10014918F00157C
61772+:108E50003C13600E3673001031EB000FA38B009CA7
61773+:108E60008D8F00048D8B0008959F0012959900103E
61774+:108E70009584001A9598001E958E001C33EDFFFF17
61775+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
61776+:108E90003C010800AC2D00243C010800AC29004432
61777+:108EA0003C010800AC2A0040AE683178AE67317CE6
61778+:108EB00091850015959100163C12601236520010F3
61779+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
61780+:108ED00091830014959F0018240600010066C804C1
61781+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
61782+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
61783+:108F0000918A00159584000E3C07600A314900FFE4
61784+:108F1000AF8B00883084FFFFAE4900C835110010C8
61785+:108F20000E000D1034F004103C0208008C4200606A
61786+:108F30003C0308008C6300643C0608008CC60058A3
61787+:108F40003C0508008CA5005C8F8400808FBF00204A
61788+:108F5000AE23004CAE65319CAE030054AE4500DC40
61789+:108F6000AE6231A0AE6331A4AE663198AE22004845
61790+:108F70008FB3001CAE0200508FB10014AE4200E06F
61791+:108F8000AE4300E4AE4600D88FB000108FB2001898
61792+:108F90000A00057D27BD0028978500929783007CF5
61793+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
61794+:108FB000240400058F900058104000552409000239
61795+:108FC0000E0006958F850080AF8200942404000374
61796+:108FD0001040004F240900023C0680000E00008172
61797+:108FE000ACC2002024070001240820001040004DDE
61798+:108FF00024040005978E00928F8AFF2C24090050CC
61799+:1090000025C50001A7850092A14900003C0D08007C
61800+:109010008DAD0064240380008F84FF28000D66005E
61801+:10902000AD4C0018A5400006954B000A8F85FF3017
61802+:109030002402FF8001633024A546000A915F000AE4
61803+:109040000000482103E2C825A159000AA0A0000899
61804+:10905000A140004CA08000D5961800029783009094
61805+:109060003C020004A49800EA960F00022418FFBFF7
61806+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
61807+:109080008E0C0008ACAC0040A4A00050A4A000547A
61808+:109090008E0B000C240C0030AC8B00288E060010C8
61809+:1090A000AC860024A480003EA487004EA487005014
61810+:1090B000A483003CAD420074AC8800D8ACA800602A
61811+:1090C000A08700FC909F00D433F9007FA09900D4C2
61812+:1090D000909000D402187824A08F00D4914E007C88
61813+:1090E00035CD0001A14D007C938B009CAD480070F4
61814+:1090F000AC8C00DCA08B00D68F8800888F87008422
61815+:10910000AC8800C4AC8700C8A5400078A540007AB0
61816+:109110008FBF00148FB000100120102103E0000861
61817+:1091200027BD00188F8500940E0007258F860080CC
61818+:109130000A000E9F2409000227BDFFE0AFB0001017
61819+:109140008F900058AFB10014AFBF00188E09000413
61820+:109150000E00054A000921C08E0800048F84FF28F4
61821+:109160008F82FF30000839C03C068000ACC7002069
61822+:10917000948500EA904300131460001C30B1FFFF97
61823+:109180008F8CFF2C918B0008316A00401540000B3A
61824+:10919000000000008E0D0004022030218FBF001857
61825+:1091A0008FB100148FB00010240400220000382179
61826+:1091B000000D29C00A000D2F27BD00200E000098C9
61827+:1091C000000000008E0D0004022030218FBF001827
61828+:1091D0008FB100148FB00010240400220000382149
61829+:1091E000000D29C00A000D2F27BD00200E000090A1
61830+:1091F000000000008E0D0004022030218FBF0018F7
61831+:109200008FB100148FB00010240400220000382118
61832+:10921000000D29C00A000D2F27BD002027BDFFE04B
61833+:10922000AFB200183092FFFFAFB00010AFBF001C0C
61834+:10923000AFB100141240001E000080218F8600583C
61835+:109240008CC500002403000600053F02000514023F
61836+:1092500030E4000714830016304500FF2CA80006F8
61837+:1092600011000040000558803C0C0800258C58BCBB
61838+:10927000016C50218D490000012000080000000011
61839+:109280008F8E0098240D000111CD005024020002A1
61840+:10929000AF820098260900013130FFFF24C800206A
61841+:1092A0000212202B010030211480FFE5AF88005806
61842+:1092B000020010218FBF001C8FB200188FB1001464
61843+:1092C0008FB0001003E0000827BD00209387007EC8
61844+:1092D00054E00034000030210E000DE700000000D3
61845+:1092E0008F8600580A000EFF240200018F87009825
61846+:1092F0002405000210E50031240400130000282199
61847+:1093000000003021240700010E000D2F0000000096
61848+:109310000A000F008F8600588F83009824020002F5
61849+:109320001462FFF6240400120E000D9A00000000E3
61850+:109330008F85009400403021240400120E000D2F70
61851+:10934000000038210A000F008F8600588F83009894
61852+:109350002411000310710029241F0002107FFFCE8A
61853+:1093600026090001240400100000282100003021FB
61854+:109370000A000F1D240700018F91009824060002A7
61855+:109380001626FFF9240400100E000E410000000014
61856+:10939000144000238F9800588F8600580A000EFF53
61857+:1093A00024020003240400140E000D2F00002821C5
61858+:1093B0008F8600580A000EFF240200020E000EA93C
61859+:1093C000000000000A000F008F8600580E000D3FBD
61860+:1093D00000000000241900022404001400002821C9
61861+:1093E0000000302100003821AF9900980E000D2FA9
61862+:1093F000000000000A000F008F8600580E000D5775
61863+:10940000000000008F8500942419000200403021E4
61864+:1094100024040010000038210A000F56AF9900986C
61865+:109420000040382124040010970F0002000028217A
61866+:109430000E000D2F31E6FFFF8F8600580A000F0047
61867+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
61868+:109450008C8500182402000100A61824AC83001893
61869+:1094600003E00008A08200053084FFFF30A5FFFF65
61870+:109470001080000700001821308200011040000217
61871+:1094800000042042006518211480FFFB00052840DD
61872+:1094900003E000080060102110C000070000000079
61873+:1094A0008CA2000024C6FFFF24A50004AC820000AB
61874+:1094B00014C0FFFB2484000403E000080000000047
61875+:1094C00010A0000824A3FFFFAC86000000000000ED
61876+:1094D000000000002402FFFF2463FFFF1462FFFA74
61877+:1094E0002484000403E0000800000000000411C010
61878+:1094F00003E000082442024027BDFFE8AFB000109F
61879+:1095000000808021AFBF00140E000F9600A0202124
61880+:1095100000504821240AFF808FBF00148FB0001034
61881+:10952000012A30243127007F3C08800A3C042100B6
61882+:1095300000E8102100C428253C03800027BD001846
61883+:10954000AC650024AF820038AC400000AC6500245C
61884+:1095500003E00008AC4000403C0D08008DAD005811
61885+:1095600000056180240AFF8001A45821016C482174
61886+:10957000012A30243127007F3C08800C3C04210064
61887+:1095800000E8102100C428253C038000AC650028B9
61888+:10959000AF82003403E00008AC40002430A5FFFF98
61889+:1095A0003C0680008CC201B80440FFFE3C086015F8
61890+:1095B00000A838253C031000ACC40180ACC0018475
61891+:1095C000ACC7018803E00008ACC301B83C0D08003B
61892+:1095D0008DAD005800056180240AFF8001A4582148
61893+:1095E000016C4021010A4824000931403107007F05
61894+:1095F00000C728253C04200000A418253C02800058
61895+:10960000AC43083003E00008AF80003427BDFFE81A
61896+:10961000AFB0001000808021AFBF00140E000F9685
61897+:1096200000A0202100504821240BFF80012B502452
61898+:10963000000A39403128007F3C0620008FBF00140B
61899+:109640008FB0001000E8282534C2000100A21825C0
61900+:109650003C04800027BD0018AC83083003E00008FC
61901+:10966000AF8000383C0580088CA700603C0680086D
61902+:109670000087102B144000112C8340008CA8006040
61903+:109680002D0340001060000F240340008CC90060CF
61904+:109690000089282B14A00002008018218CC30060D0
61905+:1096A00000035A42000B30803C0A0800254A59202A
61906+:1096B00000CA202103E000088C8200001460FFF340
61907+:1096C0002403400000035A42000B30803C0A08008B
61908+:1096D000254A592000CA202103E000088C8200009E
61909+:1096E0003C05800890A60008938400AB24C20001CA
61910+:1096F000304200FF3043007F1064000C0002382726
61911+:10970000A0A200083C0480008C85017804A0FFFE24
61912+:109710008F8A00A0240900023C081000AC8A014096
61913+:10972000A089014403E00008AC8801780A00101BFE
61914+:1097300030E2008027BDFFD8AFB200188F9200A49E
61915+:10974000AFBF0020AFB3001CAFB00010AFB100142A
61916+:109750008F9300348E5900283C1000803C0EFFEFA0
61917+:10976000AE7900008E580024A260000A35CDFFFFBC
61918+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
61919+:10978000A271000C8E6F000C3C080040A271000B0F
61920+:1097900001F06025018D4824012A382400E8302595
61921+:1097A000AE66000C8E450004AE6000183C0400FF5D
61922+:1097B000AE6500148E43002C3482FFFFA6600008C3
61923+:1097C0000062F824AE7F00108E5900088F9000A030
61924+:1097D000964E0012AE7900208E51000C31D83FFF1A
61925+:1097E00000187980AE7100248E4D001401F06021C4
61926+:1097F00031CB0001AE6D00288E4A0018000C41C22A
61927+:10980000000B4B80AE6A002C8E46001C01093821EB
61928+:10981000A667001CAE660030964500028E4400200C
61929+:10982000A665001EAE64003492430033306200042B
61930+:1098300054400006924700003C0280083443010077
61931+:109840008C7F00D0AE7F0030924700008F860038BA
61932+:10985000A0C700309245003330A4000250800007BA
61933+:10986000925100018F880038240BFF80910A00304C
61934+:10987000014B4825A1090030925100018F9000381A
61935+:10988000240CFFBF2404FFDFA21100318F8D0038AC
61936+:109890003C1880083711008091AF003C31EE007F0A
61937+:1098A000A1AE003C8F890038912B003C016C502404
61938+:1098B000A12A003C8F9F00388E68001493E6003C7C
61939+:1098C0002D0700010007114000C4282400A218251C
61940+:1098D000A3E3003C8F87003896590012A4F90032A8
61941+:1098E0008E450004922E007C30B0000300107823D7
61942+:1098F00031ED000300AD102131CC000215800002D3
61943+:1099000024460034244600303C0280083443008062
61944+:10991000907F007C00BFC824333800041700000289
61945+:1099200024C2000400C010218F98003824190002BE
61946+:10993000ACE20034A3190000924F003F8F8E003834
61947+:109940003C0C8008358B0080A1CF00018F9100383E
61948+:10995000924D003F8E440004A62D0002956A005CE3
61949+:109960000E000FF43150FFFF00024B800209382532
61950+:109970003C08420000E82825AE2500048E4400384B
61951+:109980008F850038ACA400188E460034ACA6001CAD
61952+:10999000ACA0000CACA00010A4A00014A4A0001661
61953+:1099A000A4A00020A4A00022ACA000248E62001479
61954+:1099B00050400001240200018FBF00208FB3001C23
61955+:1099C0008FB200188FB100148FB00010ACA2000845
61956+:1099D0000A00101327BD002827BDFFC83C058008DA
61957+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
61958+:1099F000AFB60028AFB50024AFB40020AFB3001C51
61959+:109A0000AFB20018AFB10014AFB00010948300786B
61960+:109A10009482007A104300512405FFFF0080F0215A
61961+:109A20000A0011230080B821108B004D8FBF003435
61962+:109A30008F8600A03C1808008F18005C2411FF805E
61963+:109A40003C1680000306782101F18024AED0002C62
61964+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
61965+:109A6000018D5021000B4840012AA82196A4000036
61966+:109A70003C0808008D0800582405FF8030953FFF02
61967+:109A800001061821001539800067C8210325F82434
61968+:109A90003C02010003E290253338007F3C11800C2A
61969+:109AA000AED20028031190219250000D320F000415
61970+:109AB00011E0003702E0982196E3007A96E8007AF8
61971+:109AC00096E5007A2404800031077FFF24E300013B
61972+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
61973+:109AE00096E6007A3C1408008E94006030D67FFF22
61974+:109AF00012D400C1000000008E5800188F8400A00E
61975+:109B000002A028212713FFFF0E000FCEAE53002C1A
61976+:109B100097D5007897D4007A12950010000028217C
61977+:109B20003C098008352401003C0A8008914800085F
61978+:109B3000908700D53114007F30E400FF0284302B81
61979+:109B400014C0FFB9268B0001938E00AB268C000158
61980+:109B5000008E682115ACFFB78F8600A08FBF003440
61981+:109B60008FBE00308FB7002C8FB600288FB5002431
61982+:109B70008FB400208FB3001C8FB200188FB1001477
61983+:109B80008FB0001000A0102103E0000827BD0038AE
61984+:109B900000C020210E000F99028028218E4B00105A
61985+:109BA0008E4C00308F84003824090002016C502351
61986+:109BB000AE4A0010A089000096E3005C8E4400309D
61987+:109BC0008F9100380E000FF43070FFFF00024380C9
61988+:109BD000020838253C02420000E22825AE25000498
61989+:109BE0008E5F00048F8A00388E590000240B000815
61990+:109BF000AD5F001CAD590018AD40000CAD40001029
61991+:109C00009246000A240400052408C00030D000FF5A
61992+:109C1000A550001496580008A55800169251000A45
61993+:109C20003C188008322F00FFA54F0020964E0008F8
61994+:109C300037110100A54E0022AD400024924D000BCB
61995+:109C400031AC00FFA54C0002A14B00018E49003051
61996+:109C50008F830038240BFFBFAC690008A06400307C
61997+:109C60008F9000382403FFDF9607003200E8282495
61998+:109C700000B51025A6020032921F003233F9003FD2
61999+:109C800037260040A20600328F8C0038AD800034A9
62000+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
62001+:109CA00031CD007FA18D003C8F84003835EEFFFF61
62002+:109CB000908A003C014B4824A089003C8F850038E5
62003+:109CC00090A8003C01033824A0A7003C8E42003439
62004+:109CD0008F9100383C038008AE2200408E59002C42
62005+:109CE0008E5F0030033F3023AE26004492300048A0
62006+:109CF0003218007FA23800488F8800388E4D00301F
62007+:109D00008D0C004801AE582401965024014B482583
62008+:109D1000AD0900489244000AA104004C964700088F
62009+:109D20008F850038A4A7004E8E5000308E4400303E
62010+:109D30000E0003818C65006092F9007C0002F940FE
62011+:109D4000004028210002110003E2302133360002D6
62012+:109D500012C00003020680210005B0800216802197
62013+:109D6000926D007C31B30004126000020005708027
62014+:109D7000020E80218E4B00308F8800382405800031
62015+:109D8000316A0003000A4823312400030204182129
62016+:109D9000AD03003496E4007A96F0007A96F1007AEA
62017+:109DA00032027FFF2447000130FF7FFF0225C824D5
62018+:109DB000033F3025A6E6007A96F8007A3C120800A8
62019+:109DC0008E520060330F7FFF11F200180000000078
62020+:109DD0008F8400A00E000FCE02A028218F8400A047
62021+:109DE0000E000FDE028028210E001013000000007C
62022+:109DF0000A00111F0000000096F1007A022480245E
62023+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
62024+:109E1000000E69C2000D6027000C51C03169007F3F
62025+:109E2000012A20250A001119A2E4007A96E6007A98
62026+:109E300000C5C024A6F8007A92EF007A92F3007A67
62027+:109E400031F200FF001271C2000E6827000DB1C090
62028+:109E5000326C007F01962825A2E5007A0A0011D015
62029+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
62030+:109E7000AC640018AC65001C03E000088C620014A0
62031+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
62032+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
62033+:109EA000AFB30044AFB20040AFB1003CAFB0003838
62034+:109EB00034C80100910500D590C700083084FFFF29
62035+:109EC00030A500FF30E2007F0045182AAFA4001043
62036+:109ED000A7A00018A7A0002610600055AFA000148E
62037+:109EE00090CA00083149007F00A9302324D3FFFF26
62038+:109EF0000013802B8FB400100014902B02128824C2
62039+:109F0000522000888FB300143C03800894790052DB
62040+:109F1000947E00508FB60010033EC0230018BC0092
62041+:109F2000001714030016FC0002C2A82A16A00002A3
62042+:109F3000001F2C030040282100133C0000072403CD
62043+:109F400000A4102A5440000100A020212885000907
62044+:109F500014A000020080A021241400083C0C8008FA
62045+:109F60008D860048001459808D88004C3C03800089
62046+:109F70003169FFFF3C0A0010012A202534710400DA
62047+:109F8000AC660038AF9100A4AC68003CAC64003013
62048+:109F900000000000000000000000000000000000C1
62049+:109FA00000000000000000000000000000000000B1
62050+:109FB0008C6E000031CD002011A0FFFD0014782A26
62051+:109FC00001F01024104000390000A8213C16800840
62052+:109FD00092D700083C1280008E44010032F6007FC8
62053+:109FE0000E000F9902C028218E3900108E44010006
62054+:109FF0000000902133373FFF0E000FB102E028210F
62055+:10A00000923800003302003F2C500008520000102C
62056+:10A0100000008821000210803C030800246358E4FB
62057+:10A020000043F8218FFE000003C00008000000007C
62058+:10A0300090CF0008938C00AB31EE007F00AE682318
62059+:10A04000018D58210A0012172573FFFF0000882197
62060+:10A050003C1E80008FC401000E000FCE02E02821BC
62061+:10A060008FC401000E000FDE02C028211220000F55
62062+:10A070000013802B8F8B00A426A400010004AC00E9
62063+:10A08000027298230015AC032578004002B4B02A70
62064+:10A090000013802B241700010300882102D0102414
62065+:10A0A000AF9800A41440FFC9AFB700143C07800864
62066+:10A0B00094E200508FAE00103C05800002A288217F
62067+:10A0C0003C060020A4F10050ACA6003094F40050EF
62068+:10A0D00094EF005201D51823306CFFFF11F4001EDD
62069+:10A0E000AFAC00108CEF004C001561808CF500487F
62070+:10A0F00001EC28210000202100AC582B02A4C02133
62071+:10A10000030BB021ACE5004CACF600488FB4001056
62072+:10A110000014902B021288241620FF7C3C03800838
62073+:10A120008FB300148FBF005C8FBE00583A620001ED
62074+:10A130008FB700548FB600508FB5004C8FB40048D5
62075+:10A140008FB300448FB200408FB1003C8FB0003815
62076+:10A1500003E0000827BD006094FE00548CF2004428
62077+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
62078+:10A170008CE800448CAD003C010D50231940003B9D
62079+:10A18000000000008CF7004026E20001ACA200387D
62080+:10A190003C05005034A700103C038000AC67003041
62081+:10A1A00000000000000000000000000000000000AF
62082+:10A1B000000000000000000000000000000000009F
62083+:10A1C0008C7800003316002012C0FFFD3C1180087F
62084+:10A1D000962200543C1580003C068008304E000159
62085+:10A1E000000E18C0007578218DEC04003C070800B3
62086+:10A1F0008CE700443C040020ACCC00488DF40404FF
62087+:10A20000240B0001ACD4004C10EB0260AEA4003073
62088+:10A21000963900523C0508008CA5004000B99021F9
62089+:10A22000A6320052963F005427ED0001A62D00549F
62090+:10A230009626005430C4FFFF5487FF2F8FB40010C0
62091+:10A2400030A5FFFF0E0011F4A62000543C070800C3
62092+:10A250008CE70024963E00520047B82303D74823DA
62093+:10A26000A62900520A0012198FB400108CE2004097
62094+:10A270000A0012BE00000000922400012407000121
62095+:10A280003085007F14A7001C97AD00268E2B00148C
62096+:10A29000240CC000316A3FFF01AC48243C06080092
62097+:10A2A0008CC60060012A402531043FFF0086882BC0
62098+:10A2B00012200011A7A800263C0508008CA5005814
62099+:10A2C0008F9100A0000439802402FF8000B1182182
62100+:10A2D0000067F82103E2F02433F8007F3C1280008D
62101+:10A2E0003C19800EAE5E002C0319702191D0000D38
62102+:10A2F000360F0004A1CF000D0E001028241200011B
62103+:10A30000241100013C1E80008FC401000E000FCEFE
62104+:10A3100002E028218FC401000E000FDE02C02821B8
62105+:10A320001620FF558F8B00A40A0012860013802B85
62106+:10A330008F8600A490C80001310400201080019194
62107+:10A34000241000013C048008348B0080916A007C5A
62108+:10A350008F9E0034AFA0002C314900011120000F66
62109+:10A36000AFB000288CCD00148C8E006001AE602B45
62110+:10A370001580000201A038218C8700603C188008FD
62111+:10A38000370300808C70007000F0782B15E000021D
62112+:10A3900000E020218C640070AFA4002C3C028008F7
62113+:10A3A000344500808CD200148CBF0070025FC82B33
62114+:10A3B00017200002024020218CA400708FA7002CDF
62115+:10A3C0000087182310600003AFA3003024050002AB
62116+:10A3D000AFA500288FA400280264882B162000BA9D
62117+:10A3E000000018218CD000388FCE000C3C0F00806C
62118+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
62119+:10A40000AFCD000490CA003F3586FFFF01662024CF
62120+:10A410003C0900203C08FFEFA3CA000B0089382547
62121+:10A420003511FFFF00F118243C0500088F8700A4B8
62122+:10A430000065C825AFD9000C8CE20014AFC000182D
62123+:10A440008FA60030AFC200148CF800188FB0002C1B
62124+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
62125+:10A4600003326824AFCF00248CEC000C020670216C
62126+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
62127+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
62128+:10A49000014B48230126402311000011AFC80010D2
62129+:10A4A00090EB003D8FC900048FC80000000B5100E5
62130+:10A4B000012A28210000102100AA882B010218215E
62131+:10A4C0000071F821AFC50004AFDF000090F2003D3D
62132+:10A4D000A3D2000A8F9900A497380006A7D80008D5
62133+:10A4E0008F910038240800023C038008A228000055
62134+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
62135+:10A500000E000FF48F9200380002CB808F8500A4DC
62136+:10A51000021978253C18420001F87025AE4E00045F
62137+:10A520008F8400388CAD0038AC8D00188CAC0034B2
62138+:10A53000AC8C001CAC80000CAC800010A48000141B
62139+:10A54000A4800016A4800020A4800022AC800024F7
62140+:10A5500090A6003F8FA7002CA486000250E0019235
62141+:10A56000240700018FA200305040000290A2003D5D
62142+:10A5700090A2003E244A0001A08A00018F84003886
62143+:10A580008FA9002CAC8900083C128008364D008051
62144+:10A5900091AC007C3186000214C000022407003414
62145+:10A5A000240700308F8500A43C198008373F0080C5
62146+:10A5B00090B0000093F9007C240E0004A0900030BD
62147+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
62148+:10A5D0003304000301C46023A1B200318F8E003820
62149+:10A5E0008F8600A42402C00095CA003294C90012CC
62150+:10A5F0008FAB002C0142402431233FFF010388250B
62151+:10A60000A5D1003291D000323185000300EBF82152
62152+:10A610003218003F370F0040A1CF00328FA4002C2A
62153+:10A6200003E5382133280004108000028F850038AC
62154+:10A6300000E838213C0A8008ACA700343549010005
62155+:10A640008D2800D08FA3002C2419FFBFACA80038A0
62156+:10A6500090B1003C2C640001240FFFDF3227007F03
62157+:10A66000A0A7003C8F98003800049140931F003C45
62158+:10A6700003F98024A310003C8F8C0038918E003C9D
62159+:10A6800001CF682401B23025A186003C8F8900A447
62160+:10A690008F8800388D2B0020AD0B00408D220024C8
62161+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
62162+:10A6B0000E001013AD03004C8FB1002824070002D8
62163+:10A6C000122700118FA300280003282B00058023E8
62164+:10A6D0000270982400608021006090210A00126FAF
62165+:10A6E0000010882B962900128F8400A00000902172
62166+:10A6F0003125FFFFA7A900180E000FC22411000189
62167+:10A700000A00131D3C1E80003C0B80003C12800898
62168+:10A710008D640100924900088F92FF340E000F995A
62169+:10A720003125007F8F9900388FA700288FA4003033
62170+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
62171+:10A740008F91003800026B80020D80253C0842008A
62172+:10A750008F8D00A402085025AE2A00048DA5003874
62173+:10A760008F8A003800007821000F1100AD450018D5
62174+:10A770008DB800343C047FFF3488FFFFAD58001CC7
62175+:10A7800091A6003E8D4C001C8D4900180006190052
62176+:10A79000000677020183C821004E58250323882B29
62177+:10A7A000012B382100F1F821AD59001CAD5F0018D4
62178+:10A7B000AD40000CAD40001091B0003E8FA40030C1
62179+:10A7C00024090005A550001495A500042419C00013
62180+:10A7D00000884024A545001691B8003EA5580020E9
62181+:10A7E00095AF0004A54F0022AD40002491AE003F7C
62182+:10A7F000A54E000291A6003E91AC003D01861023BB
62183+:10A80000244B0001A14B00018F9100388FA3003031
62184+:10A810003C028008344B0100AE230008A22900301E
62185+:10A820008F8C00388F8700A4959F003294F000121F
62186+:10A830002407FFBF033FC02432053FFF03057825EF
62187+:10A84000A58F0032918E00322418FFDF31CD003FFA
62188+:10A8500035A60040A18600328F910038240DFFFFFD
62189+:10A86000240CFF80AE2000348D6A00D0AE2A003860
62190+:10A870009223003C3069007FA229003C8F90003871
62191+:10A880003C0380009219003C0327F824A21F003CDF
62192+:10A890008F8E003891C5003C00B87824A1CF003CD1
62193+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
62194+:10A8B000AD46004491420048004C5825A14B004849
62195+:10A8C0008F9000388F9900A48E09004801238824B6
62196+:10A8D00002283825AE070048933F003EA21F004CD7
62197+:10A8E0008F9800A48F8F003897050004A5E5004ECF
62198+:10A8F0000E0003818DC500609246007C8FAC003055
62199+:10A9000000026940000291000040282130CB000283
62200+:10A9100001B21021156000AA018230213C0E80088E
62201+:10A9200035C20080904C007C31830004106000032D
62202+:10A930008FB900300005788000CF3021241F00043B
62203+:10A940008F910038332D000303ED8023320800037C
62204+:10A9500000C85021AE2A00343C188000A7C500383A
62205+:10A960003C0680088F04010090DE00080E000FDE18
62206+:10A9700033C5007F0E001013000000000A00140D04
62207+:10A980008FA300288F9800348CC90038241F00033F
62208+:10A99000A7000008AF0900008CC50034A300000A1E
62209+:10A9A0008F9900A4AF0500043C080080932D003F60
62210+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
62211+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
62212+:10A9D00003D170243646FFFF01C61824AF03000CD4
62213+:10A9E0008F2C0014972900128F8400A0AF0C001048
62214+:10A9F0008F2F0014AF000018AF000020AF0F00141D
62215+:10AA0000AF0000248F270018312F3FFF000F59801F
62216+:10AA1000AF0700288F2500080164F821312D0001BF
62217+:10AA2000AF0500308F31000C8F920038001F51C2EB
62218+:10AA3000000D438001481021241E00023C068008BE
62219+:10AA4000A702001CA7000034AF11002CA25E00007A
62220+:10AA500034D20080964E005C8F9900383C0342004F
62221+:10AA600031CCFFFF01833825AF2700048F8B00A472
62222+:10AA7000240500012402C0008D640038240700343E
62223+:10AA8000AF2400188D690034AF29001CAF20000CE2
62224+:10AA9000AF200010A7200014A7200016A720002038
62225+:10AAA000A7200022AF200024A7300002A325000128
62226+:10AAB0008F8800388F9F00A4AD10000893ED000030
62227+:10AAC000A10D00308F8A00A48F98003891510001A9
62228+:10AAD000A31100318F8B0038957E003203C27024A1
62229+:10AAE00001CF6025A56C0032916300323064003FD5
62230+:10AAF000A16400329249007C3125000214A00002BA
62231+:10AB00008F840038240700303C198008AC8700345B
62232+:10AB1000373201008E5F00D0240AFFBF020090216F
62233+:10AB2000AC9F0038908D003C31A8007FA088003C8D
62234+:10AB30008F9E003893C2003C004A8824A3D1003C79
62235+:10AB40008F8300380010882B9066003C34CE0020A4
62236+:10AB5000A06E003C8F8400A48F9800388C8C00205D
62237+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
62238+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
62239+:10AB80003C1E80000A0012700000000094C80052B1
62240+:10AB90003C0A08008D4A002401488821A4D10052B3
62241+:10ABA0000A0012198FB40010A08700018F840038AA
62242+:10ABB000240B0001AC8B00080A0013BE3C12800875
62243+:10ABC000000520800A0014A200C4302127BDFFE048
62244+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
62245+:10ABE000AFB1001435B200808E4C001835A80100BA
62246+:10ABF000964B000695A70050910900FC000C5602E8
62247+:10AC0000016728233143007F312600FF240200031F
62248+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
62249+:10AC2000910600FC2412000530C200FF10520033D0
62250+:10AC300000000000160000098FBF001C8FB2001832
62251+:10AC40008FB100148FB00010240D0C003C0C80005C
62252+:10AC500027BD002003E00008AD8D00240E0011FB8D
62253+:10AC6000020020218FBF001C8FB200188FB100148A
62254+:10AC70008FB00010240D0C003C0C800027BD00207C
62255+:10AC800003E00008AD8D0024965800789651007AB4
62256+:10AC9000924E007D0238782631E8FFFF31C400C0B3
62257+:10ACA000148000092D11000116000037000000007B
62258+:10ACB0005620FFE28FBF001C0E0010D100000000E4
62259+:10ACC0000A00156A8FBF001C1620FFDA0000000082
62260+:10ACD0000E0010D1000000001440FFD88FBF001CF0
62261+:10ACE0001600002200000000925F007D33E2003F6A
62262+:10ACF000A242007D0A00156A8FBF001C950900EA78
62263+:10AD00008F86008000802821240400050E0007257E
62264+:10AD10003130FFFF978300923C0480002465FFFFE1
62265+:10AD2000A78500928C8A01B80540FFFE0000000054
62266+:10AD3000AC8001808FBF001CAC9001848FB20018E2
62267+:10AD40008FB100148FB000103C0760133C0B100053
62268+:10AD5000240D0C003C0C800027BD0020AC8701882E
62269+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
62270+:10AD7000020020215040FFB18FBF001C925F007D78
62271+:10AD80000A00159733E2003F0E0011FB020020215C
62272+:10AD90001440FFAA8FBF001C122000070000000013
62273+:10ADA0009259007D3330003F36020040A242007DC0
62274+:10ADB0000A00156A8FBF001C0E0010D100000000B1
62275+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
62276+:10ADD0000A0015C636020040000000000000001BFB
62277+:10ADE0000000000F0000000A00000008000000063C
62278+:10ADF0000000000500000005000000040000000441
62279+:10AE00000000000300000003000000030000000336
62280+:10AE10000000000300000002000000020000000229
62281+:10AE2000000000020000000200000002000000021A
62282+:10AE3000000000020000000200000002000000020A
62283+:10AE400000000002000000020000000200000002FA
62284+:10AE50000000000100000001000000018008010066
62285+:10AE6000800800808008000000000C000000308096
62286+:10AE7000080011D00800127C08001294080012A8E3
62287+:10AE8000080012BC080011D0080011D0080012F010
62288+:10AE90000800132C080013400800138808001A8CBF
62289+:10AEA00008001A8C08001AC408001AC408001AD82E
62290+:10AEB00008001AA808001D0008001CCC08001D5836
62291+:10AEC00008001D5808001DE008001D108008024001
62292+:10AED000080027340800256C0800275C080027F4C8
62293+:10AEE0000800293C0800298808002AAC080029B479
62294+:10AEF00008002A38080025DC08002EDC08002EA4F3
62295+:10AF000008002588080025880800258808002B20CF
62296+:10AF100008002B20080025880800258808002DD06F
62297+:10AF2000080025880800258808002588080025884D
62298+:10AF300008002E0C080025880800258808002588B0
62299+:10AF4000080025880800258808002588080025882D
62300+:10AF5000080025880800258808002588080025881D
62301+:10AF6000080025880800258808002588080029A8E9
62302+:10AF7000080025880800258808002E680800258814
62303+:10AF800008002588080025880800258808002588ED
62304+:10AF900008002588080025880800258808002588DD
62305+:10AFA00008002588080025880800258808002588CD
62306+:10AFB00008002588080025880800258808002588BD
62307+:10AFC00008002CF4080025880800258808002C6853
62308+:10AFD00008002BC408003CE408003CB808003C848E
62309+:10AFE00008003C5808003C3808003BEC8008010091
62310+:10AFF00080080080800800008008008008004C6401
62311+:10B0000008004C9C08004BE408004C6408004C64A9
62312+:10B01000080049B808004C64080050500A000C842D
62313+:10B0200000000000000000000000000D7278703683
62314+:10B030002E322E31620000000602010300000000E3
62315+:10B0400000000001000000000000000000000000FF
62316+:10B0500000000000000000000000000000000000F0
62317+:10B0600000000000000000000000000000000000E0
62318+:10B0700000000000000000000000000000000000D0
62319+:10B0800000000000000000000000000000000000C0
62320+:10B0900000000000000000000000000000000000B0
62321+:10B0A00000000000000000000000000000000000A0
62322+:10B0B0000000000000000000000000000000000090
62323+:10B0C0000000000000000000000000000000000080
62324+:10B0D0000000000000000000000000000000000070
62325+:10B0E0000000000000000000000000000000000060
62326+:10B0F0000000000000000000000000000000000050
62327+:10B10000000000000000000000000000000000003F
62328+:10B11000000000000000000000000000000000002F
62329+:10B12000000000000000000000000000000000001F
62330+:10B13000000000000000000000000000000000000F
62331+:10B1400000000000000000000000000000000000FF
62332+:10B1500000000000000000000000000000000000EF
62333+:10B1600000000000000000000000000000000000DF
62334+:10B1700000000000000000000000000000000000CF
62335+:10B1800000000000000000000000000000000000BF
62336+:10B1900000000000000000000000000000000000AF
62337+:10B1A000000000000000000000000000000000009F
62338+:10B1B000000000000000000000000000000000008F
62339+:10B1C000000000000000000000000000000000007F
62340+:10B1D000000000000000000000000000000000006F
62341+:10B1E000000000000000000000000000000000005F
62342+:10B1F000000000000000000000000000000000004F
62343+:10B20000000000000000000000000000000000003E
62344+:10B21000000000000000000000000000000000002E
62345+:10B22000000000000000000000000000000000001E
62346+:10B23000000000000000000000000000000000000E
62347+:10B2400000000000000000000000000000000000FE
62348+:10B2500000000000000000000000000000000000EE
62349+:10B2600000000000000000000000000000000000DE
62350+:10B2700000000000000000000000000000000000CE
62351+:10B2800000000000000000000000000000000000BE
62352+:10B2900000000000000000000000000000000000AE
62353+:10B2A000000000000000000000000000000000009E
62354+:10B2B000000000000000000000000000000000008E
62355+:10B2C000000000000000000000000000000000007E
62356+:10B2D000000000000000000000000000000000006E
62357+:10B2E000000000000000000000000000000000005E
62358+:10B2F000000000000000000000000000000000004E
62359+:10B30000000000000000000000000000000000003D
62360+:10B31000000000000000000000000000000000002D
62361+:10B32000000000000000000000000000000000001D
62362+:10B33000000000000000000000000000000000000D
62363+:10B3400000000000000000000000000000000000FD
62364+:10B3500000000000000000000000000000000000ED
62365+:10B3600000000000000000000000000000000000DD
62366+:10B3700000000000000000000000000000000000CD
62367+:10B3800000000000000000000000000000000000BD
62368+:10B3900000000000000000000000000000000000AD
62369+:10B3A000000000000000000000000000000000009D
62370+:10B3B000000000000000000000000000000000008D
62371+:10B3C000000000000000000000000000000000007D
62372+:10B3D000000000000000000000000000000000006D
62373+:10B3E000000000000000000000000000000000005D
62374+:10B3F000000000000000000000000000000000004D
62375+:10B40000000000000000000000000000000000003C
62376+:10B41000000000000000000000000000000000002C
62377+:10B42000000000000000000000000000000000001C
62378+:10B43000000000000000000000000000000000000C
62379+:10B4400000000000000000000000000000000000FC
62380+:10B4500000000000000000000000000000000000EC
62381+:10B4600000000000000000000000000000000000DC
62382+:10B4700000000000000000000000000000000000CC
62383+:10B4800000000000000000000000000000000000BC
62384+:10B4900000000000000000000000000000000000AC
62385+:10B4A000000000000000000000000000000000009C
62386+:10B4B000000000000000000000000000000000008C
62387+:10B4C000000000000000000000000000000000007C
62388+:10B4D000000000000000000000000000000000006C
62389+:10B4E000000000000000000000000000000000005C
62390+:10B4F000000000000000000000000000000000004C
62391+:10B50000000000000000000000000000000000003B
62392+:10B51000000000000000000000000000000000002B
62393+:10B52000000000000000000000000000000000001B
62394+:10B53000000000000000000000000000000000000B
62395+:10B5400000000000000000000000000000000000FB
62396+:10B5500000000000000000000000000000000000EB
62397+:10B5600000000000000000000000000000000000DB
62398+:10B5700000000000000000000000000000000000CB
62399+:10B5800000000000000000000000000000000000BB
62400+:10B5900000000000000000000000000000000000AB
62401+:10B5A000000000000000000000000000000000009B
62402+:10B5B000000000000000000000000000000000008B
62403+:10B5C000000000000000000000000000000000007B
62404+:10B5D000000000000000000000000000000000006B
62405+:10B5E000000000000000000000000000000000005B
62406+:10B5F000000000000000000000000000000000004B
62407+:10B60000000000000000000000000000000000003A
62408+:10B61000000000000000000000000000000000002A
62409+:10B62000000000000000000000000000000000001A
62410+:10B63000000000000000000000000000000000000A
62411+:10B6400000000000000000000000000000000000FA
62412+:10B6500000000000000000000000000000000000EA
62413+:10B6600000000000000000000000000000000000DA
62414+:10B6700000000000000000000000000000000000CA
62415+:10B6800000000000000000000000000000000000BA
62416+:10B6900000000000000000000000000000000000AA
62417+:10B6A000000000000000000000000000000000009A
62418+:10B6B000000000000000000000000000000000008A
62419+:10B6C000000000000000000000000000000000007A
62420+:10B6D000000000000000000000000000000000006A
62421+:10B6E000000000000000000000000000000000005A
62422+:10B6F000000000000000000000000000000000004A
62423+:10B700000000000000000000000000000000000039
62424+:10B710000000000000000000000000000000000029
62425+:10B720000000000000000000000000000000000019
62426+:10B730000000000000000000000000000000000009
62427+:10B7400000000000000000000000000000000000F9
62428+:10B7500000000000000000000000000000000000E9
62429+:10B7600000000000000000000000000000000000D9
62430+:10B7700000000000000000000000000000000000C9
62431+:10B7800000000000000000000000000000000000B9
62432+:10B7900000000000000000000000000000000000A9
62433+:10B7A0000000000000000000000000000000000099
62434+:10B7B0000000000000000000000000000000000089
62435+:10B7C0000000000000000000000000000000000079
62436+:10B7D0000000000000000000000000000000000069
62437+:10B7E0000000000000000000000000000000000059
62438+:10B7F0000000000000000000000000000000000049
62439+:10B800000000000000000000000000000000000038
62440+:10B810000000000000000000000000000000000028
62441+:10B820000000000000000000000000000000000018
62442+:10B830000000000000000000000000000000000008
62443+:10B8400000000000000000000000000000000000F8
62444+:10B8500000000000000000000000000000000000E8
62445+:10B8600000000000000000000000000000000000D8
62446+:10B8700000000000000000000000000000000000C8
62447+:10B8800000000000000000000000000000000000B8
62448+:10B8900000000000000000000000000000000000A8
62449+:10B8A0000000000000000000000000000000000098
62450+:10B8B0000000000000000000000000000000000088
62451+:10B8C0000000000000000000000000000000000078
62452+:10B8D0000000000000000000000000000000000068
62453+:10B8E0000000000000000000000000000000000058
62454+:10B8F0000000000000000000000000000000000048
62455+:10B900000000000000000000000000000000000037
62456+:10B910000000000000000000000000000000000027
62457+:10B920000000000000000000000000000000000017
62458+:10B930000000000000000000000000000000000007
62459+:10B9400000000000000000000000000000000000F7
62460+:10B9500000000000000000000000000000000000E7
62461+:10B9600000000000000000000000000000000000D7
62462+:10B9700000000000000000000000000000000000C7
62463+:10B9800000000000000000000000000000000000B7
62464+:10B9900000000000000000000000000000000000A7
62465+:10B9A0000000000000000000000000000000000097
62466+:10B9B0000000000000000000000000000000000087
62467+:10B9C0000000000000000000000000000000000077
62468+:10B9D0000000000000000000000000000000000067
62469+:10B9E0000000000000000000000000000000000057
62470+:10B9F0000000000000000000000000000000000047
62471+:10BA00000000000000000000000000000000000036
62472+:10BA10000000000000000000000000000000000026
62473+:10BA20000000000000000000000000000000000016
62474+:10BA30000000000000000000000000000000000006
62475+:10BA400000000000000000000000000000000000F6
62476+:10BA500000000000000000000000000000000000E6
62477+:10BA600000000000000000000000000000000000D6
62478+:10BA700000000000000000000000000000000000C6
62479+:10BA800000000000000000000000000000000000B6
62480+:10BA900000000000000000000000000000000000A6
62481+:10BAA0000000000000000000000000000000000096
62482+:10BAB0000000000000000000000000000000000086
62483+:10BAC0000000000000000000000000000000000076
62484+:10BAD0000000000000000000000000000000000066
62485+:10BAE0000000000000000000000000000000000056
62486+:10BAF0000000000000000000000000000000000046
62487+:10BB00000000000000000000000000000000000035
62488+:10BB10000000000000000000000000000000000025
62489+:10BB20000000000000000000000000000000000015
62490+:10BB30000000000000000000000000000000000005
62491+:10BB400000000000000000000000000000000000F5
62492+:10BB500000000000000000000000000000000000E5
62493+:10BB600000000000000000000000000000000000D5
62494+:10BB700000000000000000000000000000000000C5
62495+:10BB800000000000000000000000000000000000B5
62496+:10BB900000000000000000000000000000000000A5
62497+:10BBA0000000000000000000000000000000000095
62498+:10BBB0000000000000000000000000000000000085
62499+:10BBC0000000000000000000000000000000000075
62500+:10BBD0000000000000000000000000000000000065
62501+:10BBE0000000000000000000000000000000000055
62502+:10BBF0000000000000000000000000000000000045
62503+:10BC00000000000000000000000000000000000034
62504+:10BC10000000000000000000000000000000000024
62505+:10BC20000000000000000000000000000000000014
62506+:10BC30000000000000000000000000000000000004
62507+:10BC400000000000000000000000000000000000F4
62508+:10BC500000000000000000000000000000000000E4
62509+:10BC600000000000000000000000000000000000D4
62510+:10BC700000000000000000000000000000000000C4
62511+:10BC800000000000000000000000000000000000B4
62512+:10BC900000000000000000000000000000000000A4
62513+:10BCA0000000000000000000000000000000000094
62514+:10BCB0000000000000000000000000000000000084
62515+:10BCC0000000000000000000000000000000000074
62516+:10BCD0000000000000000000000000000000000064
62517+:10BCE0000000000000000000000000000000000054
62518+:10BCF0000000000000000000000000000000000044
62519+:10BD00000000000000000000000000000000000033
62520+:10BD10000000000000000000000000000000000023
62521+:10BD20000000000000000000000000000000000013
62522+:10BD30000000000000000000000000000000000003
62523+:10BD400000000000000000000000000000000000F3
62524+:10BD500000000000000000000000000000000000E3
62525+:10BD600000000000000000000000000000000000D3
62526+:10BD700000000000000000000000000000000000C3
62527+:10BD800000000000000000000000000000000000B3
62528+:10BD900000000000000000000000000000000000A3
62529+:10BDA0000000000000000000000000000000000093
62530+:10BDB0000000000000000000000000000000000083
62531+:10BDC0000000000000000000000000000000000073
62532+:10BDD0000000000000000000000000000000000063
62533+:10BDE0000000000000000000000000000000000053
62534+:10BDF0000000000000000000000000000000000043
62535+:10BE00000000000000000000000000000000000032
62536+:10BE10000000000000000000000000000000000022
62537+:10BE20000000000000000000000000000000000012
62538+:10BE30000000000000000000000000000000000002
62539+:10BE400000000000000000000000000000000000F2
62540+:10BE500000000000000000000000000000000000E2
62541+:10BE600000000000000000000000000000000000D2
62542+:10BE700000000000000000000000000000000000C2
62543+:10BE800000000000000000000000000000000000B2
62544+:10BE900000000000000000000000000000000000A2
62545+:10BEA0000000000000000000000000000000000092
62546+:10BEB0000000000000000000000000000000000082
62547+:10BEC0000000000000000000000000000000000072
62548+:10BED0000000000000000000000000000000000062
62549+:10BEE0000000000000000000000000000000000052
62550+:10BEF0000000000000000000000000000000000042
62551+:10BF00000000000000000000000000000000000031
62552+:10BF10000000000000000000000000000000000021
62553+:10BF20000000000000000000000000000000000011
62554+:10BF30000000000000000000000000000000000001
62555+:10BF400000000000000000000000000000000000F1
62556+:10BF500000000000000000000000000000000000E1
62557+:10BF600000000000000000000000000000000000D1
62558+:10BF700000000000000000000000000000000000C1
62559+:10BF800000000000000000000000000000000000B1
62560+:10BF900000000000000000000000000000000000A1
62561+:10BFA0000000000000000000000000000000000091
62562+:10BFB0000000000000000000000000000000000081
62563+:10BFC0000000000000000000000000000000000071
62564+:10BFD0000000000000000000000000000000000061
62565+:10BFE0000000000000000000000000000000000051
62566+:10BFF0000000000000000000000000000000000041
62567+:10C000000000000000000000000000000000000030
62568+:10C010000000000000000000000000000000000020
62569+:10C020000000000000000000000000000000000010
62570+:10C030000000000000000000000000000000000000
62571+:10C0400000000000000000000000000000000000F0
62572+:10C0500000000000000000000000000000000000E0
62573+:10C0600000000000000000000000000000000000D0
62574+:10C0700000000000000000000000000000000000C0
62575+:10C0800000000000000000000000000000000000B0
62576+:10C0900000000000000000000000000000000000A0
62577+:10C0A0000000000000000000000000000000000090
62578+:10C0B0000000000000000000000000000000000080
62579+:10C0C0000000000000000000000000000000000070
62580+:10C0D0000000000000000000000000000000000060
62581+:10C0E0000000000000000000000000000000000050
62582+:10C0F0000000000000000000000000000000000040
62583+:10C10000000000000000000000000000000000002F
62584+:10C11000000000000000000000000000000000001F
62585+:10C12000000000000000000000000000000000000F
62586+:10C1300000000000000000000000000000000000FF
62587+:10C1400000000000000000000000000000000000EF
62588+:10C1500000000000000000000000000000000000DF
62589+:10C1600000000000000000000000000000000000CF
62590+:10C1700000000000000000000000000000000000BF
62591+:10C1800000000000000000000000000000000000AF
62592+:10C19000000000000000000000000000000000009F
62593+:10C1A000000000000000000000000000000000008F
62594+:10C1B000000000000000000000000000000000007F
62595+:10C1C000000000000000000000000000000000006F
62596+:10C1D000000000000000000000000000000000005F
62597+:10C1E000000000000000000000000000000000004F
62598+:10C1F000000000000000000000000000000000003F
62599+:10C20000000000000000000000000000000000002E
62600+:10C21000000000000000000000000000000000001E
62601+:10C22000000000000000000000000000000000000E
62602+:10C2300000000000000000000000000000000000FE
62603+:10C2400000000000000000000000000000000000EE
62604+:10C2500000000000000000000000000000000000DE
62605+:10C2600000000000000000000000000000000000CE
62606+:10C2700000000000000000000000000000000000BE
62607+:10C2800000000000000000000000000000000000AE
62608+:10C29000000000000000000000000000000000009E
62609+:10C2A000000000000000000000000000000000008E
62610+:10C2B000000000000000000000000000000000007E
62611+:10C2C000000000000000000000000000000000006E
62612+:10C2D000000000000000000000000000000000005E
62613+:10C2E000000000000000000000000000000000004E
62614+:10C2F000000000000000000000000000000000003E
62615+:10C30000000000000000000000000000000000002D
62616+:10C31000000000000000000000000000000000001D
62617+:10C32000000000000000000000000000000000000D
62618+:10C3300000000000000000000000000000000000FD
62619+:10C3400000000000000000000000000000000000ED
62620+:10C3500000000000000000000000000000000000DD
62621+:10C3600000000000000000000000000000000000CD
62622+:10C3700000000000000000000000000000000000BD
62623+:10C3800000000000000000000000000000000000AD
62624+:10C39000000000000000000000000000000000009D
62625+:10C3A000000000000000000000000000000000008D
62626+:10C3B000000000000000000000000000000000007D
62627+:10C3C000000000000000000000000000000000006D
62628+:10C3D000000000000000000000000000000000005D
62629+:10C3E000000000000000000000000000000000004D
62630+:10C3F000000000000000000000000000000000003D
62631+:10C40000000000000000000000000000000000002C
62632+:10C41000000000000000000000000000000000001C
62633+:10C42000000000000000000000000000000000000C
62634+:10C4300000000000000000000000000000000000FC
62635+:10C4400000000000000000000000000000000000EC
62636+:10C4500000000000000000000000000000000000DC
62637+:10C4600000000000000000000000000000000000CC
62638+:10C4700000000000000000000000000000000000BC
62639+:10C4800000000000000000000000000000000000AC
62640+:10C49000000000000000000000000000000000009C
62641+:10C4A000000000000000000000000000000000008C
62642+:10C4B000000000000000000000000000000000007C
62643+:10C4C000000000000000000000000000000000006C
62644+:10C4D000000000000000000000000000000000005C
62645+:10C4E000000000000000000000000000000000004C
62646+:10C4F000000000000000000000000000000000003C
62647+:10C50000000000000000000000000000000000002B
62648+:10C51000000000000000000000000000000000001B
62649+:10C52000000000000000000000000000000000000B
62650+:10C5300000000000000000000000000000000000FB
62651+:10C5400000000000000000000000000000000000EB
62652+:10C5500000000000000000000000000000000000DB
62653+:10C5600000000000000000000000000000000000CB
62654+:10C5700000000000000000000000000000000000BB
62655+:10C5800000000000000000000000000000000000AB
62656+:10C59000000000000000000000000000000000009B
62657+:10C5A000000000000000000000000000000000008B
62658+:10C5B000000000000000000000000000000000007B
62659+:10C5C000000000000000000000000000000000006B
62660+:10C5D000000000000000000000000000000000005B
62661+:10C5E000000000000000000000000000000000004B
62662+:10C5F000000000000000000000000000000000003B
62663+:10C60000000000000000000000000000000000002A
62664+:10C61000000000000000000000000000000000001A
62665+:10C62000000000000000000000000000000000000A
62666+:10C6300000000000000000000000000000000000FA
62667+:10C6400000000000000000000000000000000000EA
62668+:10C6500000000000000000000000000000000000DA
62669+:10C6600000000000000000000000000000000000CA
62670+:10C6700000000000000000000000000000000000BA
62671+:10C6800000000000000000000000000000000000AA
62672+:10C69000000000000000000000000000000000009A
62673+:10C6A000000000000000000000000000000000008A
62674+:10C6B000000000000000000000000000000000007A
62675+:10C6C000000000000000000000000000000000006A
62676+:10C6D000000000000000000000000000000000005A
62677+:10C6E000000000000000000000000000000000004A
62678+:10C6F000000000000000000000000000000000003A
62679+:10C700000000000000000000000000000000000029
62680+:10C710000000000000000000000000000000000019
62681+:10C720000000000000000000000000000000000009
62682+:10C7300000000000000000000000000000000000F9
62683+:10C7400000000000000000000000000000000000E9
62684+:10C7500000000000000000000000000000000000D9
62685+:10C7600000000000000000000000000000000000C9
62686+:10C7700000000000000000000000000000000000B9
62687+:10C7800000000000000000000000000000000000A9
62688+:10C790000000000000000000000000000000000099
62689+:10C7A0000000000000000000000000000000000089
62690+:10C7B0000000000000000000000000000000000079
62691+:10C7C0000000000000000000000000000000000069
62692+:10C7D0000000000000000000000000000000000059
62693+:10C7E0000000000000000000000000000000000049
62694+:10C7F0000000000000000000000000000000000039
62695+:10C800000000000000000000000000000000000028
62696+:10C810000000000000000000000000000000000018
62697+:10C820000000000000000000000000000000000008
62698+:10C8300000000000000000000000000000000000F8
62699+:10C8400000000000000000000000000000000000E8
62700+:10C8500000000000000000000000000000000000D8
62701+:10C8600000000000000000000000000000000000C8
62702+:10C8700000000000000000000000000000000000B8
62703+:10C8800000000000000000000000000000000000A8
62704+:10C890000000000000000000000000000000000098
62705+:10C8A0000000000000000000000000000000000088
62706+:10C8B0000000000000000000000000000000000078
62707+:10C8C0000000000000000000000000000000000068
62708+:10C8D0000000000000000000000000000000000058
62709+:10C8E0000000000000000000000000000000000048
62710+:10C8F0000000000000000000000000000000000038
62711+:10C900000000000000000000000000000000000027
62712+:10C910000000000000000000000000000000000017
62713+:10C920000000000000000000000000000000000007
62714+:10C9300000000000000000000000000000000000F7
62715+:10C9400000000000000000000000000000000000E7
62716+:10C9500000000000000000000000000000000000D7
62717+:10C9600000000000000000000000000000000000C7
62718+:10C9700000000000000000000000000000000000B7
62719+:10C9800000000000000000000000000000000000A7
62720+:10C990000000000000000000000000000000000097
62721+:10C9A0000000000000000000000000000000000087
62722+:10C9B0000000000000000000000000000000000077
62723+:10C9C0000000000000000000000000000000000067
62724+:10C9D0000000000000000000000000000000000057
62725+:10C9E0000000000000000000000000000000000047
62726+:10C9F0000000000000000000000000000000000037
62727+:10CA00000000000000000000000000000000000026
62728+:10CA10000000000000000000000000000000000016
62729+:10CA20000000000000000000000000000000000006
62730+:10CA300000000000000000000000000000000000F6
62731+:10CA400000000000000000000000000000000000E6
62732+:10CA500000000000000000000000000000000000D6
62733+:10CA600000000000000000000000000000000000C6
62734+:10CA700000000000000000000000000000000000B6
62735+:10CA800000000000000000000000000000000000A6
62736+:10CA90000000000000000000000000000000000096
62737+:10CAA0000000000000000000000000000000000086
62738+:10CAB0000000000000000000000000000000000076
62739+:10CAC0000000000000000000000000000000000066
62740+:10CAD0000000000000000000000000000000000056
62741+:10CAE0000000000000000000000000000000000046
62742+:10CAF0000000000000000000000000000000000036
62743+:10CB00000000000000000000000000000000000025
62744+:10CB10000000000000000000000000000000000015
62745+:10CB20000000000000000000000000000000000005
62746+:10CB300000000000000000000000000000000000F5
62747+:10CB400000000000000000000000000000000000E5
62748+:10CB500000000000000000000000000000000000D5
62749+:10CB600000000000000000000000000000000000C5
62750+:10CB700000000000000000000000000000000000B5
62751+:10CB800000000000000000000000000000000000A5
62752+:10CB90000000000000000000000000000000000095
62753+:10CBA0000000000000000000000000000000000085
62754+:10CBB0000000000000000000000000000000000075
62755+:10CBC0000000000000000000000000000000000065
62756+:10CBD0000000000000000000000000000000000055
62757+:10CBE0000000000000000000000000000000000045
62758+:10CBF0000000000000000000000000000000000035
62759+:10CC00000000000000000000000000000000000024
62760+:10CC10000000000000000000000000000000000014
62761+:10CC20000000000000000000000000000000000004
62762+:10CC300000000000000000000000000000000000F4
62763+:10CC400000000000000000000000000000000000E4
62764+:10CC500000000000000000000000000000000000D4
62765+:10CC600000000000000000000000000000000000C4
62766+:10CC700000000000000000000000000000000000B4
62767+:10CC800000000000000000000000000000000000A4
62768+:10CC90000000000000000000000000000000000094
62769+:10CCA0000000000000000000000000000000000084
62770+:10CCB0000000000000000000000000000000000074
62771+:10CCC0000000000000000000000000000000000064
62772+:10CCD0000000000000000000000000000000000054
62773+:10CCE0000000000000000000000000000000000044
62774+:10CCF0000000000000000000000000000000000034
62775+:10CD00000000000000000000000000000000000023
62776+:10CD10000000000000000000000000000000000013
62777+:10CD20000000000000000000000000000000000003
62778+:10CD300000000000000000000000000000000000F3
62779+:10CD400000000000000000000000000000000000E3
62780+:10CD500000000000000000000000000000000000D3
62781+:10CD600000000000000000000000000000000000C3
62782+:10CD700000000000000000000000000000000000B3
62783+:10CD800000000000000000000000000000000000A3
62784+:10CD90000000000000000000000000000000000093
62785+:10CDA0000000000000000000000000000000000083
62786+:10CDB0000000000000000000000000000000000073
62787+:10CDC0000000000000000000000000000000000063
62788+:10CDD0000000000000000000000000000000000053
62789+:10CDE0000000000000000000000000000000000043
62790+:10CDF0000000000000000000000000000000000033
62791+:10CE00000000000000000000000000000000000022
62792+:10CE10000000000000000000000000000000000012
62793+:10CE20000000000000000000000000000000000002
62794+:10CE300000000000000000000000000000000000F2
62795+:10CE400000000000000000000000000000000000E2
62796+:10CE500000000000000000000000000000000000D2
62797+:10CE600000000000000000000000000000000000C2
62798+:10CE700000000000000000000000000000000000B2
62799+:10CE800000000000000000000000000000000000A2
62800+:10CE90000000000000000000000000000000000092
62801+:10CEA0000000000000000000000000000000000082
62802+:10CEB0000000000000000000000000000000000072
62803+:10CEC0000000000000000000000000000000000062
62804+:10CED0000000000000000000000000000000000052
62805+:10CEE0000000000000000000000000000000000042
62806+:10CEF0000000000000000000000000000000000032
62807+:10CF00000000000000000000000000000000000021
62808+:10CF10000000000000000000000000000000000011
62809+:10CF20000000000000000000000000000000000001
62810+:10CF300000000000000000000000000000000000F1
62811+:10CF400000000000000000000000000000000000E1
62812+:10CF500000000000000000000000000000000000D1
62813+:10CF600000000000000000000000000000000000C1
62814+:10CF700000000000000000000000000000000000B1
62815+:10CF800000000000000000000000000000000000A1
62816+:10CF90000000000000000000000000000000000091
62817+:10CFA0000000000000000000000000000000000081
62818+:10CFB0000000000000000000000000000000000071
62819+:10CFC0000000000000000000000000000000000061
62820+:10CFD0000000000000000000000000000000000051
62821+:10CFE0000000000000000000000000000000000041
62822+:10CFF0000000000000000000000000000000000031
62823+:10D000000000000000000000000000000000000020
62824+:10D010000000000000000000000000000000000010
62825+:10D020000000000000000000000000000000000000
62826+:10D0300000000000000000000000000000000000F0
62827+:10D0400000000000000000000000000000000000E0
62828+:10D0500000000000000000000000000000000000D0
62829+:10D0600000000000000000000000000000000000C0
62830+:10D0700000000000000000000000000000000000B0
62831+:10D0800000000000000000000000000000000000A0
62832+:10D090000000000000000000000000000000000090
62833+:10D0A0000000000000000000000000000000000080
62834+:10D0B0000000000000000000000000000000000070
62835+:10D0C0000000000000000000000000000000000060
62836+:10D0D0000000000000000000000000000000000050
62837+:10D0E0000000000000000000000000000000000040
62838+:10D0F0000000000000000000000000000000000030
62839+:10D10000000000000000000000000000000000001F
62840+:10D11000000000000000000000000000000000000F
62841+:10D1200000000000000000000000000000000000FF
62842+:10D1300000000000000000000000000000000000EF
62843+:10D1400000000000000000000000000000000000DF
62844+:10D1500000000000000000000000000000000000CF
62845+:10D1600000000000000000000000000000000000BF
62846+:10D1700000000000000000000000000000000000AF
62847+:10D18000000000000000000000000000000000009F
62848+:10D19000000000000000000000000000000000008F
62849+:10D1A000000000000000000000000000000000007F
62850+:10D1B000000000000000000000000000000000006F
62851+:10D1C000000000000000000000000000000000005F
62852+:10D1D000000000000000000000000000000000004F
62853+:10D1E000000000000000000000000000000000003F
62854+:10D1F000000000000000000000000000000000002F
62855+:10D20000000000000000000000000000000000001E
62856+:10D21000000000000000000000000000000000000E
62857+:10D2200000000000000000000000000000000000FE
62858+:10D2300000000000000000000000000000000000EE
62859+:10D2400000000000000000000000000000000000DE
62860+:10D2500000000000000000000000000000000000CE
62861+:10D2600000000000000000000000000000000000BE
62862+:10D2700000000000000000000000000000000000AE
62863+:10D28000000000000000000000000000000000009E
62864+:10D29000000000000000000000000000000000008E
62865+:10D2A000000000000000000000000000000000007E
62866+:10D2B000000000000000000000000000000000006E
62867+:10D2C000000000000000000000000000000000005E
62868+:10D2D000000000000000000000000000000000004E
62869+:10D2E000000000000000000000000000000000003E
62870+:10D2F000000000000000000000000000000000002E
62871+:10D30000000000000000000000000000000000001D
62872+:10D31000000000000000000000000000000000000D
62873+:10D3200000000000000000000000000000000000FD
62874+:10D3300000000000000000000000000000000000ED
62875+:10D3400000000000000000000000000000000000DD
62876+:10D3500000000000000000000000000000000000CD
62877+:10D3600000000000000000000000000000000000BD
62878+:10D3700000000000000000000000000000000000AD
62879+:10D38000000000000000000000000000000000009D
62880+:10D39000000000000000000000000000000000008D
62881+:10D3A000000000000000000000000000000000007D
62882+:10D3B000000000000000000000000000000000006D
62883+:10D3C000000000000000000000000000000000005D
62884+:10D3D000000000000000000000000000000000004D
62885+:10D3E000000000000000000000000000000000003D
62886+:10D3F000000000000000000000000000000000002D
62887+:10D40000000000000000000000000000000000001C
62888+:10D41000000000000000000000000000000000000C
62889+:10D4200000000000000000000000000000000000FC
62890+:10D4300000000000000000000000000000000000EC
62891+:10D4400000000000000000000000000000000000DC
62892+:10D4500000000000000000000000000000000000CC
62893+:10D4600000000000000000000000000000000000BC
62894+:10D4700000000000000000000000000000000000AC
62895+:10D48000000000000000000000000000000000009C
62896+:10D49000000000000000000000000000000000008C
62897+:10D4A000000000000000000000000000000000007C
62898+:10D4B000000000000000000000000000000000006C
62899+:10D4C000000000000000000000000000000000005C
62900+:10D4D000000000000000000000000000000000004C
62901+:10D4E000000000000000000000000000000000003C
62902+:10D4F000000000000000000000000000000000002C
62903+:10D50000000000000000000000000000000000001B
62904+:10D51000000000000000000000000000000000000B
62905+:10D5200000000000000000000000000000000000FB
62906+:10D5300000000000000000000000000000000000EB
62907+:10D5400000000000000000000000000000000000DB
62908+:10D5500000000000000000000000000000000000CB
62909+:10D5600000000000000000000000000000000000BB
62910+:10D5700000000000000000000000000000000000AB
62911+:10D58000000000000000000000000000000000009B
62912+:10D59000000000000000000000000000000000008B
62913+:10D5A000000000000000000000000000000000007B
62914+:10D5B000000000000000000000000000000000006B
62915+:10D5C000000000000000000000000000000000005B
62916+:10D5D000000000000000000000000000000000004B
62917+:10D5E000000000000000000000000000000000003B
62918+:10D5F000000000000000000000000000000000002B
62919+:10D60000000000000000000000000000000000001A
62920+:10D61000000000000000000000000000000000000A
62921+:10D6200000000000000000000000000000000000FA
62922+:10D6300000000000000000000000000000000000EA
62923+:10D6400000000000000000000000000000000000DA
62924+:10D6500000000000000000000000000000000000CA
62925+:10D6600000000000000000000000000000000000BA
62926+:10D6700000000000000000000000000000000000AA
62927+:10D68000000000000000000000000000000000009A
62928+:10D69000000000000000000000000000000000008A
62929+:10D6A000000000000000000000000000000000007A
62930+:10D6B000000000000000000000000000000000006A
62931+:10D6C000000000000000000000000000000000005A
62932+:10D6D000000000000000000000000000000000004A
62933+:10D6E000000000000000000000000000000000003A
62934+:10D6F000000000000000000000000000000000002A
62935+:10D700000000000000000000000000000000000019
62936+:10D710000000000000000000000000000000000009
62937+:10D7200000000000000000000000000000000000F9
62938+:10D7300000000000000000000000000000000000E9
62939+:10D7400000000000000000000000000000000000D9
62940+:10D7500000000000000000000000000000000000C9
62941+:10D7600000000000000000000000000000000000B9
62942+:10D7700000000000000000000000000000000000A9
62943+:10D780000000000000000000000000000000000099
62944+:10D790000000000000000000000000000000000089
62945+:10D7A0000000000000000000000000000000000079
62946+:10D7B0000000000000000000000000000000000069
62947+:10D7C0000000000000000000000000000000000059
62948+:10D7D0000000000000000000000000000000000049
62949+:10D7E0000000000000000000000000000000000039
62950+:10D7F0000000000000000000000000000000000029
62951+:10D800000000000000000000000000000000000018
62952+:10D810000000000000000000000000000000000008
62953+:10D8200000000000000000000000000000000000F8
62954+:10D8300000000000000000000000000000000000E8
62955+:10D8400000000000000000000000000000000000D8
62956+:10D8500000000000000000000000000000000000C8
62957+:10D8600000000000000000000000000000000000B8
62958+:10D8700000000000000000000000000000000000A8
62959+:10D880000000000000000000000000000000000098
62960+:10D890000000000000000000000000000000000088
62961+:10D8A0000000000000000000000000000000000078
62962+:10D8B0000000000000000000000000000000000068
62963+:10D8C0000000000000000000000000000000000058
62964+:10D8D0000000000000000000000000000000000048
62965+:10D8E0000000000000000000000000000000000038
62966+:10D8F0000000000000000000000000000000000028
62967+:10D900000000000000000000000000000000000017
62968+:10D910000000000000000000000000000000000007
62969+:10D9200000000000000000000000000000000000F7
62970+:10D9300000000000000000000000000000000000E7
62971+:10D9400000000000000000000000000000000000D7
62972+:10D9500000000000000000000000000000000000C7
62973+:10D9600000000000000000000000000000000000B7
62974+:10D9700000000000000000000000000000000000A7
62975+:10D980000000000000000000000000000000000097
62976+:10D990000000000000000000000000000000000087
62977+:10D9A0000000000000000000000000000000000077
62978+:10D9B0000000000000000000000000000000000067
62979+:10D9C0000000000000000000000000000000000057
62980+:10D9D0000000000000000000000000000000000047
62981+:10D9E0000000000000000000000000000000000037
62982+:10D9F0000000000000000000000000000000000027
62983+:10DA00000000000000000000000000000000000016
62984+:10DA10000000000000000000000000000000000006
62985+:10DA200000000000000000000000000000000000F6
62986+:10DA300000000000000000000000000000000000E6
62987+:10DA400000000000000000000000000000000000D6
62988+:10DA500000000000000000000000000000000000C6
62989+:10DA600000000000000000000000000000000000B6
62990+:10DA700000000000000000000000000000000000A6
62991+:10DA80000000000000000000000000000000000096
62992+:10DA90000000000000000000000000000000000086
62993+:10DAA0000000000000000000000000000000000076
62994+:10DAB0000000000000000000000000000000000066
62995+:10DAC0000000000000000000000000000000000056
62996+:10DAD0000000000000000000000000000000000046
62997+:10DAE0000000000000000000000000000000000036
62998+:10DAF0000000000000000000000000000000000026
62999+:10DB00000000000000000000000000000000000015
63000+:10DB10000000000000000000000000000000000005
63001+:10DB200000000000000000000000000000000000F5
63002+:10DB300000000000000000000000000000000000E5
63003+:10DB400000000000000000000000000000000000D5
63004+:10DB500000000000000000000000000000000000C5
63005+:10DB600000000000000000000000000000000000B5
63006+:10DB700000000000000000000000000000000000A5
63007+:10DB80000000000000000000000000000000000095
63008+:10DB90000000000000000000000000000000000085
63009+:10DBA0000000000000000000000000000000000075
63010+:10DBB0000000000000000000000000000000000065
63011+:10DBC0000000000000000000000000000000000055
63012+:10DBD0000000000000000000000000000000000045
63013+:10DBE0000000000000000000000000000000000035
63014+:10DBF0000000000000000000000000000000000025
63015+:10DC00000000000000000000000000000000000014
63016+:10DC10000000000000000000000000000000000004
63017+:10DC200000000000000000000000000000000000F4
63018+:10DC300000000000000000000000000000000000E4
63019+:10DC400000000000000000000000000000000000D4
63020+:10DC500000000000000000000000000000000000C4
63021+:10DC600000000000000000000000000000000000B4
63022+:10DC700000000000000000000000000000000000A4
63023+:10DC80000000000000000000000000000000000094
63024+:10DC90000000000000000000000000000000000084
63025+:10DCA0000000000000000000000000000000000074
63026+:10DCB0000000000000000000000000000000000064
63027+:10DCC0000000000000000000000000000000000054
63028+:10DCD0000000000000000000000000000000000044
63029+:10DCE0000000000000000000000000000000000034
63030+:10DCF0000000000000000000000000000000000024
63031+:10DD00000000000000000000000000000000000013
63032+:10DD10000000000000000000000000000000000003
63033+:10DD200000000000000000000000000000000000F3
63034+:10DD300000000000000000000000000000000000E3
63035+:10DD400000000000000000000000000000000000D3
63036+:10DD500000000000000000000000000000000000C3
63037+:10DD600000000000000000000000000000000000B3
63038+:10DD700000000000000000000000000000000000A3
63039+:10DD80000000000000000000000000000000000093
63040+:10DD90000000000000000000000000000000000083
63041+:10DDA0000000000000000000000000000000000073
63042+:10DDB0000000000000000000000000000000000063
63043+:10DDC0000000000000000000000000000000000053
63044+:10DDD0000000000000000000000000000000000043
63045+:10DDE0000000000000000000000000000000000033
63046+:10DDF0000000000000000000000000000000000023
63047+:10DE00000000000000000000000000000000000012
63048+:10DE10000000000000000000000000000000000002
63049+:10DE200000000000000000000000000000000000F2
63050+:10DE300000000000000000000000000000000000E2
63051+:10DE400000000000000000000000000000000000D2
63052+:10DE500000000000000000000000000000000000C2
63053+:10DE600000000000000000000000000000000000B2
63054+:10DE700000000000000000000000000000000000A2
63055+:10DE80000000000000000000000000000000000092
63056+:10DE90000000000000000000000000000000000082
63057+:10DEA0000000000000000000000000000000000072
63058+:10DEB0000000000000000000000000000000000062
63059+:10DEC0000000000000000000000000000000000052
63060+:10DED0000000000000000000000000000000000042
63061+:10DEE0000000000000000000000000000000000032
63062+:10DEF0000000000000000000000000000000000022
63063+:10DF00000000000000000000000000000000000011
63064+:10DF10000000000000000000000000000000000001
63065+:10DF200000000000000000000000000000000000F1
63066+:10DF300000000000000000000000000000000000E1
63067+:10DF400000000000000000000000000000000000D1
63068+:10DF500000000000000000000000000000000000C1
63069+:10DF600000000000000000000000000000000000B1
63070+:10DF700000000000000000000000000000000000A1
63071+:10DF80000000000000000000000000000000000091
63072+:10DF90000000000000000000000000000000000081
63073+:10DFA0000000000000000000000000000000000071
63074+:10DFB0000000000000000000000000000000000061
63075+:10DFC0000000000000000000000000000000000051
63076+:10DFD0000000000000000000000000000000000041
63077+:10DFE0000000000000000000000000000000000031
63078+:10DFF0000000000000000000000000000000000021
63079+:10E000000000000000000000000000000000000010
63080+:10E010000000000000000000000000000000000000
63081+:10E0200000000000000000000000000000000000F0
63082+:10E0300000000000000000000000000000000000E0
63083+:10E0400000000000000000000000000000000000D0
63084+:10E0500000000000000000000000000000000000C0
63085+:10E0600000000000000000000000000000000000B0
63086+:10E0700000000000000000000000000000000000A0
63087+:10E080000000000000000000000000000000000090
63088+:10E090000000000000000000000000000000000080
63089+:10E0A0000000000000000000000000000000000070
63090+:10E0B0000000000000000000000000000000000060
63091+:10E0C0000000000000000000000000000000000050
63092+:10E0D0000000000000000000000000000000000040
63093+:10E0E0000000000000000000000000000000000030
63094+:10E0F0000000000000000000000000000000000020
63095+:10E10000000000000000000000000000000000000F
63096+:10E1100000000000000000000000000000000000FF
63097+:10E1200000000000000000000000000000000000EF
63098+:10E1300000000000000000000000000000000000DF
63099+:10E1400000000000000000000000000000000000CF
63100+:10E1500000000000000000000000000000000000BF
63101+:10E1600000000000000000000000000000000000AF
63102+:10E17000000000000000000000000000000000009F
63103+:10E18000000000000000000000000000000000008F
63104+:10E19000000000000000000000000000000000007F
63105+:10E1A000000000000000000000000000000000006F
63106+:10E1B000000000000000000000000000000000005F
63107+:10E1C000000000000000000000000000000000004F
63108+:10E1D000000000000000000000000000000000003F
63109+:10E1E000000000000000000000000000000000002F
63110+:10E1F000000000000000000000000000000000809F
63111+:10E20000000000000000000000000000000000000E
63112+:10E2100000000000000000000000000000000000FE
63113+:10E220000000000A000000000000000000000000E4
63114+:10E2300010000003000000000000000D0000000DB1
63115+:10E240003C020801244295C03C030801246397FC6A
63116+:10E25000AC4000000043202B1480FFFD244200044A
63117+:10E260003C1D080037BD9FFC03A0F0213C100800B6
63118+:10E27000261032103C1C0801279C95C00E0012BECF
63119+:10E28000000000000000000D3C02800030A5FFFFF0
63120+:10E2900030C600FF344301803C0880008D0901B87E
63121+:10E2A0000520FFFE00000000AC6400002404000212
63122+:10E2B000A4650008A066000AA064000BAC67001803
63123+:10E2C0003C03100003E00008AD0301B83C0560000A
63124+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
63125+:10E2E0003C0310003C040200ACA44FC403E000084F
63126+:10E2F000ACA34FF89486000C00A050212488001491
63127+:10E3000000062B0200051080004448210109182B4B
63128+:10E310001060001100000000910300002C6400094F
63129+:10E320005080000991190001000360803C0D080134
63130+:10E3300025AD9258018D58218D67000000E000083E
63131+:10E340000000000091190001011940210109302B42
63132+:10E3500054C0FFF29103000003E000080000102108
63133+:10E360000A000CCC25080001910F0001240E000AC0
63134+:10E3700015EE00400128C8232F38000A1700003D81
63135+:10E38000250D00028D580000250F0006370E0100F4
63136+:10E39000AD4E0000910C000291AB000191A400026F
63137+:10E3A00091A60003000C2E00000B3C0000A71025D6
63138+:10E3B00000041A000043C8250326C025AD580004F8
63139+:10E3C000910E000691ED000191E7000291E5000336
63140+:10E3D000000E5E00000D6400016C30250007220075
63141+:10E3E00000C41025004518252508000A0A000CCC99
63142+:10E3F000AD430008910F000125040002240800022B
63143+:10E4000055E80001012020210A000CCC00804021A9
63144+:10E41000910C0001240B0003158B00160000000076
63145+:10E420008D580000910E000225080003370D0008EA
63146+:10E43000A14E00100A000CCCAD4D00009119000156
63147+:10E44000240F0004172F000B0000000091070002AA
63148+:10E45000910400038D43000000072A0000A410254A
63149+:10E460003466000425080004AD42000C0A000CCC00
63150+:10E47000AD46000003E000082402000127BDFFE8CC
63151+:10E48000AFBF0014AFB000100E00164E0080802108
63152+:10E490003C0480083485008090A600052403FFFE1C
63153+:10E4A0000200202100C310248FBF00148FB0001081
63154+:10E4B000A0A200050A00165827BD001827BDFFE8D6
63155+:10E4C000AFB00010AFBF00140E000FD40080802149
63156+:10E4D0003C06800834C5008090A40000240200504F
63157+:10E4E000308300FF106200073C09800002002021F9
63158+:10E4F0008FBF00148FB00010AD2001800A00108F74
63159+:10E5000027BD0018240801003C07800002002021DC
63160+:10E510008FBF00148FB00010ACE801800A00108F8C
63161+:10E5200027BD001827BDFF783C058008AFBE0080DE
63162+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
63163+:10E54000AFB60078AFB50074AFB40070AFB200687A
63164+:10E55000AFB0006034A600803C0580008CB201287A
63165+:10E5600090C400098CA701043C020001309100FF17
63166+:10E5700000E218240000B8210000F021106000071C
63167+:10E58000000098213C0908008D2931F02413000176
63168+:10E59000252800013C010800AC2831F0ACA0008423
63169+:10E5A00090CC0005000C5827316A0001154000721C
63170+:10E5B000AFA0005090CD00002406002031A400FF41
63171+:10E5C00010860018240E0050108E009300000000EA
63172+:10E5D0003C1008008E1000DC260F00013C010800F2
63173+:10E5E000AC2F00DC0E0016C7000000000040182110
63174+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
63175+:10E600008FB500748FB400708FB3006C8FB2006848
63176+:10E610008FB100648FB000600060102103E000083B
63177+:10E6200027BD00880000000D3C1F8000AFA0003017
63178+:10E6300097E501168FE201043C04002030B9FFFF8A
63179+:10E64000004438240007182B00033140AFA60030E7
63180+:10E650008FF5010437F80C003C1600400338802188
63181+:10E6600002B6A02434C40040128000479215000D69
63182+:10E6700032A800201500000234860080008030217E
63183+:10E6800014C0009FAFA600303C0D800835A6008066
63184+:10E6900090CC0008318B0040516000063C06800899
63185+:10E6A000240E0004122E00A8240F0012122F003294
63186+:10E6B0003C06800834C401003C0280009447011AE3
63187+:10E6C0009619000E909F00088E18000830E3FFFF97
63188+:10E6D00003F9B00432B40004AFB6005CAFA3005835
63189+:10E6E0008E1600041280002EAFB8005434C3008090
63190+:10E6F000906800083105004014A0002500000000CB
63191+:10E700008C70005002D090230640000500000000ED
63192+:10E710008C71003402D1A82306A201678EE20008A2
63193+:10E72000126000063C1280003C1508008EB531F4E2
63194+:10E7300026B600013C010800AC3631F4AE4000447E
63195+:10E74000240300018FBF00848FBE00808FB7007C40
63196+:10E750008FB600788FB500748FB400708FB3006CE3
63197+:10E760008FB200688FB100648FB00060006010212C
63198+:10E7700003E0000827BD00880E000D2800002021BE
63199+:10E780000A000D75004018210A000D9500C02021D7
63200+:10E790000E00171702C020211440FFE10000000006
63201+:10E7A0003C0B8008356400808C8A003402CA482300
63202+:10E7B0000520001D000000003C1E08008FDE310017
63203+:10E7C00027D700013C010800AC3731001260000679
63204+:10E7D000024020213C1408008E9431F42690000160
63205+:10E7E0003C010800AC3031F40E00164E3C1E80088F
63206+:10E7F00037CD008091B700250240202136EE00047D
63207+:10E800000E001658A1AE00250E000CAC02402021CF
63208+:10E810000A000DCA240300013C17080126F796C020
63209+:10E820000A000D843C1F80008C86003002C66023E5
63210+:10E830001980000C2419000C908F004F3C14080024
63211+:10E840008E94310032B500FC35ED0001268E0001BA
63212+:10E850003C010800AC2E3100A08D004FAFA0005845
63213+:10E860002419000CAFB900308C9800300316A02397
63214+:10E870001A80010B8FA300580074F82A17E0FFD309
63215+:10E88000000000001074002A8FA5005802D4B021A7
63216+:10E8900000B410233044FFFFAFA4005832A8000298
63217+:10E8A0001100002E32AB00103C15800836B00080FD
63218+:10E8B0009216000832D30040526000FB8EE200083E
63219+:10E8C0000E00164E02402021240A0018A20A000958
63220+:10E8D000921100052409FFFE024020210229902404
63221+:10E8E0000E001658A2120005240400390000282149
63222+:10E8F0000E0016F2240600180A000DCA24030001B7
63223+:10E9000092FE000C3C0A800835490080001EBB00C6
63224+:10E910008D27003836F10081024020213225F08118
63225+:10E920000E000C9B30C600FF0A000DC10000000065
63226+:10E930003AA7000130E300011460FFA402D4B02123
63227+:10E940000A000E1D00000000024020210E001734B6
63228+:10E95000020028210A000D75004018211160FF7087
63229+:10E960003C0F80083C0D800835EE00808DC40038D7
63230+:10E970008FA300548DA60004006660231D80FF68ED
63231+:10E98000000000000064C02307020001AFA400548F
63232+:10E990003C1F08008FFF31E433F9000113200015FC
63233+:10E9A0008FAC00583C07800094E3011A10600012FD
63234+:10E9B0003C0680080E00216A024020213C03080129
63235+:10E9C000906396F13064000214800145000000005D
63236+:10E9D000306C0004118000078FAC0058306600FBDB
63237+:10E9E0003C010801A02696F132B500FCAFA000580A
63238+:10E9F0008FAC00583C06800834D30080AFB40018B8
63239+:10EA0000AFB60010AFAC00143C088000950B01209D
63240+:10EA10008E6F0030966A005C8FA3005C8FBF003061
63241+:10EA20003169FFFF3144FFFF8FAE005401341021E4
63242+:10EA3000350540000064382B0045C82103E7C02598
63243+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
63244+:10EA5000AFA0002CAFAE0034926D000831B40008B6
63245+:10EA6000168000BB020020218EE200040040F8095D
63246+:10EA700027A400108FAF003031F300025660000170
63247+:10EA800032B500FE3C048008349F008093F90008F2
63248+:10EA900033380040530000138FA400248C850004F9
63249+:10EAA0008FA7005410A700D52404001432B0000131
63250+:10EAB0001200000C8FA400242414000C1234011A3C
63251+:10EAC0002A2D000D11A001022413000E240E000AAD
63252+:10EAD000522E0001241E00088FAF002425E40001FF
63253+:10EAE000AFA400248FAA00143C0B80083565008079
63254+:10EAF000008A48218CB10030ACA9003090A4004EAF
63255+:10EB00008CA700303408FFFF0088180400E3F821C8
63256+:10EB1000ACBF00348FA600308FB900548FB8005CB2
63257+:10EB200030C200081040000B033898218CAC002044
63258+:10EB3000119300D330C600FF92EE000C8FA7003473
63259+:10EB400002402021000E6B0035B400800E000C9BAB
63260+:10EB50003285F0803C028008345000808E0F0030F7
63261+:10EB600001F1302318C00097264800803C070800B8
63262+:10EB70008CE731E42404FF80010418243118007F5D
63263+:10EB80003C1F80003C19800430F10001AFE300908D
63264+:10EB900012200006031928213C030801906396F116
63265+:10EBA00030690008152000C6306A00F73C10800864
63266+:10EBB00036040080908C004F318B000115600042BC
63267+:10EBC000000000003C0608008CC6319830CE0010D2
63268+:10EBD00051C0004230F9000190AF006B55E0003F9A
63269+:10EBE00030F9000124180001A0B8006B3C1180002E
63270+:10EBF0009622007A24470064A48700123C0D800806
63271+:10EC000035A5008090B40008329000401600000442
63272+:10EC10003C03800832AE000115C0008B00000000EC
63273+:10EC2000346400808C86002010D3000A3463010015
63274+:10EC30008C67000002C7782319E000978FBF00544B
63275+:10EC4000AC93002024130001AC760000AFB3005059
63276+:10EC5000AC7F000417C0004E000000008FA90050D8
63277+:10EC60001520000B000000003C030801906396F1A2
63278+:10EC7000306A00011140002E8FAB0058306400FE56
63279+:10EC80003C010801A02496F10A000D75000018212E
63280+:10EC90000E000CAC024020210A000F1300000000FF
63281+:10ECA0000A000E200000A0210040F80924040017EB
63282+:10ECB0000A000DCA240300010040F80924040016CC
63283+:10ECC0000A000DCA240300019094004F240DFFFE9A
63284+:10ECD000028D2824A085004F30F900011320000682
63285+:10ECE0003C0480083C030801906396F1307F0010DB
63286+:10ECF00017E00051306800EF34900080240A0001D2
63287+:10ED0000024020210E00164EA60A00129203002592
63288+:10ED100024090001AFA90050346200010240202103
63289+:10ED20000E001658A20200250A000EF93C0D8008BC
63290+:10ED30001160FE83000018218FA5003030AC000464
63291+:10ED40001180FE2C8FBF00840A000DCB240300012C
63292+:10ED500027A500380E000CB6AFA000385440FF4382
63293+:10ED60008EE200048FB40038329001005200FF3F61
63294+:10ED70008EE200048FA3003C8E6E0058006E682364
63295+:10ED800005A3FF39AE6300580A000E948EE200041A
63296+:10ED90000E00164E024020213C038008346800809B
63297+:10EDA000024020210E001658A11E000903C0302188
63298+:10EDB000240400370E0016F2000028210A000F116B
63299+:10EDC0008FA900508FAB00185960FF8D3C0D800853
63300+:10EDD0000E00164E02402021920C00252405000151
63301+:10EDE000AFA5005035820004024020210E001658C5
63302+:10EDF000A20200250A000EF93C0D800812240059D9
63303+:10EE00002A2300151060004D240900162408000C68
63304+:10EE10005628FF2732B000013C0A8008914C001BA5
63305+:10EE20002406FFBD241E000E01865824A14B001BA2
63306+:10EE30000A000EA532B000013C010801A02896F19D
63307+:10EE40000A000EF93C0D80088CB500308EFE0008DB
63308+:10EE50002404001826B6000103C0F809ACB600303F
63309+:10EE60003C030801906396F13077000116E0FF81C2
63310+:10EE7000306A00018FB200300A000D753243000481
63311+:10EE80003C1080009605011A50A0FF2B34C60010DC
63312+:10EE90000A000EC892EE000C8C6200001456FF6D42
63313+:10EEA000000000008C7800048FB9005403388823D8
63314+:10EEB0000621FF638FBF00540A000F0E0000000000
63315+:10EEC0003C010801A02A96F10A000F3030F9000138
63316+:10EED0001633FF028FAF00240A000EB0241E00106C
63317+:10EEE0000E00164E024020213C0B80083568008041
63318+:10EEF00091090025240A0001AFAA0050353300040F
63319+:10EF0000024020210E001658A11300253C050801DF
63320+:10EF100090A596F130A200FD3C010801A02296F1D7
63321+:10EF20000A000E6D004018212411000E53D1FEEA94
63322+:10EF3000241E00100A000EAF241E00165629FEDC07
63323+:10EF400032B000013C0A8008914C001B2406FFBD32
63324+:10EF5000241E001001865824A14B001B0A000EA598
63325+:10EF600032B000010A000EA4241E00123C038000EF
63326+:10EF70008C6201B80440FFFE24040800AC6401B8B0
63327+:10EF800003E000080000000030A5FFFF30C6FFFFCF
63328+:10EF90003C0780008CE201B80440FFFE34EA0180A7
63329+:10EFA000AD440000ACE400203C0480089483004899
63330+:10EFB0003068FFFF11000016AF88000824AB001274
63331+:10EFC000010B482B512000133C04800034EF01005A
63332+:10EFD00095EE00208F890000240D001A31CCFFFF30
63333+:10EFE00031274000A14D000B10E000362583FFFEC5
63334+:10EFF0000103C02B170000348F9900048F88000490
63335+:10F00000A5430014350700010A001003AF87000470
63336+:10F010003C04800024030003348201808F890000B7
63337+:10F020008F870004A043000B3C088000350C018052
63338+:10F03000A585000EA585001A8F85000C30EB800099
63339+:10F04000A5890010AD850028A58600081160000F75
63340+:10F050008F85001435190100972A00163158FFFCDE
63341+:10F06000270F000401E870218DCD400031A6FFFF7D
63342+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
63343+:10F0800000E83824AF8700048F8500142403BFFFF5
63344+:10F090003C04800000E3582434830180A46B0026E4
63345+:10F0A000AC69002C10A0000300054C02A465001000
63346+:10F0B000A46900263C071000AC8701B803E00008F3
63347+:10F0C000000000008F990004240AFFFE032A382460
63348+:10F0D0000A001003AF87000427BDFFE88FA20028B5
63349+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
63350+:10F0F000AF820014AF8000040E000FDBAF80000071
63351+:10F100008FBF001027BD001803E00008AF80001477
63352+:10F110003C06800034C4007034C701008C8A0000B3
63353+:10F1200090E500128F84000027BDFFF030A300FFA0
63354+:10F13000000318823082400010400037246500032D
63355+:10F140000005C8800326C0218F0E4000246F0004F4
63356+:10F15000000F6880AFAE000001A660218D8B4000DB
63357+:10F16000AFAB000494E900163128FFFC01063821FA
63358+:10F170008CE64000AFA600088FA9000800003021EF
63359+:10F18000000028213C07080024E701000A0010675E
63360+:10F19000240800089059000024A500012CAC000CA4
63361+:10F1A0000079C0210018788001E770218DCD000022
63362+:10F1B0001180000600CD302603A5102114A8FFF50C
63363+:10F1C00000051A005520FFF4905900003C0480000F
63364+:10F1D000348700703C0508008CA531048CE30000E6
63365+:10F1E0002CA2002010400009006A38230005488046
63366+:10F1F0003C0B0800256B3108012B402124AA00019B
63367+:10F20000AD0700003C010800AC2A310400C0102109
63368+:10F2100003E0000827BD0010308220001040000BE2
63369+:10F2200000055880016648218D24400024680004B0
63370+:10F2300000083880AFA4000000E618218C6540006B
63371+:10F24000AFA000080A001057AFA500040000000D91
63372+:10F250000A0010588FA9000827BDFFE03C07800076
63373+:10F2600034E60100AFBF001CAFB20018AFB100140C
63374+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
63375+:10F280002483000430E2400010400010AF830028C7
63376+:10F290003C09002000E940241100000D30EC800002
63377+:10F2A0008F8A0004240BBFFF00EB38243543100085
63378+:10F2B000AF87000030F220001640000B3C1900041C
63379+:10F2C000241FFFBF0A0010B7007F102430EC80001D
63380+:10F2D000158000423C0E002030F220001240FFF862
63381+:10F2E0008F8300043C19000400F9C0241300FFF5CB
63382+:10F2F000241FFFBF34620040AF82000430E20100EF
63383+:10F300001040001130F010008F83002C10600006B8
63384+:10F310003C0F80003C05002000E52024148000C044
63385+:10F320003C0800043C0F800035EE010095CD001E26
63386+:10F3300095CC001C31AAFFFF000C5C00014B482556
63387+:10F34000AF89000C30F010001200000824110001F9
63388+:10F3500030F100201620008B3C18100000F890249B
63389+:10F36000164000823C040C002411000130E801002A
63390+:10F370001500000B3C0900018F85000430A94000F6
63391+:10F38000152000073C0900013C0C1F0100EC58242B
63392+:10F390003C0A1000116A01183C1080003C09000171
63393+:10F3A00000E9302410C000173C0B10003C18080086
63394+:10F3B0008F1800243307000214E0014024030001E9
63395+:10F3C0008FBF001C8FB200188FB100148FB00010D7
63396+:10F3D0000060102103E0000827BD002000EE682433
63397+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
63398+:10F3F00036307FFF00F0382435E380000A0010A685
63399+:10F40000AF87000000EB102450400065AF8000245F
63400+:10F410008F8C002C3C0D0F0000ED18241580008807
63401+:10F42000AF83001030E8010011000086938F0010B8
63402+:10F430003C0A0200106A00833C1280003650010032
63403+:10F44000920500139789002A3626000230AF00FF8C
63404+:10F4500025EE0004000E19C03C0480008C9801B811
63405+:10F460000700FFFE34880180AD0300003C198008CE
63406+:10F47000AC830020973100483225FFFF10A0015CCB
63407+:10F48000AF8500082523001200A3F82B53E0015993
63408+:10F490008F850004348D010095AC00202402001AF1
63409+:10F4A00030E44000318BFFFFA102000B108001927D
63410+:10F4B0002563FFFE00A3502B154001908F8F0004A1
63411+:10F4C000A50300148F88000435050001AF850004F2
63412+:10F4D0003C08800035190180A729000EA729001AD1
63413+:10F4E0008F89000C30B18000A7270010AF290028B9
63414+:10F4F000A72600081220000E3C04800035020100FF
63415+:10F50000944C0016318BFFFC256400040088182100
63416+:10F510008C7F400033E6FFFF14C000053C048000F0
63417+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
63418+:10F53000240EBFFF00AE402434850180A4A800261D
63419+:10F54000ACA7002C3C071000AC8701B800001821C4
63420+:10F550008FBF001C8FB200188FB100148FB0001045
63421+:10F560000060102103E0000827BD00203C020BFFD3
63422+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
63423+:10F58000241100013C0608008CC6002C24C5000193
63424+:10F590003C010800AC25002C0A0010D42411000501
63425+:10F5A0008F85002410A0002FAF80001090A30000D2
63426+:10F5B000146000792419000310A0002A30E601002D
63427+:10F5C00010C000CC8F860010241F000210DF00C97D
63428+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
63429+:10F5E00014E0000201641824000018213C0D0800FA
63430+:10F5F00025AD0038006D1021904C00048F85002847
63431+:10F6000025830004000321C030A5FFFF3626000239
63432+:10F610000E000FDB000000000A00114D0000182151
63433+:10F6200000E8302414C0FF403C0F80000E00103D65
63434+:10F63000000000008F8700000A0010CAAF82000C93
63435+:10F64000938F00103C18080127189640000F90C0B7
63436+:10F6500002588021AF9000248F85002414A0FFD38E
63437+:10F66000AF8F00103C0480008C86400030C5010044
63438+:10F6700010A000BC322300043C0C08008D8C002438
63439+:10F6800024120004106000C23190000D3C04800080
63440+:10F690008C8D40003402FFFF11A201003231FFFBCC
63441+:10F6A0008C884000310A01005540000124110010EF
63442+:10F6B00030EE080011C000BE2419FFFB8F9800280F
63443+:10F6C0002F0F03EF51E000010219802430E90100FF
63444+:10F6D00011200014320800018F87002C14E000FB79
63445+:10F6E0008F8C000C3C05800034AB0100917F00132F
63446+:10F6F00033E300FF246A00042403FFFE0203802496
63447+:10F70000000A21C012000002023230253226FFFF1B
63448+:10F710000E000FDB9785002A1200FF290000182138
63449+:10F72000320800011100000D32180004240E0001FF
63450+:10F73000120E0002023230253226FFFF9785002A82
63451+:10F740000E000FDB00002021240FFFFE020F80249B
63452+:10F750001200FF1B00001821321800045300FF188C
63453+:10F760002403000102323025241200045612000145
63454+:10F770003226FFFF9785002A0E000FDB24040100CC
63455+:10F780002419FFFB021988241220FF0D0000182104
63456+:10F790000A0010E9240300011079009C00003021C8
63457+:10F7A00090AD00012402000211A200BE30EA004028
63458+:10F7B00090B90001241800011338007F30E900409F
63459+:10F7C0008CA600049785002A00C020210E000FDBC4
63460+:10F7D0003626000200004021010018218FBF001CC6
63461+:10F7E0008FB200188FB100148FB00010006010218C
63462+:10F7F00003E0000827BD0020360F010095EE000C45
63463+:10F8000031CD020015A0FEE63C0900013C1880083D
63464+:10F81000971200489789002A362600023248FFFFD7
63465+:10F82000AF8800083C0380008C7101B80620FFFE01
63466+:10F83000346A0180AD4000001100008E3C0F800052
63467+:10F84000253F0012011FC82B1320008B240E00033C
63468+:10F85000346C0100958B00202402001A30E4400033
63469+:10F860003163FFFFA142000B108000A72463FFFE5D
63470+:10F870000103682B15A000A52408FFFE34A5000194
63471+:10F88000A5430014AF8500043C0480002412BFFF90
63472+:10F8900000B2802434850180A4A9000EA4A9001A16
63473+:10F8A000A4A60008A4B00026A4A700103C071000DE
63474+:10F8B000AC8701B80A00114D000018213C038000FC
63475+:10F8C00034640100949F000E3C1908008F3900D861
63476+:10F8D0002404008033E5FFFF273100013C010800CC
63477+:10F8E000AC3100D80E000FDB240600030A00114DD6
63478+:10F8F00000001821240A000210CA00598F85002830
63479+:10F900003C0308008C6300D0240E0001106E005EE2
63480+:10F910002CCF000C24D2FFFC2E5000041600002136
63481+:10F9200000002021241800021078001B2CD9000CA4
63482+:10F9300024DFFFF82FE900041520FF330000202109
63483+:10F9400030EB020051600004000621C054C00022C8
63484+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
63485+:10F96000362600023C0908008D29002431300001B0
63486+:10F970005200FEF7000018219785002A3626000263
63487+:10F980000E000FDB000020210A00114D000018219D
63488+:10F990000A00119C241200021320FFE624DFFFF866
63489+:10F9A0000000202130A5FFFF0A00117D362600024D
63490+:10F9B0000A0011AC021980245120FF828CA6000499
63491+:10F9C0003C05080190A5964110A0FF7E2408000187
63492+:10F9D0000A0011F0010018210E000FDB3226000191
63493+:10F9E0008F8600108F8500280A00124F000621C064
63494+:10F9F0008F8500043C18800024120003371001801A
63495+:10FA0000A212000B0A00112E3C08800090A30001F6
63496+:10FA1000241100011071FF70240800012409000264
63497+:10FA20005069000430E60040240800010A0011F08B
63498+:10FA30000100182150C0FFFD240800013C0C80008B
63499+:10FA4000358B01009563001094A40002307FFFFF06
63500+:10FA5000509FFF62010018210A001284240800014F
63501+:10FA60002CA803EF1100FE56240300010A001239EE
63502+:10FA700000000000240E000335EA0180A14E000BB7
63503+:10FA80000A00121C3C04800011E0FFA2000621C005
63504+:10FA900030A5FFFF0A00117D362600020A0011A5DD
63505+:10FAA000241100201140FFC63C1280003650010096
63506+:10FAB000960F001094AE000231E80FFF15C8FFC08A
63507+:10FAC000000000000A0011E690B900013C060800A1
63508+:10FAD0008CC6003824C4FFFF14C00002018418241F
63509+:10FAE000000018213C0D080025AD0038006D1021E4
63510+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
63511+:10FB00000A00112C01EE28242408FFFE0A00121A14
63512+:10FB100000A8282427BDFFC8AFB00010AFBF003435
63513+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
63514+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
63515+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
63516+:10FB500001CF682435AC380C240B0003AE0C5000E8
63517+:10FB6000ACCB00083C010800AC2000200E001819A6
63518+:10FB7000000000003C0A0010354980513C06601628
63519+:10FB8000AE09537C8CC700003C0860148D0500A0B2
63520+:10FB90003C03FFFF00E320243C02535300051FC237
63521+:10FBA0001482000634C57C000003A08002869821E0
63522+:10FBB0008E7200043C116000025128218CBF007C31
63523+:10FBC0008CA200783C1E600037C420203C05080150
63524+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
63525+:10FBE0002406000A3C190001273996403C01080010
63526+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
63527+:10FC00002418FFF03C15570902F8B02412D502F56C
63528+:10FC100024040001AF80002C3C1480003697018042
63529+:10FC20003C1E080127DE9644369301008E900000AA
63530+:10FC30003205000310A0FFFD3207000110E000882C
63531+:10FC4000320600028E7100283C048000AE91002034
63532+:10FC50008E6500048E66000000A0382100C040219F
63533+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
63534+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
63535+:10FC80009675000E3C1208008E52002030AC4000E9
63536+:10FC900032AFFFFF264E000125ED00043C010800B5
63537+:10FCA000AC2E0020118000E8AF8D00283C18002009
63538+:10FCB00000B8B02412C000E530B980002408BFFFAE
63539+:10FCC00000A8382434C81000AF87000030E62000B8
63540+:10FCD00010C000E92409FFBF3C03000400E328240E
63541+:10FCE00010A00002010910243502004030EA010092
63542+:10FCF00011400010AF8200048F8B002C11600007B0
63543+:10FD00003C0D002000ED6024118000043C0F000435
63544+:10FD100000EF702411C00239000000009668001E38
63545+:10FD20009678001C3115FFFF0018B40002B690252C
63546+:10FD3000AF92000C30F910001320001324150001BD
63547+:10FD400030FF002017E0000A3C04100000E41024FB
63548+:10FD50001040000D3C0A0C003C090BFF00EA18247F
63549+:10FD60003525FFFF00A3302B10C0000830ED010047
63550+:10FD70003C0C08008D8C002C24150005258B0001FF
63551+:10FD80003C010800AC2B002C30ED010015A0000B4D
63552+:10FD90003C0500018F85000430AE400055C00007CF
63553+:10FDA0003C0500013C161F0100F690243C0F10009A
63554+:10FDB000124F01CE000000003C05000100E5302498
63555+:10FDC00010C000AF3C0C10003C1F08008FFF002447
63556+:10FDD00033E90002152000712403000100601021A6
63557+:10FDE000104000083C0680003C08800035180100E7
63558+:10FDF0008F0F00243C056020ACAF00140000000011
63559+:10FE00003C0680003C194000ACD9013800000000DD
63560+:10FE10005220001332060002262B0140262C0080BF
63561+:10FE2000240EFF80016E2024018E6824000D1940ED
63562+:10FE3000318A007F0004A9403172007F3C16200007
63563+:10FE400036C20002006A482502B2382500E2882541
63564+:10FE50000122F825ACDF0830ACD1083032060002B0
63565+:10FE600010C0FF723C188000370501408CA80000CC
63566+:10FE700024100040AF08002090AF000831E300706C
63567+:10FE8000107000D428790041532000082405006038
63568+:10FE9000241100201071000E3C0A40003C09800033
63569+:10FEA000AD2A01780A001304000000001465FFFB6E
63570+:10FEB0003C0A40000E001FFA000000003C0A40000F
63571+:10FEC0003C098000AD2A01780A00130400000000FC
63572+:10FED00090A90009241F00048CA70000312800FF0E
63573+:10FEE000111F01B22503FFFA2C7200061240001404
63574+:10FEF0003C0680008CA9000494A4000A310500FF90
63575+:10FF000000095E022D6A00083086FFFF15400002DE
63576+:10FF10002567000424070003240C000910AC01FA33
63577+:10FF200028AD000A11A001DE2410000A240E0008EA
63578+:10FF300010AE0028000731C000C038213C06800008
63579+:10FF40008CD501B806A0FFFE34D20180AE47000078
63580+:10FF500034CB0140916E0008240300023C0A4000AB
63581+:10FF600031C400FF00046A0001A86025A64C000807
63582+:10FF7000A243000B9562000A3C0810003C09800077
63583+:10FF8000A64200108D670004AE470024ACC801B83B
63584+:10FF9000AD2A01780A001304000000003C0A80002A
63585+:10FFA000354401009483000E3C0208008C4200D8C6
63586+:10FFB000240400803065FFFF245500013C01080047
63587+:10FFC000AC3500D80E000FDB240600030A001370C6
63588+:10FFD000000018210009320230D900FF2418000166
63589+:10FFE0001738FFD5000731C08F910020262200016D
63590+:10FFF000AF8200200A0013C800C0382100CB2024A3
63591+:020000021000EC
63592+:10000000AF85000010800008AF860004240D87FF34
63593+:1000100000CD6024158000083C0E006000AE302446
63594+:1000200010C00005000000000E000D42000000009E
63595+:100030000A001371000000000E0016050000000009
63596+:100040000A0013710000000030B980005320FF1F28
63597+:10005000AF8500003C02002000A2F82453E0FF1B03
63598+:10006000AF8500003C07FFFF34E47FFF00A4382485
63599+:100070000A00132B34C880000A001334010910242D
63600+:1000800000EC58245160005AAF8000248F8D002C62
63601+:100090003C0E0F0000EE182415A00075AF83001071
63602+:1000A00030EF010011E00073939800103C12020041
63603+:1000B000107200703C06800034D9010093280013B0
63604+:1000C0009789002A36A60002311800FF271600047F
63605+:1000D000001619C03C0480008C8501B804A0FFFE06
63606+:1000E00034880180AD0300003C158008AC830020FB
63607+:1000F00096BF004833E5FFFF10A001BCAF850008A4
63608+:100100002523001200A3102B504001B98F85000455
63609+:10011000348D010095AC0020240B001A30E440001F
63610+:10012000318AFFFFA10B000B108001BA2543FFFEAF
63611+:1001300000A3702B15C001B88F9600048F8F0004A8
63612+:10014000A503001435E50001AF8500043C088000DC
63613+:1001500035150180A6A9000EA6A9001A8F89000CEA
63614+:1001600030BF8000A6A70010AEA90028A6A60008F0
63615+:1001700013E0000F3C0F8000350C0100958B00163A
63616+:10018000316AFFFC25440004008818218C6240007D
63617+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
63618+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
63619+:1001B0002416BFFF00B6902435E50180A4B20026C6
63620+:1001C000ACA7002C3C071000ADE701B80A00137083
63621+:1001D000000018210E00165D000000003C0A4000DF
63622+:1001E0003C098000AD2A01780A00130400000000D9
63623+:1001F0008F85002410A00027AF80001090A300007E
63624+:10020000106000742409000310690101000030210E
63625+:1002100090AE0001240D000211CD014230EF0040EC
63626+:1002200090A90001241F0001113F000930E20040A5
63627+:100230008CA600049785002A00C020210E000FDB49
63628+:1002400036A60002000040210A00137001001821A8
63629+:100250005040FFF88CA600043C07080190E7964147
63630+:1002600010E0FFF4240800010A00137001001821B7
63631+:10027000939800103C1F080127FF96400018C8C043
63632+:10028000033F4021AF8800248F85002414A0FFDBAA
63633+:10029000AF9800103C0480008C86400030C50100FF
63634+:1002A00010A0008732AB00043C0C08008D8C0024A9
63635+:1002B00024160004156000033192000D241600027C
63636+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
63637+:1002D00032B5FFFB8C984000330F010055E0000160
63638+:1002E0002415001030E80800110000382409FFFB35
63639+:1002F0008F9F00282FF903EF53200001024990241B
63640+:1003000030E2010010400014325F00018F87002CA2
63641+:1003100014E0010E8F8C000C3C0480003486010038
63642+:1003200090C5001330AA00FF25430004000321C03C
63643+:100330002419FFFE025990241240000202B6302513
63644+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
63645+:1003500000001821325F000113E0000D3247000455
63646+:10036000240900011249000202B6302532A6FFFF1F
63647+:100370009785002A0E000FDB000020212402FFFEDB
63648+:10038000024290241240FE950000182132470004DA
63649+:1003900050E0FE922403000102B63025241600042A
63650+:1003A0005656000132A6FFFF9785002A0E000FDB8C
63651+:1003B000240401002403FFFB0243A82412A0FE87AB
63652+:1003C000000018210A001370240300010A0014B968
63653+:1003D0000249902410A0FFAF30E5010010A00017E3
63654+:1003E0008F8600102403000210C300148F84000CB9
63655+:1003F0003C0608008CC6003824CAFFFF14C0000267
63656+:10040000008A1024000010213C0E080025CE003880
63657+:10041000004E682191AC00048F850028258B0004D4
63658+:10042000000B21C030A5FFFF36A600020E000FDB37
63659+:10043000000000000A00137000001821240F0002C1
63660+:1004400010CF0088241600013C0308008C6300D004
63661+:100450001076008D8F85002824D9FFFC2F280004FA
63662+:100460001500006300002021241F0002107F005DA2
63663+:100470002CC9000C24C3FFF82C6200041440FFE9CF
63664+:100480000000202130EA020051400004000621C093
63665+:1004900054C0000530A5FFFF000621C030A5FFFFB6
63666+:1004A0000A00150436A600020E000FDB32A600017A
63667+:1004B0008F8600108F8500280A001520000621C0B5
63668+:1004C0003C0A08008D4A0024315200015240FE438C
63669+:1004D000000018219785002A36A600020E000FDBC7
63670+:1004E000000020210A001370000018219668000CFB
63671+:1004F000311802005700FE313C0500013C1F800806
63672+:1005000097F900489789002A36A600023328FFFF92
63673+:10051000AF8800083C0380008C7501B806A0FFFE80
63674+:100520003C04800034820180AC400000110000B621
63675+:1005300024180003252A0012010A182B106000B2AB
63676+:1005400000000000966F00203C0E8000240D001A71
63677+:1005500031ECFFFF35CA018030EB4000A14D000BAC
63678+:10056000116000B02583FFFE0103902B164000AE02
63679+:100570002416FFFE34A50001A5430014AF85000436
63680+:100580002419BFFF00B94024A6E9000EA6E9001A0D
63681+:10059000A6E60008A6E80026A6E700103C07100023
63682+:1005A000AE8701B80A001370000018213C048000D7
63683+:1005B0008C8201B80440FFFE349601802415001C93
63684+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
63685+:1005D0003C0A40003C098000AD2A01780A0013045F
63686+:1005E000000000005120FFA424C3FFF800002021D8
63687+:1005F00030A5FFFF0A00150436A600020E00103DCC
63688+:10060000000000008F8700000A001346AF82000C34
63689+:1006100090A30001241500011075FF0B24080001B0
63690+:10062000240600021066000430E2004024080001A5
63691+:100630000A001370010018215040FFFD240800013A
63692+:100640003C0C8000358B0100956A001094A40002D8
63693+:100650003143FFFF5083FDE1010018210A00158599
63694+:10066000240800018F8500282CB203EF1240FDDB27
63695+:10067000240300013C0308008C6300D02416000111
63696+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
63697+:10069000000621C030A5FFFF0A00150436A600029F
63698+:1006A00010B00037240F000B14AFFE23000731C039
63699+:1006B000312600FF00065600000A4E0305220047BF
63700+:1006C00030C6007F0006F8C03C16080126D69640CA
63701+:1006D00003F68021A2000001A20000003C0F600090
63702+:1006E0008DF918202405000100C588040011302769
63703+:1006F0000326C024000731C000C03821ADF81820FF
63704+:100700000A0013C8A60000028F850020000731C030
63705+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
63706+:100720002415002011E0FECC3C1980003728010080
63707+:100730009518001094B6000233120FFF16D2FEC6B1
63708+:10074000000000000A00148290A900013C0B080080
63709+:100750008D6B0038256DFFFF15600002018D1024A0
63710+:10076000000010213C080800250800380048C0217E
63711+:10077000930F000425EE00040A0014C5000E21C0EA
63712+:1007800000065202241F00FF115FFDEB000731C07D
63713+:10079000000A20C03C0E080125CE9640008EA821FC
63714+:1007A000009E602100095C02240D00013C076000EE
63715+:1007B000A2AD0000AD860000A2AB00018CF21820B3
63716+:1007C00024030001014310040242B025ACF61820B6
63717+:1007D00000C038210A0013C8A6A900020A0015AA01
63718+:1007E000AF8000200A0012FFAF84002C8F85000428
63719+:1007F0003C1980002408000337380180A308000B4F
63720+:100800000A00144D3C088000A2F8000B0A00155A9B
63721+:100810002419BFFF8F9600042412FFFE0A00144B18
63722+:1008200002D228242416FFFE0A00155800B62824F8
63723+:100830003C038000346401008C85000030A2003E3F
63724+:100840001440000800000000AC6000488C870000E5
63725+:1008500030E607C010C0000500000000AC60004C8E
63726+:10086000AC60005003E0000824020001AC600054BA
63727+:10087000AC6000408C880000310438001080FFF923
63728+:10088000000000002402000103E00008AC60004406
63729+:100890003C0380008C6201B80440FFFE3467018095
63730+:1008A000ACE4000024080001ACE00004A4E500086A
63731+:1008B00024050002A0E8000A34640140A0E5000B12
63732+:1008C0009483000A14C00008A4E30010ACE00024E4
63733+:1008D0003C07800034E901803C041000AD20002872
63734+:1008E00003E00008ACE401B88C8600043C0410006E
63735+:1008F000ACE600243C07800034E90180AD200028EC
63736+:1009000003E00008ACE401B83C0680008CC201B8EA
63737+:100910000440FFFE34C7018024090002ACE400005B
63738+:10092000ACE40004A4E50008A0E9000A34C50140D5
63739+:10093000A0E9000B94A8000A3C041000A4E80010F1
63740+:10094000ACE000248CA30004ACE3002803E0000822
63741+:10095000ACC401B83C039000346200010082202541
63742+:100960003C038000AC6400208C65002004A0FFFEE6
63743+:100970000000000003E00008000000003C028000CE
63744+:10098000344300010083202503E00008AC4400202C
63745+:1009900027BDFFE03C098000AFBF0018AFB10014D5
63746+:1009A000AFB00010352801408D10000091040009FF
63747+:1009B0009107000891050008308400FF30E600FF31
63748+:1009C00000061A002C820081008330251040002A86
63749+:1009D00030A50080000460803C0D080125AD92B078
63750+:1009E000018D58218D6A00000140000800000000C0
63751+:1009F0003C038000346201409445000A14A0001EAC
63752+:100A00008F91FCC09227000530E6000414C0001A44
63753+:100A1000000000000E00164E02002021922A000560
63754+:100A200002002021354900040E001658A2290005B5
63755+:100A30009228000531040004148000020000000028
63756+:100A40000000000D922D0000240B002031AC00FFAF
63757+:100A5000158B00093C0580008CAE01B805C0FFFE77
63758+:100A600034B10180AE3000003C0F100024100005AE
63759+:100A7000A230000BACAF01B80000000D8FBF001812
63760+:100A80008FB100148FB0001003E0000827BD0020D4
63761+:100A90000200202100C028218FBF00188FB1001450
63762+:100AA0008FB00010240600010A00161D27BD00208B
63763+:100AB0000000000D0200202100C028218FBF001877
63764+:100AC0008FB100148FB00010000030210A00161DF5
63765+:100AD00027BD002014A0FFE8000000000200202134
63766+:100AE0008FBF00188FB100148FB0001000C02821F4
63767+:100AF0000A00163B27BD00203C0780008CEE01B8A1
63768+:100B000005C0FFFE34F00180241F0002A21F000B6D
63769+:100B100034F80140A60600089719000A3C0F10009F
63770+:100B2000A61900108F110004A6110012ACEF01B835
63771+:100B30000A0016998FBF001827BDFFE8AFBF00104D
63772+:100B40000E000FD4000000003C0280008FBF001098
63773+:100B500000002021AC4001800A00108F27BD001842
63774+:100B60003084FFFF30A5FFFF108000070000182130
63775+:100B7000308200011040000200042042006518216C
63776+:100B80001480FFFB0005284003E0000800601021EE
63777+:100B900010C00007000000008CA2000024C6FFFF68
63778+:100BA00024A50004AC82000014C0FFFB24840004D0
63779+:100BB00003E000080000000010A0000824A3FFFFCD
63780+:100BC000AC86000000000000000000002402FFFFCF
63781+:100BD0002463FFFF1462FFFA2484000403E000088A
63782+:100BE000000000003C03800027BDFFF83462018054
63783+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
63784+:100C00003C0B80008D6401B80480FFFE00000000F2
63785+:100C10008FA900008D6801288FAA00008FA700000F
63786+:100C20008FA400002405000124020002A085000A10
63787+:100C30008FA30000359940003C051000A062000B16
63788+:100C40008FB800008FAC00008FA600008FAF0000AF
63789+:100C500027BD0008AD280000AD400004AD80002491
63790+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
63791+:100C700003E00008AD6501B83C06800827BDFFE829
63792+:100C800034C50080AFBF001090A7000924020012F5
63793+:100C900030E300FF1062000B008030218CA8005070
63794+:100CA00000882023048000088FBF00108CAA003425
63795+:100CB000240400390000282100CA4823052000052B
63796+:100CC000240600128FBF00102402000103E0000878
63797+:100CD00027BD00180E0016F2000000008FBF0010A4
63798+:100CE0002402000103E0000827BD001827BDFFC84B
63799+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
63800+:100D000000A0802190A5000D30A6001010C000109A
63801+:100D1000008090213C0280088C4400048E0300086F
63802+:100D20001064000C30A7000530A6000510C0009329
63803+:100D3000240400018FBF00348FB200308FB1002C2B
63804+:100D40008FB000280080102103E0000827BD003884
63805+:100D500030A7000510E0000F30AB001210C00006F5
63806+:100D6000240400013C0980088E0800088D25000439
63807+:100D70005105009C240400388FBF00348FB200302E
63808+:100D80008FB1002C8FB000280080102103E00008F4
63809+:100D900027BD0038240A0012156AFFE6240400016A
63810+:100DA0000200202127A500100E000CB6AFA00010F5
63811+:100DB0001440007C3C19800837240080909800087B
63812+:100DC000331100081220000A8FA7001030FF010025
63813+:100DD00013E000A48FA300148C8600580066102333
63814+:100DE000044000043C0A8008AC8300588FA7001020
63815+:100DF0003C0A800835480080910900083124000829
63816+:100E00001480000224080003000040213C1F8008D9
63817+:100E100093F1001193F9001237E600808CCC005456
63818+:100E2000333800FF03087821322D00FF000F708057
63819+:100E300001AE282100AC582B1160006F00000000AB
63820+:100E400094CA005C8CC900543144FFFF0125102373
63821+:100E50000082182B14600068000000008CCB005446
63822+:100E60000165182330EC00041180006C000830800C
63823+:100E70008FA8001C0068102B1040006230ED0004A9
63824+:100E8000006610232C46008010C00002004088211C
63825+:100E9000241100800E00164E024020213C0D8008D7
63826+:100EA00035A6008024070001ACC7000C90C80008DC
63827+:100EB0000011484035A70100310C007FA0CC00088C
63828+:100EC0008E05000424AB0001ACCB0030A4D1005C43
63829+:100ED0008CCA003C9602000E01422021ACC40020C6
63830+:100EE0008CC3003C0069F821ACDF001C8E190004A3
63831+:100EF000ACF900008E180008ACF800048FB10010A7
63832+:100F0000322F000855E0004793A60020A0C0004EF5
63833+:100F100090D8004E2411FFDFA0F8000890CF000801
63834+:100F200001F17024A0CE00088E0500083C0B80085B
63835+:100F300035690080AD2500388D6A00148D2200309F
63836+:100F40002419005001422021AD24003491230000D7
63837+:100F5000307F00FF13F90036264F01000E001658AF
63838+:100F60000240202124040038000028210E0016F23F
63839+:100F70002406000A0A001757240400010E000D2859
63840+:100F8000000020218FBF00348FB200308FB1002CC1
63841+:100F90008FB00028004020210080102103E00008CD
63842+:100FA00027BD00388E0E00083C0F800835F0008009
63843+:100FB000AE0E005402402021AE0000300E00164E4E
63844+:100FC00000000000920D00250240202135AC0020D9
63845+:100FD0000E001658A20C00250E000CAC0240202179
63846+:100FE000240400382405008D0E0016F22406001299
63847+:100FF0000A0017572404000194C5005C0A001792E8
63848+:1010000030A3FFFF2407021811A0FF9E00E6102363
63849+:101010008FAE001C0A00179A01C610230A0017970A
63850+:101020002C620218A0E600080A0017C48E0500080A
63851+:101030002406FF8001E6C0243C118000AE38002861
63852+:101040008E0D000831E7007F3C0E800C00EE602121
63853+:10105000AD8D00E08E080008AF8C00380A0017D074
63854+:10106000AD8800E4AC800058908500082403FFF7A9
63855+:1010700000A33824A08700080A0017758FA7001066
63856+:101080003C05080024A560A83C04080024846FF4F3
63857+:101090003C020800244260B0240300063C01080121
63858+:1010A000AC2596C03C010801AC2496C43C01080163
63859+:1010B000AC2296C83C010801A02396CC03E00008AE
63860+:1010C0000000000003E00008240200013C02800050
63861+:1010D000308800FF344701803C0680008CC301B893
63862+:1010E0000460FFFE000000008CC501282418FF806A
63863+:1010F0003C0D800A24AF010001F8702431EC007F20
63864+:10110000ACCE0024018D2021ACE50000948B00EAD8
63865+:101110003509600024080002316AFFFFACEA0004D0
63866+:1011200024020001A4E90008A0E8000BACE00024C0
63867+:101130003C071000ACC701B8AF84003803E00008DA
63868+:10114000AF85006C938800488F8900608F820038DB
63869+:1011500030C600FF0109382330E900FF01221821C1
63870+:1011600030A500FF2468008810C000020124382147
63871+:101170000080382130E400031480000330AA00030B
63872+:101180001140000D312B000310A0000900001021B8
63873+:1011900090ED0000244E000131C200FF0045602B9D
63874+:1011A000A10D000024E700011580FFF925080001CA
63875+:1011B00003E00008000000001560FFF300000000DD
63876+:1011C00010A0FFFB000010218CF80000245900043F
63877+:1011D000332200FF0045782BAD18000024E70004FF
63878+:1011E00015E0FFF92508000403E0000800000000F6
63879+:1011F00093850048938800588F8700600004320070
63880+:101200003103007F00E5102B30C47F001040000F39
63881+:10121000006428258F8400383C0980008C8A00EC0B
63882+:10122000AD2A00A43C03800000A35825AC6B00A0AD
63883+:101230008C6C00A00580FFFE000000008C6D00ACEF
63884+:10124000AC8D00EC03E000088C6200A80A00188254
63885+:101250008F840038938800593C0280000080502120
63886+:10126000310300FEA383005930ABFFFF30CC00FFF9
63887+:1012700030E7FFFF344801803C0980008D2401B82D
63888+:101280000480FFFE8F8D006C24180016AD0D000049
63889+:101290008D2201248F8D0038AD0200048D5900206D
63890+:1012A000A5070008240201C4A119000AA118000B17
63891+:1012B000952F01208D4E00088D4700049783005C18
63892+:1012C0008D59002401CF302100C7282100A32023FD
63893+:1012D0002418FFFFA504000CA50B000EA5020010AA
63894+:1012E000A50C0012AD190018AD18002495AF00E848
63895+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
63896+:101300008DAC0084AD0C002CAD2B01B88D460020B7
63897+:1013100000C7282403E00008AD4500208F8800386E
63898+:101320000080582130E7FFFF910900D63C02800081
63899+:1013300030A5FFFF312400FF00041A00006750258C
63900+:1013400030C600FF344701803C0980008D2C01B875
63901+:101350000580FFFE8F82006C240F0017ACE20000B6
63902+:101360008D390124ACF900048D780020A4EA00082E
63903+:10137000241901C4A0F8000AA0EF000B9523012056
63904+:101380008D6E00088D6D00049784005C01C35021B0
63905+:10139000014D602101841023A4E2000CA4E5000E9D
63906+:1013A000A4F90010A4E60012ACE000148D7800242B
63907+:1013B000240DFFFFACF800188D0F007CACEF001C73
63908+:1013C0008D0E00783C0F1000ACEE0020ACED002438
63909+:1013D000950A00BE240DFFF73146FFFFACE600285A
63910+:1013E000950C00809504008231837FFF0003CA00C2
63911+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
63912+:10140000950E00828D6A002000AE3021014D282407
63913+:10141000A506008203E00008AD6500203C028000C4
63914+:10142000344501803C0480008C8301B80460FFFED9
63915+:101430008F8A0044240600199549001C3128FFFFBB
63916+:10144000000839C0ACA70000A0A6000B3C051000A6
63917+:1014500003E00008AC8501B88F87004C0080402174
63918+:1014600030C400FF3C0680008CC201B80440FFFE7F
63919+:101470008F89006C9383006834996000ACA90000E8
63920+:10148000A0A300058CE20010240F00022403FFF744
63921+:10149000A4A20006A4B900088D180020A0B8000A74
63922+:1014A000A0AF000B8CEE0000ACAE00108CED000481
63923+:1014B000ACAD00148CEC001CACAC00248CEB002018
63924+:1014C000ACAB00288CEA002C3C071000ACAA002C26
63925+:1014D0008D090024ACA90018ACC701B88D05002007
63926+:1014E00000A3202403E00008AD0400208F8600380C
63927+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
63928+:1015000090C300D430A500FF3062002010400008D6
63929+:10151000008088218CCB00D02409FFDF256A0001E0
63930+:10152000ACCA00D090C800D401093824A0C700D4A8
63931+:1015300014A000403C0C80008F840038908700D4B9
63932+:101540002418FFBF2406FFEF30E3007FA08300D400
63933+:10155000979F005C8F8200608F8D003803E2C82364
63934+:10156000A799005CA5A000BC91AF00D401F870243D
63935+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
63936+:10158000A5400082AD4000EC914500D400A658244F
63937+:10159000A14B00D48F9000348F8400609786005C4C
63938+:1015A0000204282110C0000FAF850034A38000582A
63939+:1015B0003C0780008E2C000894ED01208E2B000447
63940+:1015C000018D5021014B8021020620233086FFFF30
63941+:1015D00030C8000F3909000131310001162000091F
63942+:1015E000A3880058938600488FBF00188FB100145D
63943+:1015F0008FB0001027BD0020AF85006403E0000815
63944+:10160000AF86006000C870238FBF00189386004823
63945+:101610008FB100148FB0001034EF0C00010F28219F
63946+:1016200027BD0020ACEE0084AF85006403E0000815
63947+:10163000AF86006035900180020028210E00190F4E
63948+:10164000240600828F840038908600D430C5004084
63949+:1016500050A0FFBAA38000688F85004C3C06800034
63950+:101660008CCD01B805A0FFFE8F89006C2408608234
63951+:1016700024070002AE090000A6080008A207000B1C
63952+:101680008CA300083C0E1000AE0300108CA2000CCE
63953+:10169000AE0200148CBF0014AE1F00188CB90018E5
63954+:1016A000AE1900248CB80024AE1800288CAF002896
63955+:1016B000AE0F002CACCE01B80A001948A380006818
63956+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
63957+:1016D0008F880060AFBF00189389003C954200BC22
63958+:1016E00030D100FF0109182B0080802130AC00FFB1
63959+:1016F0003047FFFF0000582114600003310600FF4F
63960+:1017000001203021010958239783005C0068202BB9
63961+:101710001480002700000000106800562419000102
63962+:101720001199006334E708803165FFFF0E0018C08F
63963+:10173000020020218F83006C3C07800034E601808A
63964+:101740003C0580008CAB01B80560FFFE240A001840
63965+:101750008F840038ACC30000A0CA000B948900BE7F
63966+:101760003C081000A4C90010ACC00030ACA801B8FF
63967+:101770009482008024430001A4830080949F008011
63968+:101780003C0608008CC6318833EC7FFF1186005E72
63969+:101790000000000002002021022028218FBF001835
63970+:1017A0008FB100148FB000100A00193427BD00203B
63971+:1017B000914400D42403FF8000838825A15100D4E4
63972+:1017C0009784005C3088FFFF51000023938C003C1D
63973+:1017D0008F8500382402EFFF008B782394AE00BC85
63974+:1017E0000168502B31E900FF01C26824A4AD00BCA0
63975+:1017F00051400039010058213C1F800037E60100AC
63976+:101800008CD800043C190001031940245500000144
63977+:1018100034E740008E0A00202403FFFB241100015E
63978+:1018200001432024AE0400201191002D34E78000F4
63979+:1018300002002021012030210E0018C03165FFFF79
63980+:101840009787005C8F890060A780005C0127802358
63981+:10185000AF900060938C003C8F8B00388FBF0018D6
63982+:101860008FB100148FB0001027BD002003E00008E6
63983+:10187000A16C00D73C0D800035AA01008D48000402
63984+:101880003C0900010109282454A0000134E740006C
63985+:101890008E0F00202418FFFB34E7800001F870242D
63986+:1018A00024190001AE0E00201599FF9F34E708802F
63987+:1018B000020020210E00188E3165FFFF020020215A
63988+:1018C000022028218FBF00188FB100148FB00010A4
63989+:1018D0000A00193427BD00200A0019F7000048212A
63990+:1018E00002002021012030210E00188E3165FFFFFB
63991+:1018F0009787005C8F890060A780005C01278023A8
63992+:101900000A001A0EAF900060948C0080241F8000A3
63993+:10191000019F3024A4860080908B0080908F0080EF
63994+:10192000316700FF0007C9C20019C027001871C045
63995+:1019300031ED007F01AE2825A08500800A0019DF67
63996+:1019400002002021938500682403000127BDFFE8E1
63997+:1019500000A330042CA20020AFB00010AFBF0014D1
63998+:1019600000C01821104000132410FFFE3C0708009F
63999+:101970008CE7319000E610243C088000350501809A
64000+:1019800014400005240600848F890038240A0004CE
64001+:101990002410FFFFA12A00FC0E00190F0000000018
64002+:1019A000020010218FBF00148FB0001003E0000868
64003+:1019B00027BD00183C0608008CC631940A001A574F
64004+:1019C00000C310248F87004427BDFFE0AFB200188A
64005+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
64006+:1019E00090E6000D00A088210080902130C5007F86
64007+:1019F000A0E5000D8F8500388E2300188CA200D042
64008+:101A00001062002E240A000E0E001A4AA38A0068F3
64009+:101A10002409FFFF104900222404FFFF5200002088
64010+:101A2000000020218E2600003C0C001000CC582421
64011+:101A3000156000393C0E000800CE682455A0003F18
64012+:101A4000024020213C18000200D880241200001F10
64013+:101A50003C0A00048F8700448CE200148CE30010E1
64014+:101A60008CE500140043F82303E5C82B1320000580
64015+:101A7000024020218E24002C8CF1001010910031A6
64016+:101A80000240202124020012A38200680E001A4A9C
64017+:101A90002412FFFF105200022404FFFF0000202147
64018+:101AA0008FBF001C8FB200188FB100148FB00010D0
64019+:101AB0000080102103E0000827BD002090A800D47A
64020+:101AC000350400200A001A80A0A400D400CA4824CB
64021+:101AD0001520000B8F8B00448F8D00448DAC0010BF
64022+:101AE0001580000B024020218E2E002C51C0FFECEF
64023+:101AF00000002021024020210A001A9B2402001726
64024+:101B00008D66001050C0FFE6000020210240202119
64025+:101B10000A001A9B24020011024020212402001511
64026+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
64027+:101B30002404FFFF0A001A8A8E2600000A001AC138
64028+:101B4000240200143C08000400C8382450E0FFD4EC
64029+:101B500000002021024020210A001A9B24020013C9
64030+:101B60008F85003827BDFFD8AFB3001CAFB2001877
64031+:101B7000AFB10014AFB00010AFBF002090A700D4E9
64032+:101B80008F90004C2412FFFF34E2004092060000C8
64033+:101B9000A0A200D48E0300100080982110720006CD
64034+:101BA00030D1003F2408000D0E001A4AA3880068B7
64035+:101BB000105200252404FFFF8F8A00388E09001878
64036+:101BC0008D4400D01124000702602021240C000E57
64037+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
64038+:101BE0002404FFFF24040020122400048F8D0038F9
64039+:101BF00091AF00D435EE0020A1AE00D48F85005403
64040+:101C000010A00019000000001224004A8F9800382C
64041+:101C10008F92FCC0971000809651000A5230004805
64042+:101C20008F9300403C1F08008FFF318C03E5C82BC9
64043+:101C30001720001E02602021000028210E0019A993
64044+:101C400024060001000020218FBF00208FB3001C5C
64045+:101C50008FB200188FB100148FB0001000801021D7
64046+:101C600003E0000827BD00285224002A8E05001436
64047+:101C70008F840038948A008025490001A48900805F
64048+:101C8000948800803C0208008C42318831077FFF35
64049+:101C900010E2000E00000000026020210E00193446
64050+:101CA000240500010A001B0B000020212402002D46
64051+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
64052+:101CC0002404FFFF0A001B0C8FBF002094990080A2
64053+:101CD000241F800024050001033FC024A498008035
64054+:101CE00090920080908E0080325100FF001181C2DE
64055+:101CF00000107827000F69C031CC007F018D582576
64056+:101D0000A08B00800E001934026020210A001B0BFA
64057+:101D1000000020212406FFFF54A6FFD68F84003840
64058+:101D2000026020210E001934240500010A001B0B5B
64059+:101D300000002021026020210A001B252402000A45
64060+:101D40002404FFFD0A001B0BAF9300608F8800384E
64061+:101D500027BDFFE8AFB00010AFBF0014910A00D458
64062+:101D60008F87004C00808021354900408CE60010B0
64063+:101D7000A10900D43C0208008C4231B030C53FFFBD
64064+:101D800000A2182B106000078F850050240DFF80E3
64065+:101D900090AE000D01AE6024318B00FF156000088D
64066+:101DA0000006C382020020212403000D8FBF00140F
64067+:101DB0008FB0001027BD00180A001A4AA3830068DC
64068+:101DC00033060003240F000254CFFFF70200202146
64069+:101DD00094A2001C8F85003824190023A4A200E8D7
64070+:101DE0008CE8000000081E02307F003F13F9003528
64071+:101DF0003C0A00838CE800188CA600D0110600086D
64072+:101E0000000000002405000E0E001A4AA385006899
64073+:101E10002407FFFF104700182404FFFF8F850038B8
64074+:101E200090A900D435240020A0A400D48F8C0044B5
64075+:101E3000918E000D31CD007FA18D000D8F83005458
64076+:101E40001060001C020020218F8400508C9800102C
64077+:101E50000303782B11E0000D241900180200202143
64078+:101E6000A39900680E001A4A2410FFFF10500002C8
64079+:101E70002404FFFF000020218FBF00148FB000104A
64080+:101E80000080102103E0000827BD00188C86001098
64081+:101E90008F9F00440200202100C31023AFE20010F6
64082+:101EA000240500010E0019A9240600010A001B9751
64083+:101EB000000020210E001934240500010A001B97A0
64084+:101EC00000002021010A5824156AFFD98F8C004494
64085+:101ED000A0A600FC0A001B84A386005A30A500FFC0
64086+:101EE0002406000124A9000100C9102B1040000C99
64087+:101EF00000004021240A000100A61823308B0001B5
64088+:101F000024C60001006A3804000420421160000267
64089+:101F100000C9182B010740251460FFF800A61823FC
64090+:101F200003E000080100102127BDFFD8AFB0001862
64091+:101F30008F90004CAFB1001CAFBF00202403FFFF07
64092+:101F40002411002FAFA30010920600002405000802
64093+:101F500026100001006620260E001BB0308400FF12
64094+:101F600000021E003C021EDC34466F410A001BD8F2
64095+:101F70000000102110A00009008018212445000154
64096+:101F800030A2FFFF2C4500080461FFFA0003204047
64097+:101F90000086202614A0FFF9008018210E001BB037
64098+:101FA000240500208FA300102629FFFF313100FFF8
64099+:101FB00000034202240700FF1627FFE20102182651
64100+:101FC00000035027AFAA0014AFAA00100000302170
64101+:101FD00027A8001027A7001400E6782391ED00033E
64102+:101FE00024CE000100C8602131C600FF2CCB0004C4
64103+:101FF0001560FFF9A18D00008FA200108FBF002097
64104+:102000008FB1001C8FB0001803E0000827BD002826
64105+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
64106+:10202000AFB50024AFB40020AFB20018AFB10014B8
64107+:102030003C0C80008D880128240FFF803C06800A1C
64108+:1020400025100100250B0080020F68243205007F57
64109+:10205000016F7024AD8E009000A62821AD8D002464
64110+:1020600090A600FC3169007F3C0A8004012A1821F7
64111+:10207000A386005A9067007C00809821AF830030CF
64112+:1020800030E20002AF88006CAF85003800A0182154
64113+:10209000144000022404003424040030A3840048C7
64114+:1020A0008C7200DC30D100FF24040004AF92006089
64115+:1020B00012240004A38000688E7400041680001EA1
64116+:1020C0003C0880009386005930C7000110E0000FE3
64117+:1020D0008F9300608CB000848CA800842404FF805F
64118+:1020E000020410240002F940310A007F03EA482567
64119+:1020F0003C0C2000012C902530CD00FE3C038000DC
64120+:10210000AC720830A38D00598F9300608FBF0028F8
64121+:102110008FB50024ACB300DC8FB400208FB3001C5B
64122+:102120008FB200188FB100148FB00010240200018C
64123+:1021300003E0000827BD00308E7F000895020120D3
64124+:102140008E67001003E2C8213326FFFF30D8000F4E
64125+:1021500033150001AF87003416A00058A39800582B
64126+:1021600035090C000309382100D81823AD03008479
64127+:10217000AF8700648E6A00043148FFFF1100007EC3
64128+:10218000A78A005C90AC00D42407FF8000EC3024C8
64129+:1021900030CB00FF1560004B9786005C938E005A91
64130+:1021A000240D000230D5FFFF11CD02A20000A021B6
64131+:1021B0008F85006002A5802B160000BC9388004824
64132+:1021C0003C11800096240120310400FF1485008812
64133+:1021D0008F8400648F9800343312000356400085CA
64134+:1021E00030A500FF8F900064310C00FF24060034FE
64135+:1021F00011860095AF90004C9204000414800118E1
64136+:102200008F8E0038A380003C8E0D00048DC800D84E
64137+:102210003C0600FF34CCFFFF01AC30240106182B34
64138+:1022200014600120AF8600548F8700609798005C8F
64139+:10223000AF8700400307402310C000C7A788005C99
64140+:102240008F91003030C3000300035823922A007C92
64141+:102250003171000302261021000A20823092000111
64142+:102260000012488000492821311FFFFF03E5C82BD9
64143+:10227000132001208F8800388F8500348F880064F8
64144+:102280001105025A3C0E3F018E0600003C0C250051
64145+:1022900000CE682411AC01638F84004C30E500FF50
64146+:1022A0000E00184A000030218F8800388F870060A8
64147+:1022B0008F8500340A001DB78F8600540A001C5613
64148+:1022C000AF87006490A400D400E48024320200FFB1
64149+:1022D000104000169386005990A6008890AE00D753
64150+:1022E00024A8008830D4003F2686FFE02CD10020AF
64151+:1022F000A38E003C1220000CAF88004C240B000180
64152+:1023000000CB20043095001916A0012B3C0680005C
64153+:1023100034CF0002008FC0241700022E3099002015
64154+:1023200017200234000000009386005930CB0001D2
64155+:102330001160000F9788005C8CBF00848CA900841A
64156+:10234000240AFF8003EA6024000C19403132007F28
64157+:10235000007238253C0D200000EDC82530D800FE65
64158+:102360003C0F8000ADF90830A39800599788005CB5
64159+:102370001500FF84000000008E630020306200041E
64160+:102380001040FF51938600592404FFFB0064802411
64161+:102390003C038000AE700020346601808C7301B86D
64162+:1023A0000660FFFE8F98006C347501003C1400013C
64163+:1023B000ACD800008C6B012424076085ACCB0004F2
64164+:1023C0008EAE000401D488245220000124076083CB
64165+:1023D00024190002A4C700083C0F1000A0D9000B6C
64166+:1023E0003C068000ACCF01B80A001C2B9386005934
64167+:1023F00030A500FF0E00184A240600018F88006CEB
64168+:102400003C05800034A90900250201889388004812
64169+:10241000304A0007304B00783C0340802407FF809F
64170+:102420000163C825014980210047F824310C00FFD1
64171+:1024300024060034ACBF0800AF90004CACB90810C3
64172+:102440005586FF6E920400048F8400388E11003090
64173+:10245000908E00D431CD001015A000108F83006045
64174+:102460002C6F000515E000E400000000909800D4F7
64175+:102470002465FFFC331200101640000830A400FF52
64176+:102480008F9F00648F99003413F90004388700018E
64177+:1024900030E20001144001C8000000000E001BC320
64178+:1024A000000000000A001DF8000000008F84006496
64179+:1024B00030C500FF0E00184A24060001939800481A
64180+:1024C000240B0034130B00A08F8500388F8600602A
64181+:1024D0009783005C306EFFFF00CE8823AF910060D1
64182+:1024E000A780005C1280FF90028018212414FFFD59
64183+:1024F0005474FFA28E6300208E6A00042403FFBF81
64184+:102500002408FFEF0155F823AE7F000490AC00D4FF
64185+:102510003189007FA0A900D48E7200208F8F0038EF
64186+:10252000A780005C364D0002AE6D0020A5E000BC27
64187+:1025300091E500D400A3C824A1F900D48F950038F8
64188+:10254000AEA000EC92B800D403085824A2AB00D48B
64189+:102550000A001CD78F8500388F910034AF8000604F
64190+:1025600002275821AF8B0034000020212403FFFFF5
64191+:10257000108301B48F8500388E0C00103C0D0800CC
64192+:102580008DAD31B09208000031843FFF008D802B6B
64193+:1025900012000023310D003F3C1908008F3931A88B
64194+:1025A0008F9F006C000479802408FF80033F202166
64195+:1025B000008FC821938500590328F8243C06008029
64196+:1025C0003C0F800034D80001001F91403331007F60
64197+:1025D0008F8600380251502535EE0940332B0078A4
64198+:1025E000333000073C0310003C02800C017890253A
64199+:1025F000020E48210143C0250222382134AE0001D9
64200+:10260000ADFF0804AF890050ADF20814AF87004455
64201+:10261000ADFF0028ACD90084ADF80830A38E005976
64202+:102620009383005A24070003106700272407000142
64203+:102630001467FFAC8F8500382411002311B1008589
64204+:1026400000000000240E000B026020210E001A4A38
64205+:10265000A38E00680040A0210A001D328F8500383B
64206+:1026600002602021240B000C0E001A4AA38B006884
64207+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
64208+:10268000A380003C8E0D00048DC800D83C0600FFDE
64209+:1026900034CCFFFF01AC30240106182B1060FEE2A1
64210+:1026A000AF86005402602021241200190E001A4A3D
64211+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
64212+:1026C0000A001C838F86005425A3FFE02C74002091
64213+:1026D0001280FFDD240E000B000328803C1108014E
64214+:1026E000263194B400B148218D2D000001A00008CE
64215+:1026F000000000008F85003400A710219385003C66
64216+:10270000AF82003402251821A383003C951F00BC32
64217+:102710000226282137F91000A51900BC5240FF926B
64218+:10272000AF850060246A0004A38A003C950900BCC0
64219+:1027300024A40004AF84006035322000A51200BC40
64220+:102740000A001D54000020218F8600602CC800055F
64221+:102750001500FF609783005C3065FFFF00C5C8234C
64222+:102760002F2F000511E00003306400FF24CDFFFC93
64223+:1027700031A400FF8F8900648F920034113200046D
64224+:10278000389F000133EC0001158001380000000083
64225+:102790008F840038908700D434E60010A08600D4DF
64226+:1027A0008F8500388F8600609783005CACA000ECBA
64227+:1027B0000A001D2F306EFFFF8CB500848CB400849E
64228+:1027C0003C04100002A7302400068940328E007FAE
64229+:1027D000022E8025020410253C08800024050001FB
64230+:1027E00002602021240600010E0019A9AD02083064
64231+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
64232+:102800000260202124090005A38900680E001A4AED
64233+:102810002411FFFF1451FE782404FFFF0A001D5508
64234+:102820002403FFFF8F8F004C8F8800388DF8000045
64235+:10283000AD1800888DE70010AD0700988F87006005
64236+:102840000A001DB78F8600542406FFFF118600057D
64237+:10285000000000000E001B4C026020210A001D8FAA
64238+:102860000040A0210E001AD1026020210A001D8F15
64239+:102870000040A0218F90004C3C0208008C4231B0F7
64240+:102880008E110010322C3FFF0182282B10A0000C6B
64241+:10289000240BFF808F85005090A3000D01637024EE
64242+:1028A00031CA00FF1140000702602021001143825D
64243+:1028B000310600032418000110D8010600000000B2
64244+:1028C000026020212403000D0E001A4AA383006831
64245+:1028D000004020218F8500380A001D320080A02191
64246+:1028E0008F90004C3C0A08008D4A31B08F85005013
64247+:1028F0008E0400100000A0218CB1001430823FFF34
64248+:10290000004A602B8CB200205180FFEE0260202133
64249+:1029100090B8000D240BFF800178702431C300FFB4
64250+:102920005060FFE80260202100044382310600036A
64251+:1029300014C0FFE40260202194BF001C8F9900386E
64252+:102940008E060028A73F00E88CAF0010022F20233E
64253+:1029500014C4013A026020218F83005400C368210F
64254+:10296000022D382B14E00136240200188F8A00440F
64255+:102970008F820030024390218D4B00100163702341
64256+:10298000AD4E0010AD5200208C4C00740192282BEB
64257+:1029900014A0015F026020218F8400508E08002463
64258+:1029A0008C86002411060007026020212419001CD7
64259+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
64260+:1029C0002404FFFF8F8400448C87002424FF00012F
64261+:1029D000AC9F00241251012F8F8D00308DB10074F7
64262+:1029E0001232012C3C0B00808E0E000001CB5024D3
64263+:1029F00015400075000000008E0300142411FFFF35
64264+:102A0000107100073C0808003C0608008CC6319095
64265+:102A100000C8C0241300015202602021A380006876
64266+:102A20008E0300003C19000100792024108000135F
64267+:102A30003C1F0080007FA02416800009020028218E
64268+:102A4000026020212411001A0E001A4AA391006886
64269+:102A50002407FFFF1047FF9F2404FFFF02002821E7
64270+:102A6000026020210E001A6A240600012410FFFFD4
64271+:102A70001050FF982404FFFF241400018F8D0044A0
64272+:102A8000026020210280302195A900342405000134
64273+:102A9000253200010E0019A9A5B200340000202142
64274+:102AA0008F8500380A001D320080A0218F90004CD5
64275+:102AB0003C1408008E9431B08E07001030E53FFFC3
64276+:102AC00000B4C82B132000618F8600502412FF80B1
64277+:102AD00090C9000D0249682431A400FF5080005CB9
64278+:102AE000026020218F8C00541180000700078B8228
64279+:102AF0008F8500388F82FCC094BF0080944A000A02
64280+:102B0000515F00F78F8600403227000314E0006415
64281+:102B100000000000920E000211C000D8000000006A
64282+:102B20008E0B0024156000D902602021920400035E
64283+:102B300024190002308500FF14B90005308900FF18
64284+:102B40008F940054128000EA240D002C308900FF7D
64285+:102B5000392C00102D8400012D3200010244302553
64286+:102B6000020028210E001A6A026020212410FFFFB3
64287+:102B7000105000BF8F8500388F830054106000D341
64288+:102B8000240500013C0A08008D4A318C0143F82BD2
64289+:102B900017E000B22402002D02602021000028214D
64290+:102BA0000E0019A9240600018F85003800001821A5
64291+:102BB0000A001D320060A0210E0018750000000000
64292+:102BC0000A001DF800000000AC8000200A001E78FA
64293+:102BD0008E03001400002821026020210E0019A994
64294+:102BE000240600010A001CC38F8500380A001DB7A7
64295+:102BF0008F8800388CAA00848CAC00843C031000C1
64296+:102C00000147F824001F91403189007F024968255F
64297+:102C100001A32825ACC50830910700012405000157
64298+:102C2000026020210E0019A930E600010A001CC331
64299+:102C30008F850038938F00482403FFFD0A001D3460
64300+:102C4000AF8F00600A001D342403FFFF02602021C3
64301+:102C50002410000D0E001A4AA390006800401821AD
64302+:102C60008F8500380A001D320060A0210E00187503
64303+:102C7000000000009783005C8F86006000402021E8
64304+:102C80003070FFFF00D010232C4A00051140FE11C8
64305+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
64306+:102CA00090CF000D31E300085460FFA192040003AF
64307+:102CB00002602021240200100E001A4AA38200683C
64308+:102CC0002403FFFF5443FF9A920400030A001F12DB
64309+:102CD0008F85003890A4000D308F000811E000951A
64310+:102CE0008F990054572000A6026020218E1F000CEF
64311+:102CF0008CB4002057F40005026020218E0D0008DE
64312+:102D00008CA7002411A7003A026020212402002091
64313+:102D1000A38200680E001A4A2412FFFF1052FEED33
64314+:102D20002404FFFF8F9F00442402FFF73C14800E11
64315+:102D300093EA000D2419FF803C03800001423824EF
64316+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
64317+:102D50008F8C006C97F200788F870044012C302113
64318+:102D6000324D7FFF000D204000C4782131E5007F07
64319+:102D700000B4C02101F94024AC68002CA711000068
64320+:102D80008CEB0028256E0001ACEE00288CEA002CAC
64321+:102D90008E02002C01426021ACEC002C8E09002C2C
64322+:102DA000ACE900308E120014ACF2003494ED003A1D
64323+:102DB00025A40001A4E4003A97E600783C1108003D
64324+:102DC0008E3131B024C3000130707FFF1211005CDE
64325+:102DD000006030218F8F0030026020212405000127
64326+:102DE0000E001934A5E600780A001EA1000020217B
64327+:102DF0008E0900142412FFFF1132006B8F8A0038F5
64328+:102E00008E0200188D4C00D0144C00650260202109
64329+:102E10008E0B00248CAE0028116E005B2402002172
64330+:102E20000E001A4AA38200681452FFBE2404FFFF5A
64331+:102E30008F8500380A001D320080A0212402001F67
64332+:102E40000E001A4AA38200682409FFFF1049FEA160
64333+:102E50002404FFFF0A001E548F83005402602021C7
64334+:102E60000E001A4AA38200681450FF508F85003864
64335+:102E70002403FFFF0A001D320060A0218CD800242B
64336+:102E80008E0800241118FF29026020210A001F2744
64337+:102E90002402000F8E0900003C05008001259024CB
64338+:102EA0001640FF492402001A026020210E001A4A2F
64339+:102EB000A3820068240CFFFF144CFECF2404FFFF04
64340+:102EC0008F8500380A001D320080A0210E001934C1
64341+:102ED000026020218F8500380A001EE500001821BD
64342+:102EE0002403FFFD0060A0210A001D32AF860060B0
64343+:102EF000026020210E001A4AA38D00682403FFFF00
64344+:102F00001043FF588F8500380A001ECC920400033E
64345+:102F10002418001D0E001A4AA39800682403FFFF1E
64346+:102F20001443FE9D2404FFFF8F8500380A001D32E4
64347+:102F30000080A021026020210A001F3D24020024FD
64348+:102F4000240880000068C024330BFFFF000B73C20D
64349+:102F500031D000FF001088270A001F6E001133C017
64350+:102F6000240F001B0E001A4AA38F00681451FEACF8
64351+:102F70002404FFFF8F8500380A001D320080A02145
64352+:102F80000A001F3D240200278E0600288CA3002C77
64353+:102F900010C30008026020210A001F812402001FC4
64354+:102FA0000A001F812402000E026020210A001F81F6
64355+:102FB000240200258E04002C1080000D8F8F00301D
64356+:102FC0008DE800740104C02B5700000C0260202122
64357+:102FD0008CB900140086A0210334282B10A0FF52C6
64358+:102FE0008F9F0044026020210A001F8124020022DA
64359+:102FF000026020210A001F81240200230A001F8191
64360+:103000002402002627BDFFD8AFB3001CAFB10014C7
64361+:10301000AFBF0020AFB20018AFB000103C0280007C
64362+:103020008C5201408C4B01483C048000000B8C0208
64363+:10303000322300FF317300FF8C8501B804A0FFFE2E
64364+:1030400034900180AE1200008C8701442464FFF0AC
64365+:10305000240600022C830013AE070004A61100080A
64366+:10306000A206000BAE1300241060004F8FBF00209B
64367+:10307000000448803C0A0801254A9534012A402171
64368+:103080008D04000000800008000000003C030800E0
64369+:103090008C6331A831693FFF00099980007280215B
64370+:1030A000021370212405FF80264D0100264C00806C
64371+:1030B0003C02800031B1007F3198007F31CA007F2F
64372+:1030C0003C1F800A3C1980043C0F800C01C5202461
64373+:1030D00001A5302401853824014F1821AC46002475
64374+:1030E000023F402103194821AC470090AC4400281E
64375+:1030F000AF830044AF880038AF8900300E0019005C
64376+:10310000016080213C0380008C6B01B80560FFFEEC
64377+:103110008F8700448F8600383465018090E8000D69
64378+:10312000ACB20000A4B0000600082600000416039C
64379+:1031300000029027001227C21080008124C200885C
64380+:10314000241F6082A4BF0008A0A000052402000282
64381+:10315000A0A2000B8F8B0030000424003C08270045
64382+:1031600000889025ACB20010ACA00014ACA00024E4
64383+:10317000ACA00028ACA0002C8D6900382413FF807F
64384+:10318000ACA9001890E3000D02638024320500FF13
64385+:1031900010A000058FBF002090ED000D31AC007F26
64386+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
64387+:1031B0008FB100148FB000103C0A10003C0E80004C
64388+:1031C00027BD002803E00008ADCA01B8265F010052
64389+:1031D0002405FF8033F8007F3C06800003E5782457
64390+:1031E0003C19800A03192021ACCF0024908E00D412
64391+:1031F00000AE682431AC00FF11800024AF84003899
64392+:10320000248E008895CD00123C0C08008D8C31A8CE
64393+:1032100031AB3FFF01924821000B5180012A402130
64394+:1032200001052024ACC400283107007F3C06800C37
64395+:1032300000E620219083000D00A31024304500FFFC
64396+:1032400010A0FFD8AF8400449098000D330F0010F9
64397+:1032500015E0FFD58FBF00200E0019000000000010
64398+:103260003C0380008C7901B80720FFFE00000000BD
64399+:10327000AE1200008C7F0144AE1F0004A6110008AE
64400+:1032800024110002A211000BAE1300243C1308010C
64401+:10329000927396F0327000015200FFC38FBF00207E
64402+:1032A0000E002146024020210A0020638FBF00202B
64403+:1032B0003C1260008E452C083C03F0033462FFFF93
64404+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
64405+:1032D00003199825AE532C080A0020638FBF0020E5
64406+:1032E000264D010031AF007F3C10800A240EFF8084
64407+:1032F00001F0282101AE60243C0B8000AD6C00245D
64408+:103300001660FFA8AF85003824110003A0B100FCAF
64409+:103310000A0020638FBF002026480100310A007F89
64410+:103320003C0B800A2409FF80014B30210109202435
64411+:103330003C078000ACE400240A002062AF8600381D
64412+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
64413+:10335000241F608290D900D42418FF800319782498
64414+:1033600031EA00FF1140FF7700000000240700044D
64415+:10337000A0C700FC8F870044241160842406000D40
64416+:10338000A4B10008A0A600050A00204D24020002F6
64417+:103390003C040001248496DC24030014240200FE73
64418+:1033A0003C010800AC2431EC3C010800AC2331E8BE
64419+:1033B0003C010801A42296F83C040801248496F8F4
64420+:1033C0000000182100643021A0C300042463000120
64421+:1033D0002C6500FF54A0FFFC006430213C0708006E
64422+:1033E00024E7010003E00008AF87007800A058211F
64423+:1033F000008048210000102114A00012000050217C
64424+:103400000A002142000000003C010801A42096F8B7
64425+:103410003C05080194A596F88F8200783C0C0801C1
64426+:10342000258C96F800E2182100AC2021014B302BAE
64427+:10343000A089000400001021A460000810C0003919
64428+:10344000010048218F8600780009384000E94021BA
64429+:103450000008388000E6282190A8000B90B9000AE7
64430+:103460000008204000881021000218800066C0215A
64431+:10347000A319000A8F85007800E5782191EE000AF3
64432+:1034800091E6000B000E684001AE6021000C208028
64433+:1034900000851021A046000B3C030801906396F2C2
64434+:1034A000106000222462FFFF8F8300383C01080176
64435+:1034B000A02296F2906C00FF118000040000000032
64436+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
64437+:1034D000973996F8272300013078FFFF2F0F00FF60
64438+:1034E00011E0FFC9254A00013C010801A42396F818
64439+:1034F0003C05080194A596F88F8200783C0C0801E1
64440+:10350000258C96F800E2182100AC2021014B302BCD
64441+:10351000A089000400001021A460000814C0FFC9A5
64442+:103520000100482103E000080000000003E000085B
64443+:103530002402000227BDFFE0248501002407FF804C
64444+:10354000AFB00010AFBF0018AFB1001400A718242F
64445+:103550003C10800030A4007F3C06800A00862821B1
64446+:103560008E110024AE03002490A200FF1440000836
64447+:10357000AF850038A0A000098FBF0018AE1100244D
64448+:103580008FB100148FB0001003E0000827BD0020A9
64449+:1035900090A900FD90A800FF312400FF0E0020F448
64450+:1035A000310500FF8F8500388FBF0018A0A00009EB
64451+:1035B000AE1100248FB100148FB0001003E000089A
64452+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
64453+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
64454+:1035E0003C0980009533011635320C00952F011AE5
64455+:1035F0003271FFFF023280218E08000431EEFFFF9E
64456+:10360000248B0100010E6821240CFF8025A5FFFFFB
64457+:10361000016C50243166007F3C07800AAD2A0024EB
64458+:1036200000C73021AF850074AF8800703C010801ED
64459+:10363000A02096F190C300090200D02100809821BB
64460+:10364000306300FF2862000510400048AF86003854
64461+:10365000286400021480008E24140001240D00054B
64462+:103660003C010801A02D96D590CC00FD3C0108013D
64463+:10367000A02096D63C010801A02096D790CB000A46
64464+:10368000240AFF80318500FF014B4824312700FFC9
64465+:1036900010E0000C000058213C12800836510080D8
64466+:1036A0008E2F00308CD0005C01F0702305C0018E9D
64467+:1036B0008F87007090D4000A3284007FA0C4000A73
64468+:1036C0008F8600383C118008363000808E0F003025
64469+:1036D0008F87007000EF702319C000EE000000001B
64470+:1036E00090D4000924120002328400FF1092024795
64471+:1036F000000000008CC2005800E2F82327F9FFFF09
64472+:103700001B2001300000000090C5000924080004BF
64473+:1037100030A300FF10680057240A00013C01080193
64474+:10372000A02A96D590C900FF252700013C01080179
64475+:10373000A02796D43C030801906396D52406000583
64476+:103740001066006A2C780005130000C40000902168
64477+:103750000003F8803C0408012484958003E4C82118
64478+:103760008F25000000A0000800000000241800FFC2
64479+:103770001078005C0000000090CC000A90CA00099C
64480+:103780003C080801910896F13187008000EA48253D
64481+:103790003C010801A02996DC90C500FD3C140801FD
64482+:1037A000929496F2311100013C010801A02596DDAA
64483+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
64484+:1037C0003C010801A03296DF8CD900543C0108016D
64485+:1037D000AC3996E08CD000583C010801AC3096E43E
64486+:1037E0008CC3005C3C010801AC3496EC3C01080140
64487+:1037F000AC2396E8162000088FBF002C8FB4002859
64488+:103800008FB300248FB200208FB1001C8FB000183E
64489+:1038100003E0000827BD00303C1180009624010E13
64490+:103820000E000FD43094FFFF3C0B08018D6B96F413
64491+:103830000260382102802821AE2B01803C13080150
64492+:103840008E7396D401602021240600830E00102F71
64493+:10385000AFB300108FBF002C8FB400288FB30024AB
64494+:103860008FB200208FB1001C8FB0001803E0000859
64495+:1038700027BD00303C1808008F1831FC270F0001CD
64496+:103880003C010800AC2F31FC0A0021D700000000E9
64497+:103890001474FFB900000000A0C000FF3C05080040
64498+:1038A0008CA531E43C0308008C6331E03C02080045
64499+:1038B0008C4232048F99003834A80001241F000282
64500+:1038C0003C010801AC2396F43C010801A02896F0C5
64501+:1038D0003C010801A02296F3A33F00090A002190B1
64502+:1038E0008F8600380E002146000000000A0021D714
64503+:1038F0008F8600383C1F080193FF96D424190001DD
64504+:1039000013F902298F8700703C100801921096D895
64505+:103910003C06080190C696D610C000050200A02102
64506+:103920003C040801908496D9109001E48F870078B8
64507+:10393000001088408F9F0078023048210009C8801D
64508+:10394000033F702195D80008270F0001A5CF00087C
64509+:103950003C040801908496D93C05080190A596D6B0
64510+:103960000E0020F4000000008F8700780230202134
64511+:103970000004308000C720218C8500048F820074F1
64512+:1039800000A2402305020006AC8200048C8A0000DD
64513+:103990008F830070014310235C400001AC83000062
64514+:1039A0008F86003890CB00FF2D6C00025580002DD3
64515+:1039B000241400010230F821001F40800107282153
64516+:1039C00090B9000B8CAE00040019C0400319782197
64517+:1039D000000F1880006710218C4D000001AE882375
64518+:1039E0002630FFFF5E00001F241400018C440004F9
64519+:1039F0008CAA0000008A482319200019240E000414
64520+:103A00003C010801A02E96D590AD000B8CAB0004B4
64521+:103A1000000D8840022D80210010108000471021E9
64522+:103A20008C44000401646023058202009443000872
64523+:103A300090DF00FE90B9000B33E500FF54B900049D
64524+:103A40000107A021A0D400FE8F8700780107A021E4
64525+:103A50009284000B0E0020F4240500018F860038AC
64526+:103A600024140001125400962E500001160000424A
64527+:103A70003C08FFFF241900021659FF3F0000000018
64528+:103A8000A0C000FF8F860038A0D200090A0021D70D
64529+:103A90008F86003890C700092404000230E300FF3D
64530+:103AA0001064016F24090004106901528F880074AA
64531+:103AB0008CCE0054010E682325B10001062001754B
64532+:103AC000241800043C010801A03896D53C010801E7
64533+:103AD000A02096D490D400FD90D200FF2E4F00027B
64534+:103AE00015E0FF14328400FF000438408F8900780D
64535+:103AF00090DF00FF00E41021000220800089C8212F
64536+:103B00002FE500029324000B14A0FF0A24070002F3
64537+:103B100000041840006480210010588001692821A9
64538+:103B20008CAC0004010C50230540FF020000000093
64539+:103B30003C030801906396D614600005246F0001D1
64540+:103B40003C010801A02496D93C010801A02796D782
64541+:103B50003C010801A02F96D690CE00FF24E700017B
64542+:103B600031CD00FF01A7882B1220FFE990A4000BA4
64543+:103B70000A0021C6000000003C0508018CA596D46F
64544+:103B80003C12000400A8F82413F2000624020005E9
64545+:103B90003C090801912996D5152000022402000352
64546+:103BA000240200053C010801A02296F190C700FF05
64547+:103BB00014E0012024020002A0C200090A0021D75B
64548+:103BC0008F86003890CC00FF1180FEDA240A0001B5
64549+:103BD0008F8C00748F890078240F00030180682186
64550+:103BE0001160001E240E0002000540400105A021C6
64551+:103BF00000142080008990218E51000401918023BF
64552+:103C00000600FECC000000003C020801904296D65F
64553+:103C100014400005245800013C010801A02A96D751
64554+:103C20003C010801A02596D93C010801A03896D690
64555+:103C300090DF00FF010510210002C88033E500FF7E
64556+:103C4000254A00010329202100AA402B1500FEB9B6
64557+:103C50009085000B1560FFE50005404000054040E1
64558+:103C600001051821000310803C010801A02A96D408
64559+:103C70003C010801A02596D8004918218C64000455
64560+:103C800000E4F82327F9FFFF1F20FFE900000000F0
64561+:103C90008C63000000E358230560013A01A38823E8
64562+:103CA00010E301170184C0231B00FEA200000000E6
64563+:103CB0003C010801A02E96D50A002305240B000123
64564+:103CC000240E0004A0CE00093C0D08008DAD31F893
64565+:103CD0008F86003825A200013C010800AC2231F893
64566+:103CE0000A0021D7000000008CD9005C00F9C02335
64567+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
64568+:103D00008F8400748CC3005C008340232502000173
64569+:103D10001C40FF60000000008CC9005C248700018B
64570+:103D200000E9282B10A0FE943C0D80008DAB01040F
64571+:103D30003C0C0001016C50241140FE8F2402001045
64572+:103D40003C010801A02296F10A0021D700000000E2
64573+:103D50008F9100748F86003826220001ACC2005C6F
64574+:103D60000A002292241400018F8700382404FF8067
64575+:103D70000000882190E9000A241400010124302564
64576+:103D8000A0E6000A3C05080190A596D63C0408016F
64577+:103D9000908496D90E0020F4000000008F86003831
64578+:103DA0008F85007890C800FD310700FF0007404074
64579+:103DB0000107F821001FC0800305C8219323000BD1
64580+:103DC000A0C300FD8F8500788F8600380305602131
64581+:103DD000918F000B000F704001CF6821000D808093
64582+:103DE000020510218C4B0000ACCB00548D840004E4
64583+:103DF0008F83007400645023194000022482000164
64584+:103E00002462000101074821ACC2005C0009308037
64585+:103E100000C5402100E02021240500010E0020F40F
64586+:103E20009110000B8F86003890C500FF10A0FF0C8A
64587+:103E3000001070408F85007801D06821000D10803F
64588+:103E4000004558218D6400008F8C0074018450233C
64589+:103E50002547000104E0FF02263100013C03080170
64590+:103E6000906396D62E2F0002247800013C010801B1
64591+:103E7000A03896D63C010801A03496D711E0FEF890
64592+:103E8000020038210A002365000740408F84003873
64593+:103E90008F8300748C85005800A340230502FE9A8E
64594+:103EA000AC8300580A00223B000000003C070801D8
64595+:103EB00090E796F2240200FF10E200BE8F860038E1
64596+:103EC0003C110801963196FA3C030801246396F8E8
64597+:103ED000262500013230FFFF30ABFFFF02036021D7
64598+:103EE0002D6A00FF1540008D918700043C010801F8
64599+:103EF000A42096FA8F88003800074840012728211F
64600+:103F0000911800FF000530802405000127140001EE
64601+:103F1000A11400FF3C120801925296F28F8800789B
64602+:103F20008F8E0070264F000100C820213C0108013F
64603+:103F3000A02F96F2AC8E00008F8D0074A48500082F
64604+:103F4000AC8D00043C030801906396D414600077A4
64605+:103F5000000090213C010801A02596D4A087000B09
64606+:103F60008F8C007800CC5021A147000A8F82003846
64607+:103F7000A04700FD8F840038A08700FE8F860038A0
64608+:103F80008F9F0070ACDF00548F990074ACD900583B
64609+:103F90008F8D00780127C02100185880016DA02165
64610+:103FA000928F000A000F704001CF18210003888013
64611+:103FB000022D8021A207000B8F8600780166602108
64612+:103FC000918A000B000A1040004A2021000428803A
64613+:103FD00000A64021A107000A3C07800834E90080C0
64614+:103FE0008D2200308F860038ACC2005C0A0022921D
64615+:103FF0002414000190CA00FF1540FEAD8F880074A4
64616+:10400000A0C400090A0021D78F860038A0C000FD97
64617+:104010008F98003824060001A30000FE3C0108012F
64618+:10402000A02696D53C010801A02096D40A0021C6FE
64619+:104030000000000090CB00FF3C040801908496F340
64620+:10404000316C00FF0184502B1540000F2402000347
64621+:1040500024020004A0C200090A0021D78F8600387C
64622+:1040600090C3000A2410FF8002035824316C00FF23
64623+:104070001180FDC1000000003C010801A02096D580
64624+:104080000A0021C600000000A0C200090A0021D7D2
64625+:104090008F86003890D4000A2412FF8002544824EE
64626+:1040A000312800FF1500FFF4240200083C0108013C
64627+:1040B000A02296F10A0021D70000000000108840DD
64628+:1040C0008F8B0070023018210003688001A7202127
64629+:1040D000AC8B00008F8A0074240C0001A48C0008B3
64630+:1040E000AC8A00043C05080190A596D62402000184
64631+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
64632+:104100000184A0231A80FD8B000000003C010801FF
64633+:10411000A02E96D50A002305240B00013C010801BE
64634+:10412000A42596FA0A0023B78F880038240B0001D3
64635+:10413000106B00228F9800388F85003890BF00FFE9
64636+:1041400033F900FF1079002B000000003C1F08012C
64637+:1041500093FF96D8001FC840033FC0210018A080DD
64638+:104160000288782191EE000AA08E000A8F8D0078D7
64639+:104170003C030801906396D800CD88210A0023DD16
64640+:10418000A223000B263000010600003101A4902379
64641+:104190000640002B240200033C010801A02F96D505
64642+:1041A0000A002305240B00018F8900380A00223BF6
64643+:1041B000AD2700540A00229124120001931400FD3F
64644+:1041C000A094000B8F8800388F8F0078910E00FE2E
64645+:1041D00000CF6821A1AE000A8F910038A22700FD10
64646+:1041E0008F8300708F900038AE0300540A0023DEE6
64647+:1041F0008F8D007890B000FEA090000A8F8B003861
64648+:104200008F8C0078916A00FD00CC1021A04A000B31
64649+:104210008F840038A08700FE8F8600748F85003859
64650+:10422000ACA600580A0023DE8F8D007894B80008F1
64651+:10423000ACA40004030378210A002285A4AF00087F
64652+:104240003C010801A02296D50A0021C6000000000A
64653+:1042500090CF0009240D000431EE00FF11CDFD8543
64654+:10426000240200013C010801A02296D50A0021C6C3
64655+:1042700000000000080033440800334408003420E4
64656+:10428000080033F4080033D8080033280800332826
64657+:10429000080033280800334C8008010080080080A3
64658+:1042A000800800005F865437E4AC62CC50103A4579
64659+:1042B00036621985BF14C0E81BC27A1E84F4B55655
64660+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
64661+:1042D00008005AB808005A5C08005A5C08005A5C8A
64662+:1042E00008005A5C08005A7408005A5C08005A5CBE
64663+:1042F00008005AC008005A5C080059D408005A5CEB
64664+:1043000008005A5C08005AC008005A5C08005A5C51
64665+:1043100008005A5C08005A5C08005A5C08005A5CA5
64666+:1043200008005A5C08005A5C08005A5C08005A5C95
64667+:1043300008005A9408005A5C08005A9408005A5C15
64668+:1043400008005A5C08005A5C08005A9808005A9401
64669+:1043500008005A5C08005A5C08005A5C08005A5C65
64670+:1043600008005A5C08005A5C08005A5C08005A5C55
64671+:1043700008005A5C08005A5C08005A5C08005A5C45
64672+:1043800008005A5C08005A5C08005A5C08005A5C35
64673+:1043900008005A5C08005A5C08005A5C08005A5C25
64674+:1043A00008005A9808005A9808005A5C08005A9861
64675+:1043B00008005A5C08005A5C08005A5C08005A5C05
64676+:1043C00008005A5C08005A5C08005A5C08005A5CF5
64677+:1043D00008005A5C08005A5C08005A5C08005A5CE5
64678+:1043E00008005A5C08005A5C08005A5C08005A5CD5
64679+:1043F00008005A5C08005A5C08005A5C08005A5CC5
64680+:1044000008005A5C08005A5C08005A5C08005A5CB4
64681+:1044100008005A5C08005A5C08005A5C08005A5CA4
64682+:1044200008005A5C08005A5C08005A5C08005A5C94
64683+:1044300008005A5C08005A5C08005A5C08005A5C84
64684+:1044400008005A5C08005A5C08005A5C08005A5C74
64685+:1044500008005A5C08005A5C08005A5C08005A5C64
64686+:1044600008005A5C08005A5C08005A5C08005A5C54
64687+:1044700008005A5C08005A5C08005A5C08005A5C44
64688+:1044800008005A5C08005A5C08005A5C08005A5C34
64689+:1044900008005A5C08005A5C08005A5C08005A5C24
64690+:1044A00008005A5C08005A5C08005A5C08005A5C14
64691+:1044B00008005A5C08005A5C08005A5C08005A5C04
64692+:1044C00008005A5C08005A5C08005A5C08005ADC74
64693+:1044D0000800782C08007A900800783808007628C0
64694+:1044E00008007838080078C4080078380800762872
64695+:1044F0000800762808007628080076280800762824
64696+:104500000800762808007628080076280800762813
64697+:1045100008007628080078580800784808007628AF
64698+:1045200008007628080076280800762808007628F3
64699+:1045300008007628080076280800762808007628E3
64700+:1045400008007628080076280800762808007848B1
64701+:10455000080082FC08008188080082C40800818865
64702+:104560000800829408008070080081880800818813
64703+:1045700008008188080081880800818808008188F7
64704+:1045800008008188080081880800818808008188E7
64705+:104590000800818808008188080081B008008D34F7
64706+:1045A00008008E9008008E70080088D808008D4C96
64707+:1045B0000A00012400000000000000000000000DBF
64708+:1045C000747061362E322E31620000000602010145
64709+:1045D00000000000000000000000000000000000DB
64710+:1045E00000000000000000000000000000000000CB
64711+:1045F00000000000000000000000000000000000BB
64712+:1046000000000000000000000000000000000000AA
64713+:10461000000000000000000000000000000000009A
64714+:10462000000000000000000000000000000000008A
64715+:10463000000000000000000000000000000000007A
64716+:104640000000000010000003000000000000000D4A
64717+:104650000000000D3C020800244217203C03080023
64718+:1046600024632A10AC4000000043202B1480FFFD7F
64719+:10467000244200043C1D080037BD2FFC03A0F0219C
64720+:104680003C100800261004903C1C0800279C1720B2
64721+:104690000E000262000000000000000D2402FF80F6
64722+:1046A00027BDFFE000821024AFB00010AF42002011
64723+:1046B000AFBF0018AFB10014936500043084007FD1
64724+:1046C000034418213C0200080062182130A5002094
64725+:1046D000036080213C080111277B000814A0000220
64726+:1046E0002466005C2466005892020004974301048B
64727+:1046F000920400043047000F3063FFFF3084004015
64728+:10470000006728231080000900004821920200055C
64729+:1047100030420004104000050000000010A000031B
64730+:104720000000000024A5FFFC2409000492020005FB
64731+:1047300030420004104000120000000010A00010E1
64732+:10474000000000009602000200A72021010440257D
64733+:104750002442FFFEA7421016920300042402FF80A9
64734+:1047600000431024304200FF104000033C020400CC
64735+:104770000A000174010240258CC20000AF421018EB
64736+:104780008F4201780440FFFE2402000AA742014044
64737+:1047900096020002240400093042000700021023A0
64738+:1047A00030420007A7420142960200022442FFFE67
64739+:1047B000A7420144A740014697420104A74201488D
64740+:1047C0008F420108304200205040000124040001C3
64741+:1047D00092020004304200101440000234830010A2
64742+:1047E00000801821A743014A0000000000000000DB
64743+:1047F0000000000000000000AF48100000000000B2
64744+:104800000000000000000000000000008F421000C7
64745+:104810000441FFFE3102FFFF1040000700000000CE
64746+:1048200092020004304200401440000300000000E7
64747+:104830008F421018ACC20000960200063042FFFF03
64748+:10484000244200020002104300021040036288214B
64749+:10485000962200001120000D3044FFFF00A7102118
64750+:104860008F8300388F45101C0002108200021080D8
64751+:1048700000431021AC45000030A6FFFF0E00058D5F
64752+:1048800000052C0200402021A62200009203000413
64753+:104890002402FF8000431024304200FF1040001F1C
64754+:1048A0000000000092020005304200021040001B90
64755+:1048B000000000009742100C2442FFFEA742101691
64756+:1048C000000000003C02040034420030AF421000FF
64757+:1048D00000000000000000000000000000000000D8
64758+:1048E0008F4210000441FFFE000000009742100CB0
64759+:1048F0008F45101C3042FFFF24420030000210821E
64760+:1049000000021080005B1021AC45000030A6FFFFC4
64761+:104910000E00058D00052C02A62200009604000260
64762+:10492000248400080E0001E93084FFFF974401044D
64763+:104930000E0001F73084FFFF8FBF00188FB1001405
64764+:104940008FB000103C02100027BD002003E00008DB
64765+:10495000AF4201783084FFFF308200078F8500244A
64766+:1049600010400002248300073064FFF800A41021E7
64767+:1049700030421FFF03421821247B4000AF850028EE
64768+:10498000AF82002403E00008AF4200843084FFFFC0
64769+:104990003082000F8F85002C8F860034104000027B
64770+:1049A0002483000F3064FFF000A410210046182B70
64771+:1049B000AF8500300046202314600002AF82002C37
64772+:1049C000AF84002C8F82002C340480000342182115
64773+:1049D00000641821AF83003803E00008AF42008074
64774+:1049E0008F820014104000088F8200048F82FFDC49
64775+:1049F000144000058F8200043C02FFBF3442FFFFD9
64776+:104A0000008220248F82000430430006240200022A
64777+:104A10001062000F3C0201012C62000350400005AF
64778+:104A2000240200041060000F3C0200010A00023062
64779+:104A30000000000010620005240200061462000C51
64780+:104A40003C0201110A000229008210253C020011DB
64781+:104A500000821025AF421000240200010A0002303B
64782+:104A6000AF82000C00821025AF421000AF80000C16
64783+:104A700000000000000000000000000003E000084B
64784+:104A8000000000008F82000C1040000400000000B5
64785+:104A90008F4210000441FFFE0000000003E0000808
64786+:104AA000000000008F8200102443F800000231C291
64787+:104AB00024C2FFF02C6303011060000300021042C7
64788+:104AC0000A000257AC8200008F85001800C5102B29
64789+:104AD0001440000B0000182100C5102324470001DA
64790+:104AE0008F82001C00A210212442FFFF0046102BE1
64791+:104AF000544000042402FFFF0A000257AC87000064
64792+:104B00002402FFFF0A000260AC8200008C820000D9
64793+:104B10000002194000621821000318800062182169
64794+:104B2000000318803C0208002442175C0062182130
64795+:104B300003E000080060102127BDFFD8AFBF0020B0
64796+:104B4000AFB1001CAFB000183C0460088C8250006C
64797+:104B50002403FF7F3C066000004310243442380CDD
64798+:104B6000AC8250008CC24C1C3C1A80000002160221
64799+:104B70003042000F10400007AF82001C8CC34C1C59
64800+:104B80003C02001F3442FC0000621824000319C2DA
64801+:104B9000AF8300188F420008275B400034420001B9
64802+:104BA000AF420008AF8000243C02601CAF40008090
64803+:104BB000AF4000848C4500088CC308083402800094
64804+:104BC000034220212402FFF0006218243C020080EE
64805+:104BD0003C010800AC2204203C025709AF84003895
64806+:104BE00014620004AF850034240200010A0002921E
64807+:104BF000AF820014AF8000148F42000038420001E1
64808+:104C0000304200011440FFFC8F8200141040001657
64809+:104C10000000000097420104104000058F8300004F
64810+:104C2000146000072462FFFF0A0002A72C62000A3A
64811+:104C30002C620010504000048F83000024620001A9
64812+:104C4000AF8200008F8300002C62000A1440000332
64813+:104C50002C6200070A0002AEAF80FFDC10400002A9
64814+:104C600024020001AF82FFDC8F4301088F44010062
64815+:104C700030622000AF83000410400008AF840010B1
64816+:104C80003C0208008C42042C244200013C01080034
64817+:104C9000AC22042C0A00058A3C0240003065020068
64818+:104CA00014A0000324020F001482026024020D00ED
64819+:104CB00097420104104002C83C02400030624000AC
64820+:104CC000144000AD8F8200388C4400088F42017878
64821+:104CD0000440FFFE24020800AF42017824020008CD
64822+:104CE000A7420140A7400142974201048F8400047B
64823+:104CF0003051FFFF30820001104000070220802168
64824+:104D00002623FFFE240200023070FFFFA742014667
64825+:104D10000A0002DBA7430148A74001463C02080005
64826+:104D20008C42043C1440000D8F8300103082002020
64827+:104D30001440000224030009240300010060202124
64828+:104D40008F830010240209005062000134840004A3
64829+:104D5000A744014A0A0002F60000000024020F00E6
64830+:104D60001462000530820020144000062403000D68
64831+:104D70000A0002F524030005144000022403000980
64832+:104D800024030001A743014A3C0208008C4204208E
64833+:104D90003C0400480E00020C004420250E000235A1
64834+:104DA000000000008F82000C1040003E0000000058
64835+:104DB0008F4210003C0300200043102410400039B3
64836+:104DC0008F820004304200021040003600000000D4
64837+:104DD000974210141440003300000000974210085E
64838+:104DE0008F8800383042FFFF2442000600021882FC
64839+:104DF0000003388000E83021304300018CC40000FB
64840+:104E000010600004304200030000000D0A00033768
64841+:104E100000E81021544000103084FFFF3C05FFFFE4
64842+:104E200000852024008518260003182B0004102B71
64843+:104E300000431024104000050000000000000000A6
64844+:104E40000000000D00000000240002228CC20000BF
64845+:104E50000A000336004520253883FFFF0003182B86
64846+:104E60000004102B00431024104000050000000037
64847+:104E7000000000000000000D000000002400022BD4
64848+:104E80008CC200003444FFFF00E81021AC44000055
64849+:104E90003C0208008C420430244200013C0108001E
64850+:104EA000AC2204308F6200008F840038AF8200088B
64851+:104EB0008C8300003402FFFF1462000F00001021F9
64852+:104EC0003C0508008CA504543C0408008C84045064
64853+:104ED00000B0282100B0302B008220210086202144
64854+:104EE0003C010800AC2504543C010800AC240450EB
64855+:104EF0000A000580240400088C8200003042010072
64856+:104F00001040000F000010213C0508008CA5044C47
64857+:104F10003C0408008C84044800B0282100B0302BE9
64858+:104F200000822021008620213C010800AC25044C91
64859+:104F30003C010800AC2404480A0005802404000851
64860+:104F40003C0508008CA504443C0408008C84044003
64861+:104F500000B0282100B0302B0082202100862021C3
64862+:104F60003C010800AC2504443C010800AC2404408A
64863+:104F70000A000580240400088F6200088F62000088
64864+:104F800000021602304300F02402003010620005D7
64865+:104F900024020040106200E08F8200200A00058891
64866+:104FA0002442000114A000050000000000000000E1
64867+:104FB0000000000D00000000240002568F4201781E
64868+:104FC0000440FFFE000000000E00023D27A4001078
64869+:104FD0001440000500408021000000000000000D8A
64870+:104FE000000000002400025D8E0200001040000559
64871+:104FF00000000000000000000000000D00000000A4
64872+:10500000240002608F62000C0443000324020001AC
64873+:105010000A00042EAE000000AE0200008F820038AD
64874+:105020008C480008A20000078F65000C8F64000404
64875+:1050300030A3FFFF0004240200852023308200FFFC
64876+:105040000043102124420005000230832CC200815D
64877+:10505000A605000A14400005A20400040000000098
64878+:105060000000000D00000000240002788F85003849
64879+:105070000E0005AB260400148F6200048F43010864
64880+:10508000A60200083C02100000621824106000080C
64881+:105090000000000097420104920300072442FFEC45
64882+:1050A000346300023045FFFF0A0003C3A203000778
64883+:1050B000974201042442FFF03045FFFF96060008A6
64884+:1050C0002CC200135440000592030007920200070F
64885+:1050D00034420001A20200079203000724020001EB
64886+:1050E00010620005240200031062000B8F8200385A
64887+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
64888+:105100008C43000C0064182400651825AC43000C87
64889+:105110000A0003E030C6FFFF3C04FFFF8C43001091
64890+:105120000064182400651825AC43001030C6FFFF4A
64891+:1051300024C2000200021083A20200058F830038FF
64892+:10514000304200FF00021080004328218CA800009C
64893+:105150008CA2000024030004000217021443001272
64894+:1051600000000000974201043C03FFFF01031824E4
64895+:105170003042FFFF004610232442FFFE006240251C
64896+:10518000ACA8000092030005306200FF000210800E
64897+:1051900000501021904200143042000F00431021B3
64898+:1051A0000A000415A20200068CA400049742010420
64899+:1051B0009603000A3088FFFF3042FFFF00461023AD
64900+:1051C0002442FFD60002140001024025ACA80004CE
64901+:1051D000920200079204000524630028000318834C
64902+:1051E0000064182134420004A2030006A202000752
64903+:1051F0008F8200042403FFFB34420002004310248A
64904+:10520000AF820004920300068F87003800031880E5
64905+:10521000007010218C4400203C02FFF63442FFFF56
64906+:105220000082402400671821AE04000CAC68000C1A
64907+:10523000920500063C03FF7F8E02000C00052880CB
64908+:1052400000B020213463FFFF01033024948800263E
64909+:1052500000A7282100431024AE02000CAC860020D9
64910+:10526000AC880024ACA8001024020010A742014022
64911+:1052700024020002A7400142A7400144A742014680
64912+:10528000974201043C0400082442FFFEA742014863
64913+:10529000240200010E00020CA742014A9603000AF4
64914+:1052A0009202000400431021244200023042000711
64915+:1052B00000021023304200070E000235AE0200103B
64916+:1052C0008F6200003C0308008C6304442404001037
64917+:1052D000AF820008974201043042FFFF2442FFFEE4
64918+:1052E00000403821000237C33C0208008C420440D1
64919+:1052F000006718210067282B004610210045102167
64920+:105300003C010800AC2304443C010800AC220440EA
64921+:105310000A0005150000000014A0000500000000B0
64922+:10532000000000000000000D000000002400030A3F
64923+:105330008F4201780440FFFE000000000E00023D95
64924+:1053400027A4001414400005004080210000000044
64925+:105350000000000D00000000240003118E02000078
64926+:105360005440000692020007000000000000000DFB
64927+:10537000000000002400031C9202000730420004D9
64928+:10538000104000058F8200042403FFFB344200021A
64929+:1053900000431024AF8200048F620004044300081D
64930+:1053A00092020007920200068E03000CAE0000007D
64931+:1053B0000002108000501021AC4300209202000730
64932+:1053C00030420004544000099602000A920200058F
64933+:1053D0003C03000100021080005010218C46001890
64934+:1053E00000C33021AC4600189602000A9206000461
64935+:1053F000277100080220202100C2302124C60005A8
64936+:10540000260500140E0005AB00063082920400064B
64937+:105410008F6500043C027FFF000420800091202162
64938+:105420008C8300043442FFFF00A228240065182169
64939+:10543000AC8300049202000792040005920300046A
64940+:10544000304200041040001496070008308400FF2A
64941+:1054500000042080009120218C86000497420104E2
64942+:105460009605000A306300FF3042FFFF0043102121
64943+:105470000045102130E3FFFF004310232442FFD8F2
64944+:1054800030C6FFFF0002140000C23025AC860004C5
64945+:105490000A0004C992030007308500FF0005288038
64946+:1054A00000B128218CA4000097420104306300FF62
64947+:1054B0003042FFFF00431021004710233C03FFFF51
64948+:1054C000008320243042FFFF00822025ACA400008E
64949+:1054D0009203000724020001106200060000000091
64950+:1054E0002402000310620011000000000A0004EC16
64951+:1054F0008E03001097420104920300049605000AEF
64952+:105500008E24000C00431021004510212442FFF29C
64953+:105510003C03FFFF008320243042FFFF0082202550
64954+:10552000AE24000C0A0004EC8E0300109742010424
64955+:10553000920300049605000A8E24001000431021F7
64956+:10554000004510212442FFEE3C03FFFF008320248E
64957+:105550003042FFFF00822025AE2400108E03001091
64958+:105560002402000AA7420140A74301429603000A11
64959+:10557000920200043C04004000431021A742014471
64960+:10558000A740014697420104A742014824020001B6
64961+:105590000E00020CA742014A0E0002350000000076
64962+:1055A0008F6200009203000400002021AF820008F7
64963+:1055B000974201049606000A3042FFFF006218215C
64964+:1055C000006028213C0308008C6304443C0208006E
64965+:1055D0008C42044000651821004410210065382BDE
64966+:1055E000004710213C010800AC2304443C010800A2
64967+:1055F000AC22044092040004008620212484000A86
64968+:105600003084FFFF0E0001E9000000009744010410
64969+:105610003084FFFF0E0001F7000000003C02100084
64970+:10562000AF4201780A0005878F820020148200278C
64971+:105630003062000697420104104000673C024000BF
64972+:105640003062400010400005000000000000000033
64973+:105650000000000D00000000240004208F420178AB
64974+:105660000440FFFE24020800AF4201782402000833
64975+:10567000A7420140A74001428F82000497430104E2
64976+:1056800030420001104000073070FFFF2603FFFE8C
64977+:1056900024020002A7420146A74301480A00053F31
64978+:1056A0002402000DA74001462402000DA742014A32
64979+:1056B0008F62000024040008AF8200080E0001E998
64980+:1056C000000000000A0005190200202110400042DD
64981+:1056D0003C02400093620000304300F024020010BE
64982+:1056E0001062000524020070106200358F820020D5
64983+:1056F0000A000588244200018F62000097430104DC
64984+:105700003050FFFF3071FFFF8F4201780440FFFEF1
64985+:105710003202000700021023304200072403000A6F
64986+:105720002604FFFEA7430140A7420142A7440144CB
64987+:10573000A7400146A75101488F420108304200208E
64988+:10574000144000022403000924030001A743014A76
64989+:105750000E00020C3C0400400E0002350000000068
64990+:105760003C0708008CE70444021110212442FFFE8C
64991+:105770003C0608008CC604400040182100E3382194
64992+:10578000000010218F65000000E3402B00C2302193
64993+:105790002604000800C830213084FFFFAF850008D0
64994+:1057A0003C010800AC2704443C010800AC2604403E
64995+:1057B0000E0001E9000000000A0005190220202166
64996+:1057C0000E00013B000000008F82002024420001F7
64997+:1057D000AF8200203C024000AF4201380A00029232
64998+:1057E000000000003084FFFF30C6FFFF00052C00E2
64999+:1057F00000A628253882FFFF004510210045282BF0
65000+:105800000045102100021C023042FFFF004310211E
65001+:1058100000021C023042FFFF004310213842FFFF0C
65002+:1058200003E000083042FFFF3084FFFF30A5FFFF98
65003+:1058300000001821108000070000000030820001E5
65004+:105840001040000200042042006518210A0005A152
65005+:105850000005284003E000080060102110C0000689
65006+:1058600024C6FFFF8CA2000024A50004AC82000027
65007+:105870000A0005AB2484000403E0000800000000D7
65008+:1058800010A0000824A3FFFFAC8600000000000069
65009+:10589000000000002402FFFF2463FFFF1462FFFAF0
65010+:1058A0002484000403E00008000000000000000160
65011+:1058B0000A00002A00000000000000000000000DA7
65012+:1058C000747870362E322E3162000000060201001C
65013+:1058D00000000000000001360000EA600000000047
65014+:1058E00000000000000000000000000000000000B8
65015+:1058F00000000000000000000000000000000000A8
65016+:105900000000000000000000000000000000000097
65017+:105910000000001600000000000000000000000071
65018+:105920000000000000000000000000000000000077
65019+:105930000000000000000000000000000000000067
65020+:1059400000000000000000000000138800000000BC
65021+:10595000000005DC00000000000000001000000353
65022+:10596000000000000000000D0000000D3C020800D7
65023+:1059700024423D683C0308002463401CAC40000006
65024+:105980000043202B1480FFFD244200043C1D08002E
65025+:1059900037BD7FFC03A0F0213C100800261000A8B2
65026+:1059A0003C1C0800279C3D680E00044E00000000CF
65027+:1059B0000000000D27BDFFB4AFA10000AFA200049E
65028+:1059C000AFA30008AFA4000CAFA50010AFA6001451
65029+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
65030+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
65031+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
65032+:105A0000AFBF00480E000591000000008FBF0048A6
65033+:105A10008FBC00448FB900408FB8003C8FAF003876
65034+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
65035+:105A30008FAA00248FA900208FA8001C8FA7001810
65036+:105A40008FA600148FA500108FA4000C8FA3000850
65037+:105A50008FA200048FA1000027BD004C3C1B6004F6
65038+:105A60008F7A5030377B502803400008AF7A00000F
65039+:105A70008F86003C3C0390003C0280000086282575
65040+:105A800000A32025AC4400203C0380008C6700204C
65041+:105A900004E0FFFE0000000003E00008000000003A
65042+:105AA0000A000070240400018F85003C3C04800043
65043+:105AB0003483000100A3102503E00008AC8200201D
65044+:105AC00003E00008000010213084FFFF30A5FFFF35
65045+:105AD00010800007000018213082000110400002F1
65046+:105AE00000042042006518211480FFFB00052840B7
65047+:105AF00003E000080060102110C000070000000053
65048+:105B00008CA2000024C6FFFF24A50004AC82000084
65049+:105B100014C0FFFB2484000403E000080000000020
65050+:105B200010A0000824A3FFFFAC86000000000000C6
65051+:105B3000000000002402FFFF2463FFFF1462FFFA4D
65052+:105B40002484000403E000080000000090AA003153
65053+:105B50008FAB00108CAC00403C0300FF8D6800044C
65054+:105B6000AD6C00208CAD004400E060213462FFFF8A
65055+:105B7000AD6D00248CA700483C09FF000109C0243A
65056+:105B8000AD6700288CAE004C0182C824031978252B
65057+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
65058+:105BA000AD6D001C94A900323128FFFFAD680010D4
65059+:105BB00090A70030A5600002A1600004A16700006A
65060+:105BC00090A30032306200FF0002198210600005CD
65061+:105BD000240500011065000E0000000003E000082D
65062+:105BE000A16A00018CD80028354A0080AD780018E1
65063+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
65064+:105C00008CC4002CA16A000103E00008AD64000C04
65065+:105C10008CCD001CAD6D00188CC90014AD6900144A
65066+:105C20008CC80024AD6800088CC70020AD67000C4C
65067+:105C30008CC200148C8300700043C82B1320000713
65068+:105C4000000000008CC20014144CFFE400000000AF
65069+:105C5000354A008003E00008A16A00018C820070D0
65070+:105C60000A0000E6000000009089003027BDFFF820
65071+:105C70008FA8001CA3A900008FA300003C0DFF808B
65072+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
65073+:105C9000A100000400C05821A7A000028D06000446
65074+:105CA00000A048210167C8218FA500000080502175
65075+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
65076+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
65077+:105CD00000EDC02400C27824000C1DC003236825F9
65078+:105CE00001F87025AD0D0000AD0E00048D240024D8
65079+:105CF000AFAD0000AD0400088D2C00202404FFFF90
65080+:105D0000AD0C000C9547003230E6FFFFAD060010E9
65081+:105D10009145004830A200FF000219C25060000106
65082+:105D20008D240034AD0400148D4700388FAA00186C
65083+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
65084+:105D4000AD00002CAD00001803E00008AD000020FD
65085+:105D500027BDFFE0AFB20018AFB10014AFB0001024
65086+:105D6000AFBF001C9098003000C088213C0D00FFA0
65087+:105D7000330F007FA0CF0000908E003135ACFFFFC5
65088+:105D80003C0AFF00A0CE000194A6001EA220000441
65089+:105D90008CAB00148E29000400A08021016C282403
65090+:105DA000012A40240080902101052025A62600021A
65091+:105DB000AE24000426050020262400080E000092D0
65092+:105DC00024060002924700302605002826240014ED
65093+:105DD00000071E000003160324060004044000030D
65094+:105DE0002403FFFF965900323323FFFF0E00009279
65095+:105DF000AE230010262400248FBF001C8FB2001891
65096+:105E00008FB100148FB00010240500030000302172
65097+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
65098+:105E2000AFB00018AFBF002090A9003024020001DD
65099+:105E300000E050213123003F00A040218FB00040FE
65100+:105E40000080882100C04821106200148FA700380C
65101+:105E5000240B000500A0202100C02821106B001396
65102+:105E6000020030210E000128000000009225007C75
65103+:105E700030A400021080000326030030AE00003082
65104+:105E8000260300348FBF00208FB1001C8FB0001894
65105+:105E90000060102103E0000827BD00280E0000A7C5
65106+:105EA000AFB000100A00016F000000008FA3003C9B
65107+:105EB000010020210120282101403021AFA3001042
65108+:105EC0000E0000EEAFB000140A00016F00000000E9
65109+:105ED0003C06800034C20E008C4400108F850044C4
65110+:105EE000ACA400208C43001803E00008ACA30024FD
65111+:105EF0003C06800034C20E008C4400148F850044A0
65112+:105F0000ACA400208C43001C03E00008ACA30024D8
65113+:105F10009382000C1040001B2483000F2404FFF028
65114+:105F20000064382410E00019978B00109784000E4D
65115+:105F30009389000D3C0A601C0A0001AC01644023F7
65116+:105F400001037021006428231126000231C2FFFFE3
65117+:105F500030A2FFFF0047302B50C0000E00E4482164
65118+:105F60008D4D000C31A3FFFF00036400000C2C03D7
65119+:105F700004A1FFF30000302130637FFF0A0001A479
65120+:105F80002406000103E00008000000009784000ED2
65121+:105F900000E448213123FFFF3168FFFF0068382B00
65122+:105FA00054E0FFF8A783000E938A000D114000050E
65123+:105FB000240F0001006BC023A380000D03E0000844
65124+:105FC000A798000E006BC023A38F000D03E000080C
65125+:105FD000A798000E03E000080000000027BDFFE8BE
65126+:105FE000AFB000103C10800036030140308BFFFF43
65127+:105FF00093AA002BAFBF0014A46B000436040E005C
65128+:106000009488001630C600FF8FA90030A4680006EF
65129+:10601000AC650008A0660012A46A001AAC670020F4
65130+:106020008FA5002CA4690018012020210E000198E2
65131+:10603000AC6500143C021000AE0201788FBF001462
65132+:106040008FB0001003E0000827BD00188F85000006
65133+:106050002484000727BDFFF83084FFF83C06800049
65134+:1060600094CB008A316AFFFFAFAA00008FA900001D
65135+:10607000012540232507FFFF30E31FFF0064102B9D
65136+:106080001440FFF700056882000D288034CC4000E2
65137+:1060900000AC102103E0000827BD00088F8200003B
65138+:1060A0002486000730C5FFF800A2182130641FFFC6
65139+:1060B00003E00008AF8400008F87003C8F84004419
65140+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
65141+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
65142+:1060E000AFB20030AFB000283C0B80008C8600249B
65143+:1060F000AD6700808C8A002035670E00356901008D
65144+:10610000ACEA00108C8800248D2500040000B82122
65145+:10611000ACE800188CE3001000A688230000A02142
65146+:10612000ACE300148CE20018ACE2001C122000FE6C
65147+:1061300000E0B021936C0008118000F40000000022
65148+:10614000976F001031EEFFFF022E682B15A000EFB5
65149+:1061500000000000977200103250FFFFAED0000028
65150+:106160003C0380008C740000329300081260FFFD35
65151+:106170000000000096D800088EC700043305FFFF1A
65152+:1061800030B5000112A000E4000000000000000D86
65153+:1061900030BFA0402419004013F9011B30B4A00007
65154+:1061A000128000DF000000009373000812600008F6
65155+:1061B00000000000976D001031ACFFFF00EC202BB9
65156+:1061C0001080000330AE004011C000D50000000078
65157+:1061D000A7850040AF87003893630008022028217C
65158+:1061E000AFB10020146000F527B40020AF60000CB0
65159+:1061F000978F004031F14000162000022403001662
65160+:106200002403000E24054007A363000AAF650014B1
65161+:10621000938A00428F70001431550001001512401E
65162+:1062200002024825AF690014979F00408F78001440
65163+:1062300033F9001003194025AF680014979200400D
65164+:106240003247000810E0016E000000008F67001464
65165+:106250003C1210003C11800000F27825AF6F001452
65166+:1062600036230E00946E000A3C0D81002406000EB9
65167+:1062700031CCFFFF018D2025AF640004A36600022E
65168+:106280009373000A3406FFFC266B0004A36B000A1C
65169+:1062900097980040330820001100015F00000000C3
65170+:1062A0003C05800034A90E00979900409538000CF9
65171+:1062B00097870040001940423312C00031030003A9
65172+:1062C00000127B0330F11000006F6825001172038B
65173+:1062D00001AE6025000C20C0A76400129793004017
65174+:1062E000936A000A001359823175003C02AA1021FA
65175+:1062F0002450003CA3700009953F000C33F93FFF88
65176+:10630000A779001097700012936900090130F821F5
65177+:1063100027E5000230B900070019C0233308000741
65178+:10632000A368000B9371000997720012976F001019
65179+:10633000322700FF8F910038978D004000F218211E
65180+:10634000006F702101C6602131A6004010C0000519
65181+:106350003185FFFF00B1102B3C1280001040001768
65182+:10636000000098210225A82B56A0013E8FA50020F1
65183+:106370003C048000348A0E008D5300143C068000DB
65184+:10638000AD5300108D4B001CAD4B0018AD45000007
65185+:106390008CCD000031AC00081180FFFD34CE0E0022
65186+:1063A00095C3000800A0882100009021A783004029
65187+:1063B0008DC6000424130001AF860038976F0010CB
65188+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
65189+:1063D000AE85000093620008144000DD000000005C
65190+:1063E0000E0001E7240400108F900048004028218F
65191+:1063F0003C023200320600FF000654000142F8253C
65192+:1064000026090001AF890048ACBF0000937900095C
65193+:1064100097780012936F000A332800FF3303FFFFC1
65194+:106420000103382100076C0031EE00FF01AE60254A
65195+:10643000ACAC00048F840048978B0040316A200088
65196+:106440001140010AACA4000897640012308BFFFFD2
65197+:1064500006400108ACAB000C978E004031C5000827
65198+:1064600014A0000226280006262800023C1F8000F7
65199+:1064700037E70E0094F900148CE5001C8F670004C8
65200+:10648000937800023324FFFF330300FFAFA3001013
65201+:106490008F6F0014AFA800180E0001CBAFAF00142F
65202+:1064A000240400100E0001FB000000008E9200008A
65203+:1064B00016400005000000008F7800142403FFBF81
65204+:1064C0000303A024AF7400148F67000C00F5C821EB
65205+:1064D000AF79000C9375000816A0000800000000BA
65206+:1064E00012600006000000008F6800143C0AEFFFF5
65207+:1064F0003549FFFE0109F824AF7F0014A37300089B
65208+:106500008FA500200A00034F02202021AED10000F9
65209+:106510000A00022D3C03800014E0FF1E30BFA040A3
65210+:106520000E0001900000A0212E9100010237B0253D
65211+:1065300012C000188FBF00488F87003C24170F003F
65212+:1065400010F700D43C0680008CD901780720FFFEAC
65213+:10655000241F0F0010FF00F634CA0E008D560014E1
65214+:1065600034C7014024080240ACF600048D49001CE9
65215+:106570003C141000ACE90008A0E00012A4E0001AEE
65216+:10658000ACE00020A4E00018ACE80014ACD4017822
65217+:106590008FBF00488FB700448FB600408FB5003CD6
65218+:1065A0008FB400388FB300348FB200308FB1002C1D
65219+:1065B0008FB0002803E0000827BD00508F910038FD
65220+:1065C000978800403C1280000220A821310700403B
65221+:1065D00014E0FF7C00009821977900108F9200381A
65222+:1065E0003338FFFF131200A8000020210080A021F3
65223+:1065F000108000F300A088211620FECE00000000CD
65224+:106600000A00031F2E9100013C0380008C62017878
65225+:106610000440FFFE240808008F860000AC68017863
65226+:106620003C038000946D008A31ACFFFF0186582343
65227+:10663000256AFFFF31441FFF2C8900081520FFF950
65228+:10664000000000008F8F0048347040008F83003CB2
65229+:1066500000E0A021240E0F0025E70001AF870048CD
65230+:1066600000D03021023488233C08800031F500FF3F
65231+:10667000106E0005240700019398004233130001B7
65232+:106680000013924036470001001524003C0A010027
65233+:10669000008A4825ACC900008F82004830BF003610
65234+:1066A00030B90008ACC200041320009900FF9825FF
65235+:1066B00035120E009650000A8F8700003C0F8100B3
65236+:1066C0003203FFFF24ED000835060140006F60250E
65237+:1066D0003C0E100031AB1FFF269200062405000E71
65238+:1066E000ACCC0020026E9825A4C5001AAF8B000028
65239+:1066F000A4D20018162000083C1080008F89003CAE
65240+:1067000024020F00512200022417000136730040BA
65241+:106710000E0001883C10800036060E008CCB001461
65242+:10672000360A014002402021AD4B00048CC5001CFC
65243+:10673000AD450008A1550012AD5300140E0001989C
65244+:106740003C151000AE1501780A000352000000004D
65245+:10675000936F0009976E0012936D000B31E500FFF7
65246+:1067600000AE202131AC00FF008C80212602000AFF
65247+:106770003050FFFF0E0001E7020020218F86004805
65248+:106780003C0341003C05800024CB0001AF8B004856
65249+:10679000936A00099769001230C600FF315F00FF5D
65250+:1067A0003128FFFF03E8382124F900020006C40065
65251+:1067B0000319782501E37025AC4E00008F6D000CA5
65252+:1067C00034A40E00948B001401B26025AC4C00047C
65253+:1067D0008C85001C8F670004936A00023164FFFF00
65254+:1067E000314900FFAFA900108F680014AFB1001845
65255+:1067F0000E0001CBAFA800140A0002FD0200202108
65256+:10680000AF600004A36000029798004033082000A6
65257+:106810001500FEA300003021A760001297840040FD
65258+:10682000936B000A3C10800030931F0000135183CB
65259+:10683000014BA82126A20028A362000936090E00F8
65260+:10684000953F000C0A000295A77F00108F7000147E
65261+:10685000360900400E000188AF6900140A0002C921
65262+:10686000000000000A00034F000020210641FEFA4C
65263+:10687000ACA0000C8CAC000C3C0D8000018D902570
65264+:106880000A0002EAACB2000C000090210A0002C526
65265+:1068900024130001128000073C028000344B0E00DC
65266+:1068A0009566000830D300401260004900000000E7
65267+:1068B0003C0680008CD001780600FFFE34C50E0037
65268+:1068C00094B500103C03050034CC014032B8FFFF02
65269+:1068D00003039025AD92000C8CAF0014240D200012
65270+:1068E0003C041000AD8F00048CAE001CAD8E00087F
65271+:1068F000A1800012A580001AAD800020A58000189C
65272+:10690000AD8D0014ACC401780A0003263C0680005B
65273+:106910008F9F0000351801402692000227F90008D9
65274+:1069200033281FFFA71200180A000391AF88000048
65275+:106930003C02800034450140ACA0000C1280001BDA
65276+:1069400034530E0034510E008E370010ACB70004E3
65277+:106950008E2400183C0B8000ACA400083570014068
65278+:1069600024040040A20000128FBF0048A600001AB5
65279+:106970008FB70044AE0000208FB60040A60000187C
65280+:106980008FB5003CAE0400148FB400388FB30034D0
65281+:106990008FB200308FB1002C8FB000283C02100065
65282+:1069A00027BD005003E00008AD6201788E66001438
65283+:1069B000ACA600048E64001C0A00042A3C0B800074
65284+:1069C0000E0001902E9100010A0003200237B0252D
65285+:1069D000000000000000000D00000000240003691A
65286+:1069E0000A0004013C06800027BDFFD8AFBF00208D
65287+:1069F0003C0980003C1F20FFAFB200183C0760003C
65288+:106A000035320E002402001037F9FFFDACE23008E9
65289+:106A1000AFB3001CAFB10014AFB00010AE5900000E
65290+:106A20000000000000000000000000000000000066
65291+:106A3000000000003C1800FF3713FFFDAE530000BC
65292+:106A40003C0B60048D7050002411FF7F3C0E00024F
65293+:106A50000211782435EC380C35CD0109ACED4C1819
65294+:106A6000240A0009AD6C50008CE80438AD2A0008F7
65295+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
65296+:106A800000051E023062000F2486C0B310400007CC
65297+:106A9000AF8200088CE54C1C3C09001F3528FC0027
65298+:106AA00000A81824000321C2AF8400048CF1080858
65299+:106AB0003C0F57092412F0000232702435F0001008
65300+:106AC00001D0602601CF68262DAA00012D8B000180
65301+:106AD000014B382550E00009A380000C3C1F601CCE
65302+:106AE0008FF8000824190001A399000C33137C00CF
65303+:106AF000A7930010A780000EA380000DAF80004870
65304+:106B000014C00003AF8000003C066000ACC0442C01
65305+:106B10000E0005B93C1080000E000F1A361101005E
65306+:106B20003C12080026523DD03C13080026733E500C
65307+:106B30008E03000038640001308200011440FFFC25
65308+:106B40003C0B800A8E2600002407FF8024C90240E7
65309+:106B5000312A007F014B402101272824AE06002066
65310+:106B6000AF880044AE0500243C048000AF86003CA2
65311+:106B70008C8C01780580FFFE24180800922F0008F5
65312+:106B8000AC980178A38F0042938E004231CD000172
65313+:106B900011A0000F24050D0024DFF8002FF90301D8
65314+:106BA0001320001C000629C224A4FFF00004104298
65315+:106BB000000231400E00020200D2D8213C02400007
65316+:106BC0003C068000ACC201380A0004A000000000AE
65317+:106BD00010C50023240D0F0010CD00273C1F800896
65318+:106BE00037F9008093380000240E0050330F00FF67
65319+:106BF00015EEFFF33C0240000E000A3600000000D4
65320+:106C00003C0240003C068000ACC201380A0004A0EF
65321+:106C1000000000008F83000400A3402B1500000B30
65322+:106C20008F8B0008006B50212547FFFF00E5482BA4
65323+:106C30001520000600A36023000C19400E0002027C
65324+:106C40000073D8210A0004C43C0240000000000D7B
65325+:106C50000E000202000000000A0004C43C024000D2
65326+:106C60003C1B0800277B3F500E0002020000000082
65327+:106C70000A0004C43C0240003C1B0800277B3F7014
65328+:106C80000E000202000000000A0004C43C024000A2
65329+:106C90003C0660043C09080025290104ACC9502CBD
65330+:106CA0008CC850003C0580003C0200023507008083
65331+:106CB000ACC750003C040800248415A43C03080021
65332+:106CC0002463155CACA50008ACA2000C3C010800D4
65333+:106CD000AC243D603C010800AC233D6403E00008A7
65334+:106CE0002402000100A030213C1C0800279C3D68C4
65335+:106CF0003C0C04003C0B0002008B3826008C402624
65336+:106D00002CE200010007502B2D050001000A4880ED
65337+:106D10003C03080024633D60004520250123182121
65338+:106D20001080000300001021AC6600002402000166
65339+:106D300003E00008000000003C1C0800279C3D68A0
65340+:106D40003C0B04003C0A0002008A3026008B3826E7
65341+:106D50002CC200010006482B2CE5000100094080F0
65342+:106D60003C03080024633D600045202501031821F1
65343+:106D700010800005000010213C0C0800258C155CDB
65344+:106D8000AC6C00002402000103E0000800000000D9
65345+:106D90003C0900023C08040000883026008938269F
65346+:106DA0002CC30001008028212CE400010083102561
65347+:106DB0001040000B000030213C1C0800279C3D685F
65348+:106DC0003C0A80008D4E00082406000101CA682597
65349+:106DD000AD4D00088D4C000C01855825AD4B000CC5
65350+:106DE00003E0000800C010213C1C0800279C3D68FF
65351+:106DF0003C0580008CA6000C000420272402000122
65352+:106E000000C4182403E00008ACA3000C3C020002FC
65353+:106E10001082000B3C0560003C0704001087000353
65354+:106E20000000000003E00008000000008CA908D06A
65355+:106E3000240AFFFD012A402403E00008ACA808D082
65356+:106E40008CA408D02406FFFE0086182403E0000866
65357+:106E5000ACA308D03C05601A34A600108CC3008097
65358+:106E600027BDFFF88CC50084AFA3000093A40000E9
65359+:106E70002402000110820003AFA5000403E0000813
65360+:106E800027BD000893A7000114E0001497AC00028E
65361+:106E900097B800023C0F8000330EFFFC01CF682141
65362+:106EA000ADA50000A3A000003C0660008CC708D080
65363+:106EB0002408FFFE3C04601A00E82824ACC508D072
65364+:106EC0008FA300048FA200003499001027BD000892
65365+:106ED000AF22008003E00008AF2300843C0B800059
65366+:106EE000318AFFFC014B48218D2800000A00057DF6
65367+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
65368+:106F0000279C3D683C0580008CA4000C8CA20004EA
65369+:106F10003C0300020044282410A0000A00A3182407
65370+:106F20003C0604003C0400021460000900A6102482
65371+:106F30001440000F3C0404000000000D3C1C08003D
65372+:106F4000279C3D688FBF001003E0000827BD001894
65373+:106F50003C0208008C423D600040F809000000003F
65374+:106F60003C1C0800279C3D680A0005A68FBF001046
65375+:106F70003C0208008C423D640040F809000000001B
65376+:106F80000A0005AC00000000000411C003E0000886
65377+:106F9000244202403C04080024843FB42405001A23
65378+:106FA0000A00009C0000302127BDFFE0AFB00010B8
65379+:106FB0003C108000AFBF0018AFB1001436110100C3
65380+:106FC000922200090E0005B63044007F8E3F00007B
65381+:106FD0008F89003C3C0F008003E26021258800403F
65382+:106FE0000049F821240DFF80310E00783198007897
65383+:106FF00035F9000135F100020319382501D1482582
65384+:10700000010D302403ED5824018D2824240A00406A
65385+:1070100024040080240300C0AE0B0024AE0008103E
65386+:10702000AE0A0814AE040818AE03081CAE05080426
65387+:10703000AE070820AE060808AE0908243609090084
65388+:107040009539000C3605098033ED007F3338FFFF9A
65389+:10705000001889C0AE110800AE0F0828952C000C4E
65390+:107060008FBF00188FB10014318BFFFF000B51C090
65391+:10707000AE0A002C8CA400508FB000108CA3003CF2
65392+:107080008D2700048CA8001C8CA600383C0E800ABA
65393+:1070900001AE102127BD0020AF820044AF84005014
65394+:1070A000AF830054AF87004CAF88005C03E000085A
65395+:1070B000AF8600603C09080091293FD924A800024E
65396+:1070C0003C05110000093C0000E8302500C51825EA
65397+:1070D00024820008AC83000003E00008AC800004B8
65398+:1070E0003C098000352309009128010B906A0011AA
65399+:1070F0002402002800804821314700FF00A07021B1
65400+:1071000000C068213108004010E20002340C86DD26
65401+:10711000240C08003C0A800035420A9A944700007B
65402+:10712000354B0A9C35460AA030F9FFFFAD39000007
65403+:107130008D780000354B0A8024040001AD3800042E
65404+:107140008CCF0000AD2F00089165001930A300031B
65405+:107150001064009028640002148000AF240500022F
65406+:107160001065009E240F0003106F00B435450AA47B
65407+:10717000240A0800118A0048000000005100003D68
65408+:107180003C0B80003C0480003483090090670012AF
65409+:1071900030E200FF004D7821000FC8802724000155
65410+:1071A0003C0A8000354F090091E50019354C0980F3
65411+:1071B0008D87002830A300FF0003150000475825E5
65412+:1071C0000004C4003C19600001793025370806FF2F
65413+:1071D000AD260000AD2800048DEA002C25280028EB
65414+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
65415+:1071F000AD2500108DE400383C05800034AC093C1E
65416+:10720000AD2400148DE3001CAD2300188DE7002091
65417+:10721000AD27001C8DE20024AD2200208DF900284E
65418+:1072200034A20100AD3900248D830000AD0E0004AE
65419+:1072300034B90900AD0300008C47000C250200148E
65420+:10724000AD070008932B00123C04080090843FD83F
65421+:10725000AD000010317800FF030D302100064F0013
65422+:1072600000047C00012F702535CDFFFC03E00008F1
65423+:10727000AD0D000C35780900930600123C0508009E
65424+:1072800094A53FC830C800FF010D5021000A60805E
65425+:107290000A00063C018520211500005B000000006B
65426+:1072A0003C08080095083FCE3C06080094C63FC83D
65427+:1072B000010610213C0B800035790900933800113C
65428+:1072C000932A001935660A80330800FF94CF002AFC
65429+:1072D00000086082314500FF978A0058000C1E00AC
65430+:1072E000000524003047FFFF006410250047C0253B
65431+:1072F00001EA30213C0B4000030B402500066400EE
65432+:10730000AD280000AD2C0004932500183C030006B6
65433+:107310002528001400053E0000E31025AD220008DA
65434+:107320008F24002C3C05800034AC093CAD24000CBB
65435+:107330008F38001C34A20100254F0001AD38001029
65436+:107340008D830000AD0E000431EB7FFFAD03000024
65437+:107350008C47000C34B90900A78B0058AD07000812
65438+:10736000932B00123C04080090843FD8250200149F
65439+:10737000317800FF030D302100064F0000047C002F
65440+:10738000012F702535CDFFFCAD00001003E0000893
65441+:10739000AD0D000C3C02080094423FD23C050800B1
65442+:1073A00094A53FC835440AA43C07080094E73FC4AD
65443+:1073B000948B00000045C8210327C023000B1C004C
65444+:1073C0002706FFF200665025AD2A000CAD20001004
65445+:1073D000AD2C00140A00063025290018354F0AA4E8
65446+:1073E00095E50000956400280005140000043C00A9
65447+:1073F0003459810000EC5825AD39000CAD2B00103C
65448+:107400000A000630252900143C0C0800958C3FCE5C
65449+:107410000A000681258200015460FF56240A0800F4
65450+:1074200035580AA49706000000061C00006C502581
65451+:10743000AD2A000C0A000630252900103C03080084
65452+:1074400094633FD23C07080094E73FC83C0F080014
65453+:1074500095EF3FC494A4000095790028006710219F
65454+:10746000004F582300041C00001934002578FFEE5B
65455+:1074700000D87825346A8100AD2A000CAD2F0010A9
65456+:10748000AD200014AD2C00180A0006302529001C80
65457+:1074900003E00008240207D027BDFFE0AFB20018C8
65458+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
65459+:1074B000008088218F8800548F87004C3C0580080D
65460+:1074C00034B20080011128213C1080002402008089
65461+:1074D000240300C000A72023AE0208183C06800841
65462+:1074E000AE03081C18800004AF850054ACC500042E
65463+:1074F0008CC90004AF89004C1220000936040980B1
65464+:107500000E0006F800000000924C00278E0B00745D
65465+:1075100001825004014B3021AE46000C3604098034
65466+:107520008C8E001C8F8F005C01CF682319A0000493
65467+:107530008FBF001C8C90001CAF90005C8FBF001CA4
65468+:107540008FB200188FB100148FB000100A00007EB7
65469+:1075500027BD00208F8600508F8300548F82004CFF
65470+:107560003C05800834A40080AC860050AC83003C0D
65471+:1075700003E00008ACA200043C0308008C63005444
65472+:1075800027BDFFF8308400FF2462000130A500FF12
65473+:107590003C010800AC22005430C600FF3C078000CC
65474+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
65475+:1075B0008FAA0000358BFFFF014B4824000627C02F
65476+:1075C00001244025AFA8000034E201009043000AE6
65477+:1075D000A3A000023C1980FFA3A300018FAF00000D
65478+:1075E00030AE007F3738FFFF01F86024000E6E00D8
65479+:1075F0003C0A002034E50140018D58253549200022
65480+:107600002406FF803C04100027BD0008ACAB000C32
65481+:10761000ACA90014A4A00018A0A6001203E0000862
65482+:10762000ACE40178308800FF30A700FF3C03800005
65483+:107630008C6201780440FFFE3C0C8000358A0A0011
65484+:107640008D4B00203584014035850980AC8B0004CA
65485+:107650008D4900240007302B00061540AC89000836
65486+:10766000A088001090A3004CA083002D03E0000828
65487+:10767000A480001827BDFFE8308400FFAFBF0010D2
65488+:107680000E00075D30A500FF8F8300548FBF0010F0
65489+:107690003C06800034C50140344700402404FF907C
65490+:1076A0003C02100027BD0018ACA3000CA0A40012DF
65491+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
65492+:1076C0003C088008AFBF001CAFB20018AFB1001477
65493+:1076D000AFB00010351000808E0600183C07800007
65494+:1076E000309200FF00C72025AE0400180E00007C79
65495+:1076F00030B100FF92030005346200080E00007EE6
65496+:10770000A2020005024020210E000771022028215C
65497+:10771000024020218FBF001C8FB200188FB10014CF
65498+:107720008FB0001024050005240600010A0007326E
65499+:1077300027BD00203C05800034A309809066000826
65500+:1077400030C200081040000F3C0A01013549080A08
65501+:10775000AC8900008CA80074AC8800043C070800C9
65502+:1077600090E73FD830E5001050A00008AC8000083A
65503+:107770003C0D800835AC00808D8B0058AC8B000828
65504+:107780002484000C03E00008008010210A0007B5E3
65505+:107790002484000C27BDFFE83C098000AFB0001036
65506+:1077A000AFBF00143526098090C8000924020006E6
65507+:1077B00000A05821310300FF3527090000808021F7
65508+:1077C000240500041062007B2408000294CF005CB2
65509+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
65510+:1077E00090CA00083144002010800008000000000A
65511+:1077F00090C2004E3C1F010337F90300305800FFD0
65512+:107800000319302524050008AE06000490F9001184
65513+:1078100090E6001290E40011333800FF00187082E7
65514+:1078200030CF00FF01CF5021014B6821308900FF8C
65515+:1078300031AAFFFF39230028000A60801460002C61
65516+:10784000020C482390E400123C198000372F0100FD
65517+:10785000308C00FF018B1821000310800045F821B7
65518+:10786000001F8400360706FFAD270004373F0900DC
65519+:1078700093EC001193EE0012372609800005C082B8
65520+:107880008DE4000C8CC5003431CD00FF01AB10211C
65521+:107890000058182100A4F8230008840000033F00CA
65522+:1078A00000F0302533F9FFFF318F00FC00D970253F
65523+:1078B0000158202101E9682100045080ADAE000C80
65524+:1078C0000E00007C012A80213C088008240B000463
65525+:1078D000350500800E00007EA0AB000902001021DB
65526+:1078E0008FBF00148FB0001003E0000827BD001800
65527+:1078F00090EC001190E300193C18080097183FCE57
65528+:10790000318200FF0002F882307000FF001FCE00BD
65529+:1079100000103C000327302500D870253C0F4000A4
65530+:1079200001CF68253C198000AD2D0000373F0900CC
65531+:1079300093EC001193EE0012372F010037260980D7
65532+:107940000005C0828DE4000C8CC5003431CD00FFF1
65533+:1079500001AB10210058182100A4F823000884006E
65534+:1079600000033F0000F0302533F9FFFF318F00FCAA
65535+:1079700000D970250158202101E9682100045080B8
65536+:10798000ADAE000C0E00007C012A80213C0880086E
65537+:10799000240B0004350500800E00007EA0AB00091A
65538+:1079A000020010218FBF00148FB0001003E0000808
65539+:1079B00027BD00180A0007C72408001227BDFFD002
65540+:1079C0003C038000AFB60028AFB50024AFB4002060
65541+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
65542+:1079E000AFB000103467010090E6000B309400FF48
65543+:1079F00030B500FF30C200300000B02110400099C7
65544+:107A000000008821346409809088000800082E0056
65545+:107A100000051E03046000C0240400048F86005487
65546+:107A20003C010800A0243FD83C0C8000AD800048F9
65547+:107A30003C048000348E010091CD000B31A5002064
65548+:107A400010A000073C078000349309809272000860
65549+:107A50000012860000107E0305E000C43C1F800871
65550+:107A600034EC0100918A000B34EB09809169000825
65551+:107A7000314400400004402B3123000800C8982303
65552+:107A80001460000224120003000090213C108000CA
65553+:107A900036180A8036040900970E002C90830011D6
65554+:107AA0009089001293050018307F00FF312800FFF5
65555+:107AB000024810210002C880930D0018033F78216E
65556+:107AC00001F1302130B100FF00D11821A78E0058FC
65557+:107AD0003C010800A4263FCE3C010800A4233FD06F
65558+:107AE00015A00002000000000000000D920B010B29
65559+:107AF0003065FFFF3C010800A4233FD2316A0040FB
65560+:107B00003C010800A4203FC83C010800A4203FC459
65561+:107B10001140000224A4000A24A4000B3091FFFFAE
65562+:107B20000E0001E7022020219206010B3C0C080008
65563+:107B3000958C3FD2004020210006698231A70001C8
65564+:107B40000E00060101872821004020210260282123
65565+:107B50000E00060C024030210E0007A1004020213B
65566+:107B600016C00069004020219212010B32560040DD
65567+:107B700012C000053C0500FF8C93000034AEFFFFEF
65568+:107B8000026E8024AC9000000E0001FB0220202138
65569+:107B90003C0F080091EF3FD831F10003122000168E
65570+:107BA0003C1380088F8200543C09800835280080EF
65571+:107BB000245F0001AD1F003C3C0580088CB9000427
65572+:107BC00003E02021033FC0231B000002AF9F0054AD
65573+:107BD0008CA400040E0006F8ACA400043C0780004E
65574+:107BE0008CEB00743C04800834830080004B5021EF
65575+:107BF000AC6A000C3C1380083670008002802021A3
65576+:107C000002A02821A200006B0E00075D3C1480003A
65577+:107C10008F920054368C0140AD92000C8F86004844
65578+:107C20003C151000344D000624D60001AF960048E4
65579+:107C30008FBF002CA18600128FB60028AD8D0014D6
65580+:107C40008FB3001CAE9501788FB200188FB5002459
65581+:107C50008FB400208FB100148FB0001003E0000833
65582+:107C600027BD003034640980908F0008000F760033
65583+:107C7000000E6E0305A00033347F090093F8001B4B
65584+:107C8000241900103C010800A0393FD8331300022A
65585+:107C90001260FF678F8600548F8200601446FF6574
65586+:107CA0003C0480000E00007C000000003C048008C2
65587+:107CB0003485008090A8000924060016310300FFD7
65588+:107CC0001066000D0000000090AB00093C070800A2
65589+:107CD00090E73FD824090008316400FF34EA00012E
65590+:107CE0003C010800A02A3FD81089002F240C000A6C
65591+:107CF000108C00282402000C0E00007E0000000002
65592+:107D00000A0008608F8600540E0007B9024028213F
65593+:107D10000A0008AE004020213C0B8008356A008034
65594+:107D20008D4600548CE9000C1120FF3DAF860054B5
65595+:107D3000240700143C010800A0273FD80A00085F70
65596+:107D40003C0C800090910008241200023C010800C5
65597+:107D5000A0323FD8323000201200000B2416000160
65598+:107D60008F8600540A0008602411000837F800804C
65599+:107D70008F020038AFE200048FF90004AF19003C15
65600+:107D80000A00086C3C0780008F8600540A000860D7
65601+:107D900024110004A0A200090E00007E00000000D3
65602+:107DA0000A0008608F860054240200140A00093A71
65603+:107DB000A0A2000927BDFFE8AFB000103C10800072
65604+:107DC000AFBF001436020100904400090E00075DA9
65605+:107DD000240500013C0480089099000E3483008043
65606+:107DE000909F000F906F00269089000A33F800FFE3
65607+:107DF00000196E000018740031EC00FF01AE502530
65608+:107E0000000C5A00014B3825312800FF3603014091
65609+:107E10003445600000E830252402FF813C04100056
65610+:107E2000AC66000C8FBF0014AC650014A062001299
65611+:107E3000AE0401788FB0001003E0000827BD0018E1
65612+:107E400027BDFFE8308400FFAFBF00100E00075DC4
65613+:107E500030A500FF3C05800034A4014034470040B9
65614+:107E60002406FF92AC870014A08600128F83005472
65615+:107E70008FBF00103C02100027BD0018AC83000C1F
65616+:107E800003E00008ACA2017827BDFFD8AFB0001016
65617+:107E9000308400FF30B000FF3C058000AFB100141B
65618+:107EA000AFBF0020AFB3001CAFB20018000410C277
65619+:107EB00034A60100320300023051000114600007B3
65620+:107EC00090D200093C098008353300809268000593
65621+:107ED0003107000810E0000C308A00100240202119
65622+:107EE0000E00078302202821240200018FBF0020FA
65623+:107EF0008FB3001C8FB200188FB100148FB0001028
65624+:107F000003E0000827BD00281540003434A50A000E
65625+:107F10008CB800248CAF0008130F004B00003821F0
65626+:107F20003C0D800835B30080926C00682406000286
65627+:107F3000318B00FF116600843C06800034C20100D2
65628+:107F40009263004C90590009307F00FF53F9000400
65629+:107F50003213007C10E00069000000003213007C46
65630+:107F60005660005C0240202116200009320D0001FD
65631+:107F70003C0C800035840100358B0A008D6500249F
65632+:107F80008C86000414A6FFD900001021320D0001D8
65633+:107F900011A0000E024020213C1880003710010083
65634+:107FA0008E0F000C8F8E005011EE000800000000B4
65635+:107FB0000E000843022028218E19000C3C1F800867
65636+:107FC00037F00080AE190050024020210E000771EA
65637+:107FD000022028210A00098F240200013C05080024
65638+:107FE0008CA5006424A400013C010800AC240064BA
65639+:107FF0001600000D00000000022028210E0007716D
65640+:1080000002402021926E0068240C000231CD00FF56
65641+:1080100011AC0022024020210E00094100000000A6
65642+:108020000A00098F240200010E00007024040001E0
65643+:10803000926B0025020B30250E00007EA266002503
65644+:108040000A0009D3022028218E6200188CDF000468
65645+:108050008CB9002400021E0217F9FFB13065007FC1
65646+:108060009268004C264400013093007F1265004066
65647+:10807000310300FF1464FFAB3C0D8008264700016C
65648+:1080800030F1007F30E200FF1225000B24070001D1
65649+:10809000004090210A00099C2411000124050004DD
65650+:1080A0000E000732240600010E0009410000000006
65651+:1080B0000A00098F240200012405FF8002452024C4
65652+:1080C00000859026324200FF004090210A00099C62
65653+:1080D000241100010E00084302202821320700303D
65654+:1080E00010E0FFA132100082024020210E00078321
65655+:1080F000022028210A00098F240200018E6900183D
65656+:108100000240202102202821012640250E0009647A
65657+:10811000AE6800189264004C240500032406000198
65658+:108120000E000732308400FF0E00007024040001AE
65659+:1081300092710025021150250E00007EA26A0025D2
65660+:108140000A00098F240200018E6F00183C1880007D
65661+:108150000240202101F87025022028210E0007711D
65662+:10816000AE6E00189264004C0A000A1B240500043D
65663+:10817000324A0080394900801469FF6A3C0D80084A
65664+:108180000A0009F42647000127BDFFC0AFB0001860
65665+:108190003C108000AFBF0038AFB70034AFB600303E
65666+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
65667+:1081B0000E0005BEAFB1001C360201009045000B59
65668+:1081C0000E00097690440008144000E78FBF003885
65669+:1081D0003C08800835070080A0E0006B3606098067
65670+:1081E00090C50000240300503C17080026F73F907C
65671+:1081F00030A400FF3C13080026733FA01083000347
65672+:108200003C1080000000B82100009821241F0010BD
65673+:108210003611010036120A00361509808E580024E6
65674+:108220008E3400048EAF00208F8C00543C01080077
65675+:10823000A03F3FD836190A80972B002C8EF60000FD
65676+:10824000932A00180298702301EC68233C0108006F
65677+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
65678+:10826000AC2C3FDCA78B005802C0F809315400FF4A
65679+:1082700030490002152000E930420001504000C49E
65680+:108280009227000992A90008312800081500000271
65681+:10829000241500030000A8213C0A80003543090092
65682+:1082A00035440A008C8D00249072001190700012E9
65683+:1082B000907F0011325900FF321100FF02B11021EE
65684+:1082C0000002C08033EF00FF0319B021028F70213C
65685+:1082D00002D4602125CB00103C010800A4363FCE1B
65686+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
65687+:1082F0003C010800A42B3FCC3556010035540980C1
65688+:1083000035510E008F8700548F89005C8E850020C8
65689+:1083100024080006012730233C010800AC283FD484
65690+:1083200000A7282304C000B50000902104A000B3DA
65691+:1083300000C5502B114000B5000000003C010800B2
65692+:10834000AC263FB88E6200000040F8090000000033
65693+:108350003046000214C0007400408021304B000100
65694+:10836000556000118E6200043C0D08008DAD3FBCCD
65695+:108370003C0EC0003C04800001AE6025AE2C000025
65696+:108380008C980000330F000811E0FFFD0000000092
65697+:10839000963F000824120001A79F00408E39000478
65698+:1083A000AF9900388E6200040040F8090000000018
65699+:1083B0000202802532030002146000B300000000B6
65700+:1083C0003C09080095293FC43C06080094C63FD0EC
65701+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
65702+:1083E000012670213C0308008C633FE03C08080034
65703+:1083F00095083FDA01CA20218ED9000C00E9282116
65704+:10840000249F000200A878210067C02133E4FFFF09
65705+:10841000AF9900503C010800AC383FE03C01080037
65706+:10842000A42F3FC83C010800A42E3FD20E0001E754
65707+:10843000000000008F8D0048004020213C01080012
65708+:10844000A02D3FD98E62000825AC0001AF8C0048FA
65709+:108450000040F809000000008F85005402A0302180
65710+:108460000E00060C004020210E0007A10040202134
65711+:108470008E6B000C0160F809004020213C0A0800C6
65712+:10848000954A3FD23C06080094C63FC601464821A3
65713+:10849000252800020E0001FB3104FFFF3C05080007
65714+:1084A0008CA53FB43C0708008CE73FBC00A7202305
65715+:1084B0003C010800AC243FB414800006000000001A
65716+:1084C0003C0208008C423FD4344B00403C01080081
65717+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
65718+:1084E0008F920044AE4D00208E2C0018AE4C00241C
65719+:1084F0003C04080094843FC80E0006FA0000000007
65720+:108500008F9F00548E6700103C010800AC3F3FDC99
65721+:1085100000E0F809000000003C1908008F393FB462
65722+:108520001720FF798F870054979300583C11800ED5
65723+:10853000321601000E000729A633002C16C0004594
65724+:10854000320300105460004C8EE5000432080040F5
65725+:108550005500001D8EF000088EE4000C0080F80924
65726+:10856000000000008FBF00388FB700348FB6003096
65727+:108570008FB5002C8FB400288FB300248FB2002059
65728+:108580008FB1001C8FB0001803E0000827BD004029
65729+:108590008F86003C36110E0000072E0000A6202515
65730+:1085A000AE0400808E4300208E500024AFA3001044
65731+:1085B000AE2300148FB20010AE320010AE30001C9B
65732+:1085C0000A000A75AE3000180200F8090000000029
65733+:1085D0008EE4000C0080F809000000000A000B2E59
65734+:1085E0008FBF003824180001240F0001A5C000200F
65735+:1085F000A5D800220A000B10ADCF00243C010800D2
65736+:10860000AC203FB80A000AA68E6200003C010800B8
65737+:10861000AC253FB80A000AA68E6200009224000929
65738+:108620000E000771000028218FBF00388FB700347B
65739+:108630008FB600308FB5002C8FB400288FB3002484
65740+:108640008FB200208FB1001C8FB0001803E000082B
65741+:1086500027BD00403C1480009295010900002821AC
65742+:108660000E00084332A400FF320300105060FFB830
65743+:10867000320800408EE5000400A0F8090000000068
65744+:108680000A000B28320800405240FFA89793005878
65745+:108690008E3400148F930044AE7400208E35001C7D
65746+:1086A000AE7500240A000B1F979300588F820014A8
65747+:1086B0000004218003E00008008210213C078008AC
65748+:1086C00034E200809043006900804021106000097E
65749+:1086D0003C0401003C0708008CE73FDC8F8300303E
65750+:1086E00000E32023048000089389001C14E30003A6
65751+:1086F0000100202103E00008008010213C0401005B
65752+:1087000003E00008008010211120000B00673823CF
65753+:108710003C0D800035AC0980918B007C316A0002F1
65754+:10872000114000202409003400E9702B15C0FFF12E
65755+:108730000100202100E938232403FFFC00A3C82402
65756+:1087400000E3C02400F9782B15E0FFEA030820219C
65757+:1087500030C400030004102314C000143049000387
65758+:108760000000302100A9782101E6702100EE682B7D
65759+:1087700011A0FFE03C0401002D3800010006C82BC9
65760+:10878000010548210319382414E0FFDA2524FFFCF1
65761+:108790002402FFFC00A218240068202103E0000846
65762+:1087A000008010210A000B9E240900303C0C800040
65763+:1087B0003586098090CB007C316A00041540FFE9C2
65764+:1087C000240600040A000BAD000030213C03080021
65765+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
65766+:1087E000AFB1001410620005AFB00010000329C043
65767+:1087F00024A40280AF840014AF8300183C108000D2
65768+:1088000036020A0094450032361101000E000B7F3B
65769+:1088100030A43FFF8E240000241FFF803C11008005
65770+:108820000082C021031F60243309007F000CC9406F
65771+:1088300003294025330E0078362F00033C0D10002D
65772+:10884000010D502501CF5825AE0C002836080980AF
65773+:10885000AE0C080CAE0B082CAE0A08309103006970
65774+:108860003C06800C0126382110600006AF870034DA
65775+:108870008D09003C8D03006C0123382318E0008231
65776+:10888000000000003C0B8008356A00803C1080002E
65777+:10889000A1400069360609808CC200383C06800081
65778+:1088A00034C50A0090A8003C310C00201180001A49
65779+:1088B000AF820030240D00013C0E800035D10A004B
65780+:1088C000A38D001CAF8000248E2400248F850024FB
65781+:1088D000240D0008AF800020AF8000283C01080074
65782+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
65783+:1088F000000030219228003C8FBF00188FB1001477
65784+:108900008FB0001000086142AF82002C27BD00200C
65785+:1089100003E000083182000190B80032240E00010B
65786+:10892000330F00FF000F2182108E00412419000236
65787+:108930001099006434C40AC03C03800034640A0007
65788+:108940008C8F002415E0001E34660900909F0030D3
65789+:108950002418000533F9003F1338004E24030001AA
65790+:108960008F860020A383001CAF860028AF860024DA
65791+:108970003C0E800035D10A008E2400248F8500240F
65792+:10898000240D00083C010800A42D3FC63C0108004E
65793+:10899000A4203FDA0E000B83000000009228003C68
65794+:1089A0008FBF00188FB100148FB000100008614213
65795+:1089B000AF82002C27BD002003E0000831820001B7
65796+:1089C0008C8A00088C8B00248CD000643C0E8000C4
65797+:1089D00035D10A00014B2823AF900024A380001C4E
65798+:1089E000AF8500288E2400248F8600208F850024E8
65799+:1089F000240D00083C010800A42D3FC63C010800DE
65800+:108A0000A4203FDA0E000B83000000009228003CF7
65801+:108A10008FBF00188FB100148FB0001000086142A2
65802+:108A2000AF82002C27BD002003E000083182000146
65803+:108A300090A200303051003F5224002834C50AC0B3
65804+:108A40008CB000241600002234CB09008CA600480C
65805+:108A50003C0A7FFF3545FFFF00C510243C0E800017
65806+:108A6000AF82002035C509008F8800208CAD0060E2
65807+:108A7000010D602B15800002010020218CA40060F4
65808+:108A80000A000C22AF8400208D02006C0A000BFC4F
65809+:108A90003C0680008C8200488F8600203C097FFFC6
65810+:108AA0003527FFFF004788243C0480082403000189
65811+:108AB000AF910028AC80006CA383001C0A000C302E
65812+:108AC000AF8600248C9F00140A000C22AF9F002068
65813+:108AD0008D6200680A000C6C3C0E800034C4098072
65814+:108AE0008C8900708CA300140123382B10E0000443
65815+:108AF000000000008C8200700A000C6C3C0E8000AC
65816+:108B00008CA200140A000C6C3C0E80008F8500249F
65817+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
65818+:108B2000AFB000103C04800034870A0090E60030AB
65819+:108B30002402000530C3003F106200B934840900EC
65820+:108B40008F91002000A080213C048000348E0A0018
65821+:108B50008DCD00043C0608008CC63FB831A73FFF0E
65822+:108B600000E6602B5580000100E03021938F001C4F
65823+:108B700011E0007800D0282B349F098093F9007C05
65824+:108B800033380002130000792403003400C3102B93
65825+:108B9000144000D90000000000C3302300D0282B6F
65826+:108BA0003C010800A4233FC414A0006E0200182159
65827+:108BB0003C0408008C843FB40064402B5500000145
65828+:108BC000006020213C05800034A90A00912A003C65
65829+:108BD0003C010800AC243FBC31430020146000037A
65830+:108BE0000000482134AB0E008D6900188F88002CDE
65831+:108BF0000128202B1080005F000000003C050800C9
65832+:108C00008CA53FBC00A96821010D602B1180005C80
65833+:108C100000B0702B0109382300E028213C01080036
65834+:108C2000AC273FBC12000003240AFFFC10B0008DEB
65835+:108C30003224000300AA18243C010800A4203FDAD3
65836+:108C40003C010800AC233FBC006028218F84002435
65837+:108C5000120400063C0B80088D6C006C0200202181
65838+:108C6000AF91002025900001AD70006C8F8D002821
65839+:108C700000858823AF91002401A52023AF8400281C
65840+:108C80001220000224070018240700103C18800856
65841+:108C90003706008090CF00683C010800A0273FD82D
65842+:108CA0002407000131EE00FF11C70047000000005B
65843+:108CB00014800018000028213C06800034D109806F
65844+:108CC00034CD010091A600098E2C001824C40001A7
65845+:108CD000000C86023205007F308B007F1165007F1B
65846+:108CE0002407FF803C19800837290080A124004C0C
65847+:108CF0003C0808008D083FD4241800023C010800FD
65848+:108D0000A0384019350F00083C010800AC2F3FD4B3
65849+:108D1000240500103C02800034440A009083003C8B
65850+:108D2000307F002013E0000500A02021240A00016C
65851+:108D30003C010800AC2A3FBC34A400018FBF0018DE
65852+:108D40008FB100148FB000100080102103E00008E4
65853+:108D500027BD00203C010800A4203FC410A0FF94C0
65854+:108D6000020018210A000CC000C018210A000CB72C
65855+:108D7000240300303C0508008CA53FBC00B0702BDC
65856+:108D800011C0FFA8000000003C19080097393FC43B
65857+:108D90000325C0210307782B11E000072CAA00044B
65858+:108DA0003C0360008C625404305F003F17E0FFE337
65859+:108DB000240400422CAA00041140FF9A240400421B
65860+:108DC0000A000D248FBF00181528FFB9000000000D
65861+:108DD0008CCA00183C1F800024020002015F182585
65862+:108DE000ACC3001837F90A00A0C200689329003C00
65863+:108DF0002404000400A01021312800203C010800B8
65864+:108E0000A0244019110000022405001024020001D2
65865+:108E10003C010800AC223FB40A000D1A3C0280005D
65866+:108E20008F8800288C8900600109282B14A000027B
65867+:108E3000010088218C9100603C048000348B0E007E
65868+:108E40008D640018240A000102202821022030210C
65869+:108E5000A38A001C0E000B83022080210A000CA6AE
65870+:108E6000AF82002C00045823122000073164000355
65871+:108E70003C0E800035C7098090ED007C31AC0004C9
65872+:108E800015800019248F00043C010800A4243FDA57
65873+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
65874+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
65875+:108EB0002404004230A200031440000200A2182340
65876+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
65877+:108ED000A4203FDA0A000CE70060282100C77024B4
65878+:108EE0000A000D0D01C720263C010800A42F3FDA1F
65879+:108EF0000A000D78000000003C010800AC203FBCD7
65880+:108F00000A000D23240400428F8300283C058000C2
65881+:108F100034AA0A00146000060000102191470030B6
65882+:108F20002406000530E400FF108600030000000066
65883+:108F300003E0000800000000914B0048316900FF89
65884+:108F4000000941C21500FFFA3C0680083C040800F5
65885+:108F500094843FC43C0308008C633FDC3C19080048
65886+:108F60008F393FBC3C0F080095EF3FDA0064C02109
65887+:108F70008CCD00040319702101CF602134AB0E00A9
65888+:108F8000018D282318A0001D00000000914F004C07
65889+:108F90008F8C0034956D001031EE00FF8D89000438
65890+:108FA00001AE30238D8A000030CEFFFF000E290075
65891+:108FB0000125C82100003821014720210325182B55
65892+:108FC0000083C021AD990004AD980000918F000A84
65893+:108FD00001CF6821A18D000A956500128F8A0034A7
65894+:108FE000A5450008954B003825690001A5490038C2
65895+:108FF0009148000D35070008A147000D03E0000867
65896+:109000000000000027BDFFD8AFB000189388001CF7
65897+:109010008FB000143C0A80003C197FFF8F8700242A
65898+:109020003738FFFFAFBF0020AFB1001C355F0A002B
65899+:109030000218182493EB003C00087FC03C02BFFFDD
65900+:10904000006F60252CF000013449FFFF3C1F080031
65901+:109050008FFF3FDC8F9900303C18080097183FD2F3
65902+:1090600001897824001047803C07EFFF3C05F0FFA2
65903+:1090700001E818253C1180003169002034E2FFFF2F
65904+:1090800034ADFFFF362E098027A50010240600020C
65905+:1090900003F96023270B0002354A0E0000621824F2
65906+:1090A0000080802115200002000040218D48001C16
65907+:1090B000A7AB0012058000392407000030E800FF4C
65908+:1090C00000083F00006758253C028008AFAB001441
65909+:1090D000344F008091EA00683C08080091083FD9AD
65910+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
65911+:1090F00094423FCCA3A80011016CC024001FCF40B4
65912+:10910000031918258FA70010AFA300143C0C08000A
65913+:10911000918C3FDBA7A200168FAB001400ED482412
65914+:109120003C0F01003C0A0FFF012FC82531980003B6
65915+:10913000355FFFFF016D40243C027000033F38247F
65916+:1091400000181E0000E2482501037825AFAF001487
65917+:10915000AFA9001091CC007C0E000092A3AC0015CA
65918+:10916000362D0A0091A6003C30C400201080000675
65919+:10917000260200083C11080096313FC8262EFFFF4A
65920+:109180003C010800A42E3FC88FBF00208FB1001CF7
65921+:109190008FB0001803E0000827BD00288F8B002C3B
65922+:1091A000010B502B5540FFC5240700010A000E0497
65923+:1091B00030E800FF9383001C3C02800027BDFFD8ED
65924+:1091C00034480A0000805021AFBF002034460AC056
65925+:1091D000010028211060000E3444098091070030FE
65926+:1091E000240B00058F89002030EC003F118B000B11
65927+:1091F00000003821AFA900103C0B80088D69006C7D
65928+:10920000AFAA00180E00015AAFA90014A380001CD9
65929+:109210008FBF002003E0000827BD00288D1F0048F5
65930+:109220003C1808008F183FBC8F9900283C027FFF34
65931+:109230008D0800443443FFFFAFA900103C0B8008A9
65932+:109240008D69006C03E370240319782101CF682332
65933+:1092500001A83821AFAA00180E00015AAFA90014C6
65934+:109260000A000E58A380001C3C05800034A60A00AA
65935+:1092700090C7003C3C06080094C63FDA3C02080058
65936+:109280008C423FD430E30020000624001060001E12
65937+:10929000004438253C0880083505008090A300680C
65938+:1092A00000004821240800010000282124040001B6
65939+:1092B0003C0680008CCD017805A0FFFE34CF014034
65940+:1092C000ADE800083C0208008C423FDCA5E5000444
65941+:1092D000A5E40006ADE2000C3C04080090843FD9F0
65942+:1092E0003C03800834790080A1E40012ADE700144B
65943+:1092F000A5E900189338004C3C0E1000A1F8002D91
65944+:1093000003E00008ACCE017834A90E008D28001CC3
65945+:109310003C0C08008D8C3FBC952B0016952A001440
65946+:10932000018648213164FFFF0A000E803145FFFFAE
65947+:109330003C04800034830A009065003C30A2002089
65948+:109340001040001934870E00000040210000382131
65949+:10935000000020213C0680008CC901780520FFFE1A
65950+:1093600034CA014034CF010091EB0009AD48000838
65951+:109370003C0E08008DCE3FDC240DFF91240C0040F4
65952+:109380003C081000A5440004A5470006AD4E000CA3
65953+:10939000A14D0012AD4C0014A5400018A14B002DAA
65954+:1093A00003E00008ACC801788CE8001894E60012CD
65955+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
65956+:1093C0003C04800034830A009065003C30A20020F9
65957+:1093D0001040002727BDFFF82409000100003821B4
65958+:1093E000240800013C0680008CCA01780540FFFE7D
65959+:1093F0003C0280FF34C40100908D00093C0C080041
65960+:10940000918C4019A3AD00038FAB00003185007F24
65961+:109410003459FFFF01665025AFAA00009083000A6F
65962+:10942000A3A0000200057E00A3A300018FB80000E6
65963+:1094300034CB0140240C30000319702401CF68257F
65964+:10944000AD6D000C27BD0008AD6C0014A5600018C0
65965+:10945000AD690008A56700042409FF80A56800061F
65966+:109460003C081000A169001203E00008ACC80178B4
65967+:1094700034870E008CE9001894E6001294E4001082
65968+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
65969+:10949000AFB100143C118000AFB00010AFBF001896
65970+:1094A00036380A00970F0032363001000E000B7F6D
65971+:1094B00031E43FFF8E0E0000240DFF803C042000AD
65972+:1094C00001C25821016D6024000C4940316A007FBF
65973+:1094D000012A4025010438253C048008AE270830C5
65974+:1094E0003486008090C500682403000230A200FF8B
65975+:1094F000104300048F9F00208F990024AC9F0068C8
65976+:10950000AC9900648FBF00188FB100148FB00010A9
65977+:1095100003E0000827BD00203C0A0800254A3A80E5
65978+:109520003C09080025293B103C08080025082F1C91
65979+:109530003C07080024E73BDC3C06080024C639044D
65980+:109540003C05080024A536583C0408002484325CFD
65981+:109550003C030800246339B83C0208002442375415
65982+:109560003C010800AC2A3F983C010800AC293F941C
65983+:109570003C010800AC283F903C010800AC273F9C10
65984+:109580003C010800AC263FAC3C010800AC253FA4E0
65985+:109590003C010800AC243FA03C010800AC233FB0D4
65986+:1095A0003C010800AC223FA803E0000800000000D6
65987+:1095B00080000940800009008008010080080080C8
65988+:1095C00080080000800E00008008008080080000F5
65989+:1095D00080000A8080000A00800009808000090065
65990+:00000001FF
65991diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
65992index eb14e05..5156de7 100644
65993--- a/fs/9p/vfs_addr.c
65994+++ b/fs/9p/vfs_addr.c
65995@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
65996
65997 retval = v9fs_file_write_internal(inode,
65998 v9inode->writeback_fid,
65999- (__force const char __user *)buffer,
66000+ (const char __force_user *)buffer,
66001 len, &offset, 0);
66002 if (retval > 0)
66003 retval = 0;
66004diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
66005index 3662f1d..90558b5 100644
66006--- a/fs/9p/vfs_inode.c
66007+++ b/fs/9p/vfs_inode.c
66008@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
66009 void
66010 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
66011 {
66012- char *s = nd_get_link(nd);
66013+ const char *s = nd_get_link(nd);
66014
66015 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
66016 dentry, IS_ERR(s) ? "<error>" : s);
66017diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
66018index 270c481..0d8a962 100644
66019--- a/fs/Kconfig.binfmt
66020+++ b/fs/Kconfig.binfmt
66021@@ -106,7 +106,7 @@ config HAVE_AOUT
66022
66023 config BINFMT_AOUT
66024 tristate "Kernel support for a.out and ECOFF binaries"
66025- depends on HAVE_AOUT
66026+ depends on HAVE_AOUT && BROKEN
66027 ---help---
66028 A.out (Assembler.OUTput) is a set of formats for libraries and
66029 executables used in the earliest versions of UNIX. Linux used
66030diff --git a/fs/afs/inode.c b/fs/afs/inode.c
66031index 8a1d38e..300a14e 100644
66032--- a/fs/afs/inode.c
66033+++ b/fs/afs/inode.c
66034@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66035 struct afs_vnode *vnode;
66036 struct super_block *sb;
66037 struct inode *inode;
66038- static atomic_t afs_autocell_ino;
66039+ static atomic_unchecked_t afs_autocell_ino;
66040
66041 _enter("{%x:%u},%*.*s,",
66042 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
66043@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66044 data.fid.unique = 0;
66045 data.fid.vnode = 0;
66046
66047- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
66048+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
66049 afs_iget5_autocell_test, afs_iget5_set,
66050 &data);
66051 if (!inode) {
66052diff --git a/fs/aio.c b/fs/aio.c
66053index a793f70..46f45af 100644
66054--- a/fs/aio.c
66055+++ b/fs/aio.c
66056@@ -404,7 +404,7 @@ static int aio_setup_ring(struct kioctx *ctx)
66057 size += sizeof(struct io_event) * nr_events;
66058
66059 nr_pages = PFN_UP(size);
66060- if (nr_pages < 0)
66061+ if (nr_pages <= 0)
66062 return -EINVAL;
66063
66064 file = aio_private_file(ctx, nr_pages);
66065diff --git a/fs/attr.c b/fs/attr.c
66066index 6530ced..4a827e2 100644
66067--- a/fs/attr.c
66068+++ b/fs/attr.c
66069@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
66070 unsigned long limit;
66071
66072 limit = rlimit(RLIMIT_FSIZE);
66073+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
66074 if (limit != RLIM_INFINITY && offset > limit)
66075 goto out_sig;
66076 if (offset > inode->i_sb->s_maxbytes)
66077diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
66078index 116fd38..c04182da 100644
66079--- a/fs/autofs4/waitq.c
66080+++ b/fs/autofs4/waitq.c
66081@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
66082 {
66083 unsigned long sigpipe, flags;
66084 mm_segment_t fs;
66085- const char *data = (const char *)addr;
66086+ const char __user *data = (const char __force_user *)addr;
66087 ssize_t wr = 0;
66088
66089 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
66090@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
66091 return 1;
66092 }
66093
66094+#ifdef CONFIG_GRKERNSEC_HIDESYM
66095+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
66096+#endif
66097+
66098 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66099 enum autofs_notify notify)
66100 {
66101@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66102
66103 /* If this is a direct mount request create a dummy name */
66104 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
66105+#ifdef CONFIG_GRKERNSEC_HIDESYM
66106+ /* this name does get written to userland via autofs4_write() */
66107+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
66108+#else
66109 qstr.len = sprintf(name, "%p", dentry);
66110+#endif
66111 else {
66112 qstr.len = autofs4_getpath(sbi, dentry, &name);
66113 if (!qstr.len) {
66114diff --git a/fs/befs/endian.h b/fs/befs/endian.h
66115index 2722387..56059b5 100644
66116--- a/fs/befs/endian.h
66117+++ b/fs/befs/endian.h
66118@@ -11,7 +11,7 @@
66119
66120 #include <asm/byteorder.h>
66121
66122-static inline u64
66123+static inline u64 __intentional_overflow(-1)
66124 fs64_to_cpu(const struct super_block *sb, fs64 n)
66125 {
66126 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66127@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
66128 return (__force fs64)cpu_to_be64(n);
66129 }
66130
66131-static inline u32
66132+static inline u32 __intentional_overflow(-1)
66133 fs32_to_cpu(const struct super_block *sb, fs32 n)
66134 {
66135 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66136@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
66137 return (__force fs32)cpu_to_be32(n);
66138 }
66139
66140-static inline u16
66141+static inline u16 __intentional_overflow(-1)
66142 fs16_to_cpu(const struct super_block *sb, fs16 n)
66143 {
66144 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66145diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
66146index 4c55668..eeae150 100644
66147--- a/fs/binfmt_aout.c
66148+++ b/fs/binfmt_aout.c
66149@@ -16,6 +16,7 @@
66150 #include <linux/string.h>
66151 #include <linux/fs.h>
66152 #include <linux/file.h>
66153+#include <linux/security.h>
66154 #include <linux/stat.h>
66155 #include <linux/fcntl.h>
66156 #include <linux/ptrace.h>
66157@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
66158 #endif
66159 # define START_STACK(u) ((void __user *)u.start_stack)
66160
66161+ memset(&dump, 0, sizeof(dump));
66162+
66163 fs = get_fs();
66164 set_fs(KERNEL_DS);
66165 has_dumped = 1;
66166@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
66167
66168 /* If the size of the dump file exceeds the rlimit, then see what would happen
66169 if we wrote the stack, but not the data area. */
66170+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
66171 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
66172 dump.u_dsize = 0;
66173
66174 /* Make sure we have enough room to write the stack and data areas. */
66175+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
66176 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
66177 dump.u_ssize = 0;
66178
66179@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
66180 rlim = rlimit(RLIMIT_DATA);
66181 if (rlim >= RLIM_INFINITY)
66182 rlim = ~0;
66183+
66184+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
66185 if (ex.a_data + ex.a_bss > rlim)
66186 return -ENOMEM;
66187
66188@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
66189
66190 install_exec_creds(bprm);
66191
66192+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66193+ current->mm->pax_flags = 0UL;
66194+#endif
66195+
66196+#ifdef CONFIG_PAX_PAGEEXEC
66197+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
66198+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
66199+
66200+#ifdef CONFIG_PAX_EMUTRAMP
66201+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
66202+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
66203+#endif
66204+
66205+#ifdef CONFIG_PAX_MPROTECT
66206+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
66207+ current->mm->pax_flags |= MF_PAX_MPROTECT;
66208+#endif
66209+
66210+ }
66211+#endif
66212+
66213 if (N_MAGIC(ex) == OMAGIC) {
66214 unsigned long text_addr, map_size;
66215 loff_t pos;
66216@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
66217 return error;
66218
66219 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
66220- PROT_READ | PROT_WRITE | PROT_EXEC,
66221+ PROT_READ | PROT_WRITE,
66222 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
66223 fd_offset + ex.a_text);
66224 if (error != N_DATADDR(ex))
66225diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
66226index 8081aba..bd60d68 100644
66227--- a/fs/binfmt_elf.c
66228+++ b/fs/binfmt_elf.c
66229@@ -34,6 +34,7 @@
66230 #include <linux/utsname.h>
66231 #include <linux/coredump.h>
66232 #include <linux/sched.h>
66233+#include <linux/xattr.h>
66234 #include <asm/uaccess.h>
66235 #include <asm/param.h>
66236 #include <asm/page.h>
66237@@ -47,7 +48,7 @@
66238
66239 static int load_elf_binary(struct linux_binprm *bprm);
66240 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
66241- int, int, unsigned long);
66242+ int, int, unsigned long) __intentional_overflow(-1);
66243
66244 #ifdef CONFIG_USELIB
66245 static int load_elf_library(struct file *);
66246@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
66247 #define elf_core_dump NULL
66248 #endif
66249
66250+#ifdef CONFIG_PAX_MPROTECT
66251+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
66252+#endif
66253+
66254+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66255+static void elf_handle_mmap(struct file *file);
66256+#endif
66257+
66258 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
66259 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
66260 #else
66261@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
66262 .load_binary = load_elf_binary,
66263 .load_shlib = load_elf_library,
66264 .core_dump = elf_core_dump,
66265+
66266+#ifdef CONFIG_PAX_MPROTECT
66267+ .handle_mprotect= elf_handle_mprotect,
66268+#endif
66269+
66270+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66271+ .handle_mmap = elf_handle_mmap,
66272+#endif
66273+
66274 .min_coredump = ELF_EXEC_PAGESIZE,
66275 };
66276
66277@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
66278
66279 static int set_brk(unsigned long start, unsigned long end)
66280 {
66281+ unsigned long e = end;
66282+
66283 start = ELF_PAGEALIGN(start);
66284 end = ELF_PAGEALIGN(end);
66285 if (end > start) {
66286@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
66287 if (BAD_ADDR(addr))
66288 return addr;
66289 }
66290- current->mm->start_brk = current->mm->brk = end;
66291+ current->mm->start_brk = current->mm->brk = e;
66292 return 0;
66293 }
66294
66295@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66296 elf_addr_t __user *u_rand_bytes;
66297 const char *k_platform = ELF_PLATFORM;
66298 const char *k_base_platform = ELF_BASE_PLATFORM;
66299- unsigned char k_rand_bytes[16];
66300+ u32 k_rand_bytes[4];
66301 int items;
66302 elf_addr_t *elf_info;
66303 int ei_index = 0;
66304 const struct cred *cred = current_cred();
66305 struct vm_area_struct *vma;
66306+ unsigned long saved_auxv[AT_VECTOR_SIZE];
66307
66308 /*
66309 * In some cases (e.g. Hyper-Threading), we want to avoid L1
66310@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66311 * Generate 16 random bytes for userspace PRNG seeding.
66312 */
66313 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
66314- u_rand_bytes = (elf_addr_t __user *)
66315- STACK_ALLOC(p, sizeof(k_rand_bytes));
66316+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
66317+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
66318+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
66319+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
66320+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
66321+ u_rand_bytes = (elf_addr_t __user *) p;
66322 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
66323 return -EFAULT;
66324
66325@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66326 return -EFAULT;
66327 current->mm->env_end = p;
66328
66329+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
66330+
66331 /* Put the elf_info on the stack in the right place. */
66332 sp = (elf_addr_t __user *)envp + 1;
66333- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
66334+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
66335 return -EFAULT;
66336 return 0;
66337 }
66338@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
66339 an ELF header */
66340
66341 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66342- struct file *interpreter, unsigned long *interp_map_addr,
66343+ struct file *interpreter,
66344 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
66345 {
66346 struct elf_phdr *eppnt;
66347- unsigned long load_addr = 0;
66348+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
66349 int load_addr_set = 0;
66350 unsigned long last_bss = 0, elf_bss = 0;
66351- unsigned long error = ~0UL;
66352+ unsigned long error = -EINVAL;
66353 unsigned long total_size;
66354 int i;
66355
66356@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66357 goto out;
66358 }
66359
66360+#ifdef CONFIG_PAX_SEGMEXEC
66361+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
66362+ pax_task_size = SEGMEXEC_TASK_SIZE;
66363+#endif
66364+
66365 eppnt = interp_elf_phdata;
66366 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
66367 if (eppnt->p_type == PT_LOAD) {
66368@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66369 map_addr = elf_map(interpreter, load_addr + vaddr,
66370 eppnt, elf_prot, elf_type, total_size);
66371 total_size = 0;
66372- if (!*interp_map_addr)
66373- *interp_map_addr = map_addr;
66374 error = map_addr;
66375 if (BAD_ADDR(map_addr))
66376 goto out;
66377@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66378 k = load_addr + eppnt->p_vaddr;
66379 if (BAD_ADDR(k) ||
66380 eppnt->p_filesz > eppnt->p_memsz ||
66381- eppnt->p_memsz > TASK_SIZE ||
66382- TASK_SIZE - eppnt->p_memsz < k) {
66383+ eppnt->p_memsz > pax_task_size ||
66384+ pax_task_size - eppnt->p_memsz < k) {
66385 error = -ENOMEM;
66386 goto out;
66387 }
66388@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66389 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
66390
66391 /* Map the last of the bss segment */
66392- error = vm_brk(elf_bss, last_bss - elf_bss);
66393- if (BAD_ADDR(error))
66394- goto out;
66395+ if (last_bss > elf_bss) {
66396+ error = vm_brk(elf_bss, last_bss - elf_bss);
66397+ if (BAD_ADDR(error))
66398+ goto out;
66399+ }
66400 }
66401
66402 error = load_addr;
66403@@ -634,6 +666,336 @@ out:
66404 return error;
66405 }
66406
66407+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66408+#ifdef CONFIG_PAX_SOFTMODE
66409+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
66410+{
66411+ unsigned long pax_flags = 0UL;
66412+
66413+#ifdef CONFIG_PAX_PAGEEXEC
66414+ if (elf_phdata->p_flags & PF_PAGEEXEC)
66415+ pax_flags |= MF_PAX_PAGEEXEC;
66416+#endif
66417+
66418+#ifdef CONFIG_PAX_SEGMEXEC
66419+ if (elf_phdata->p_flags & PF_SEGMEXEC)
66420+ pax_flags |= MF_PAX_SEGMEXEC;
66421+#endif
66422+
66423+#ifdef CONFIG_PAX_EMUTRAMP
66424+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66425+ pax_flags |= MF_PAX_EMUTRAMP;
66426+#endif
66427+
66428+#ifdef CONFIG_PAX_MPROTECT
66429+ if (elf_phdata->p_flags & PF_MPROTECT)
66430+ pax_flags |= MF_PAX_MPROTECT;
66431+#endif
66432+
66433+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66434+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
66435+ pax_flags |= MF_PAX_RANDMMAP;
66436+#endif
66437+
66438+ return pax_flags;
66439+}
66440+#endif
66441+
66442+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
66443+{
66444+ unsigned long pax_flags = 0UL;
66445+
66446+#ifdef CONFIG_PAX_PAGEEXEC
66447+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
66448+ pax_flags |= MF_PAX_PAGEEXEC;
66449+#endif
66450+
66451+#ifdef CONFIG_PAX_SEGMEXEC
66452+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
66453+ pax_flags |= MF_PAX_SEGMEXEC;
66454+#endif
66455+
66456+#ifdef CONFIG_PAX_EMUTRAMP
66457+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
66458+ pax_flags |= MF_PAX_EMUTRAMP;
66459+#endif
66460+
66461+#ifdef CONFIG_PAX_MPROTECT
66462+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
66463+ pax_flags |= MF_PAX_MPROTECT;
66464+#endif
66465+
66466+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66467+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
66468+ pax_flags |= MF_PAX_RANDMMAP;
66469+#endif
66470+
66471+ return pax_flags;
66472+}
66473+#endif
66474+
66475+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66476+#ifdef CONFIG_PAX_SOFTMODE
66477+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
66478+{
66479+ unsigned long pax_flags = 0UL;
66480+
66481+#ifdef CONFIG_PAX_PAGEEXEC
66482+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
66483+ pax_flags |= MF_PAX_PAGEEXEC;
66484+#endif
66485+
66486+#ifdef CONFIG_PAX_SEGMEXEC
66487+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
66488+ pax_flags |= MF_PAX_SEGMEXEC;
66489+#endif
66490+
66491+#ifdef CONFIG_PAX_EMUTRAMP
66492+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66493+ pax_flags |= MF_PAX_EMUTRAMP;
66494+#endif
66495+
66496+#ifdef CONFIG_PAX_MPROTECT
66497+ if (pax_flags_softmode & MF_PAX_MPROTECT)
66498+ pax_flags |= MF_PAX_MPROTECT;
66499+#endif
66500+
66501+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66502+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
66503+ pax_flags |= MF_PAX_RANDMMAP;
66504+#endif
66505+
66506+ return pax_flags;
66507+}
66508+#endif
66509+
66510+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
66511+{
66512+ unsigned long pax_flags = 0UL;
66513+
66514+#ifdef CONFIG_PAX_PAGEEXEC
66515+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
66516+ pax_flags |= MF_PAX_PAGEEXEC;
66517+#endif
66518+
66519+#ifdef CONFIG_PAX_SEGMEXEC
66520+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
66521+ pax_flags |= MF_PAX_SEGMEXEC;
66522+#endif
66523+
66524+#ifdef CONFIG_PAX_EMUTRAMP
66525+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
66526+ pax_flags |= MF_PAX_EMUTRAMP;
66527+#endif
66528+
66529+#ifdef CONFIG_PAX_MPROTECT
66530+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
66531+ pax_flags |= MF_PAX_MPROTECT;
66532+#endif
66533+
66534+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66535+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
66536+ pax_flags |= MF_PAX_RANDMMAP;
66537+#endif
66538+
66539+ return pax_flags;
66540+}
66541+#endif
66542+
66543+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66544+static unsigned long pax_parse_defaults(void)
66545+{
66546+ unsigned long pax_flags = 0UL;
66547+
66548+#ifdef CONFIG_PAX_SOFTMODE
66549+ if (pax_softmode)
66550+ return pax_flags;
66551+#endif
66552+
66553+#ifdef CONFIG_PAX_PAGEEXEC
66554+ pax_flags |= MF_PAX_PAGEEXEC;
66555+#endif
66556+
66557+#ifdef CONFIG_PAX_SEGMEXEC
66558+ pax_flags |= MF_PAX_SEGMEXEC;
66559+#endif
66560+
66561+#ifdef CONFIG_PAX_MPROTECT
66562+ pax_flags |= MF_PAX_MPROTECT;
66563+#endif
66564+
66565+#ifdef CONFIG_PAX_RANDMMAP
66566+ if (randomize_va_space)
66567+ pax_flags |= MF_PAX_RANDMMAP;
66568+#endif
66569+
66570+ return pax_flags;
66571+}
66572+
66573+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
66574+{
66575+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
66576+
66577+#ifdef CONFIG_PAX_EI_PAX
66578+
66579+#ifdef CONFIG_PAX_SOFTMODE
66580+ if (pax_softmode)
66581+ return pax_flags;
66582+#endif
66583+
66584+ pax_flags = 0UL;
66585+
66586+#ifdef CONFIG_PAX_PAGEEXEC
66587+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
66588+ pax_flags |= MF_PAX_PAGEEXEC;
66589+#endif
66590+
66591+#ifdef CONFIG_PAX_SEGMEXEC
66592+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
66593+ pax_flags |= MF_PAX_SEGMEXEC;
66594+#endif
66595+
66596+#ifdef CONFIG_PAX_EMUTRAMP
66597+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
66598+ pax_flags |= MF_PAX_EMUTRAMP;
66599+#endif
66600+
66601+#ifdef CONFIG_PAX_MPROTECT
66602+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
66603+ pax_flags |= MF_PAX_MPROTECT;
66604+#endif
66605+
66606+#ifdef CONFIG_PAX_ASLR
66607+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
66608+ pax_flags |= MF_PAX_RANDMMAP;
66609+#endif
66610+
66611+#endif
66612+
66613+ return pax_flags;
66614+
66615+}
66616+
66617+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
66618+{
66619+
66620+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66621+ unsigned long i;
66622+
66623+ for (i = 0UL; i < elf_ex->e_phnum; i++)
66624+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
66625+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
66626+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
66627+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
66628+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
66629+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
66630+ return PAX_PARSE_FLAGS_FALLBACK;
66631+
66632+#ifdef CONFIG_PAX_SOFTMODE
66633+ if (pax_softmode)
66634+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
66635+ else
66636+#endif
66637+
66638+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
66639+ break;
66640+ }
66641+#endif
66642+
66643+ return PAX_PARSE_FLAGS_FALLBACK;
66644+}
66645+
66646+static unsigned long pax_parse_xattr_pax(struct file * const file)
66647+{
66648+
66649+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66650+ ssize_t xattr_size, i;
66651+ unsigned char xattr_value[sizeof("pemrs") - 1];
66652+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
66653+
66654+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
66655+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
66656+ return PAX_PARSE_FLAGS_FALLBACK;
66657+
66658+ for (i = 0; i < xattr_size; i++)
66659+ switch (xattr_value[i]) {
66660+ default:
66661+ return PAX_PARSE_FLAGS_FALLBACK;
66662+
66663+#define parse_flag(option1, option2, flag) \
66664+ case option1: \
66665+ if (pax_flags_hardmode & MF_PAX_##flag) \
66666+ return PAX_PARSE_FLAGS_FALLBACK;\
66667+ pax_flags_hardmode |= MF_PAX_##flag; \
66668+ break; \
66669+ case option2: \
66670+ if (pax_flags_softmode & MF_PAX_##flag) \
66671+ return PAX_PARSE_FLAGS_FALLBACK;\
66672+ pax_flags_softmode |= MF_PAX_##flag; \
66673+ break;
66674+
66675+ parse_flag('p', 'P', PAGEEXEC);
66676+ parse_flag('e', 'E', EMUTRAMP);
66677+ parse_flag('m', 'M', MPROTECT);
66678+ parse_flag('r', 'R', RANDMMAP);
66679+ parse_flag('s', 'S', SEGMEXEC);
66680+
66681+#undef parse_flag
66682+ }
66683+
66684+ if (pax_flags_hardmode & pax_flags_softmode)
66685+ return PAX_PARSE_FLAGS_FALLBACK;
66686+
66687+#ifdef CONFIG_PAX_SOFTMODE
66688+ if (pax_softmode)
66689+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
66690+ else
66691+#endif
66692+
66693+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
66694+#else
66695+ return PAX_PARSE_FLAGS_FALLBACK;
66696+#endif
66697+
66698+}
66699+
66700+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
66701+{
66702+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
66703+
66704+ pax_flags = pax_parse_defaults();
66705+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
66706+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
66707+ xattr_pax_flags = pax_parse_xattr_pax(file);
66708+
66709+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66710+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66711+ pt_pax_flags != xattr_pax_flags)
66712+ return -EINVAL;
66713+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66714+ pax_flags = xattr_pax_flags;
66715+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66716+ pax_flags = pt_pax_flags;
66717+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66718+ pax_flags = ei_pax_flags;
66719+
66720+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
66721+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66722+ if ((__supported_pte_mask & _PAGE_NX))
66723+ pax_flags &= ~MF_PAX_SEGMEXEC;
66724+ else
66725+ pax_flags &= ~MF_PAX_PAGEEXEC;
66726+ }
66727+#endif
66728+
66729+ if (0 > pax_check_flags(&pax_flags))
66730+ return -EINVAL;
66731+
66732+ current->mm->pax_flags = pax_flags;
66733+ return 0;
66734+}
66735+#endif
66736+
66737 /*
66738 * These are the functions used to load ELF style executables and shared
66739 * libraries. There is no binary dependent code anywhere else.
66740@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
66741 {
66742 unsigned long random_variable = 0;
66743
66744+#ifdef CONFIG_PAX_RANDUSTACK
66745+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
66746+ return stack_top - current->mm->delta_stack;
66747+#endif
66748+
66749 if ((current->flags & PF_RANDOMIZE) &&
66750 !(current->personality & ADDR_NO_RANDOMIZE)) {
66751 random_variable = (unsigned long) get_random_int();
66752@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66753 unsigned long load_addr = 0, load_bias = 0;
66754 int load_addr_set = 0;
66755 char * elf_interpreter = NULL;
66756- unsigned long error;
66757+ unsigned long error = 0;
66758 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
66759 unsigned long elf_bss, elf_brk;
66760 int retval, i;
66761@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66762 struct elfhdr interp_elf_ex;
66763 } *loc;
66764 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
66765+ unsigned long pax_task_size;
66766
66767 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
66768 if (!loc) {
66769@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
66770 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
66771 may depend on the personality. */
66772 SET_PERSONALITY2(loc->elf_ex, &arch_state);
66773+
66774+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66775+ current->mm->pax_flags = 0UL;
66776+#endif
66777+
66778+#ifdef CONFIG_PAX_DLRESOLVE
66779+ current->mm->call_dl_resolve = 0UL;
66780+#endif
66781+
66782+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
66783+ current->mm->call_syscall = 0UL;
66784+#endif
66785+
66786+#ifdef CONFIG_PAX_ASLR
66787+ current->mm->delta_mmap = 0UL;
66788+ current->mm->delta_stack = 0UL;
66789+#endif
66790+
66791+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66792+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
66793+ send_sig(SIGKILL, current, 0);
66794+ goto out_free_dentry;
66795+ }
66796+#endif
66797+
66798+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
66799+ pax_set_initial_flags(bprm);
66800+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
66801+ if (pax_set_initial_flags_func)
66802+ (pax_set_initial_flags_func)(bprm);
66803+#endif
66804+
66805+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66806+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
66807+ current->mm->context.user_cs_limit = PAGE_SIZE;
66808+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
66809+ }
66810+#endif
66811+
66812+#ifdef CONFIG_PAX_SEGMEXEC
66813+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
66814+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
66815+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
66816+ pax_task_size = SEGMEXEC_TASK_SIZE;
66817+ current->mm->def_flags |= VM_NOHUGEPAGE;
66818+ } else
66819+#endif
66820+
66821+ pax_task_size = TASK_SIZE;
66822+
66823+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
66824+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66825+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
66826+ put_cpu();
66827+ }
66828+#endif
66829+
66830+#ifdef CONFIG_PAX_ASLR
66831+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66832+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
66833+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
66834+ }
66835+#endif
66836+
66837+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
66838+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66839+ executable_stack = EXSTACK_DISABLE_X;
66840+ current->personality &= ~READ_IMPLIES_EXEC;
66841+ } else
66842+#endif
66843+
66844 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
66845 current->personality |= READ_IMPLIES_EXEC;
66846
66847@@ -925,6 +1364,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
66848 #else
66849 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
66850 #endif
66851+
66852+#ifdef CONFIG_PAX_RANDMMAP
66853+ /* PaX: randomize base address at the default exe base if requested */
66854+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
66855+#ifdef CONFIG_SPARC64
66856+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
66857+#else
66858+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
66859+#endif
66860+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
66861+ elf_flags |= MAP_FIXED;
66862+ }
66863+#endif
66864+
66865 total_size = total_mapping_size(elf_phdata,
66866 loc->elf_ex.e_phnum);
66867 if (!total_size) {
66868@@ -962,9 +1415,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
66869 * allowed task size. Note that p_filesz must always be
66870 * <= p_memsz so it is only necessary to check p_memsz.
66871 */
66872- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
66873- elf_ppnt->p_memsz > TASK_SIZE ||
66874- TASK_SIZE - elf_ppnt->p_memsz < k) {
66875+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
66876+ elf_ppnt->p_memsz > pax_task_size ||
66877+ pax_task_size - elf_ppnt->p_memsz < k) {
66878 /* set_brk can never work. Avoid overflows. */
66879 retval = -EINVAL;
66880 goto out_free_dentry;
66881@@ -1000,16 +1453,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
66882 if (retval)
66883 goto out_free_dentry;
66884 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
66885- retval = -EFAULT; /* Nobody gets to see this, but.. */
66886- goto out_free_dentry;
66887+ /*
66888+ * This bss-zeroing can fail if the ELF
66889+ * file specifies odd protections. So
66890+ * we don't check the return value
66891+ */
66892 }
66893
66894+#ifdef CONFIG_PAX_RANDMMAP
66895+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66896+ unsigned long start, size, flags;
66897+ vm_flags_t vm_flags;
66898+
66899+ start = ELF_PAGEALIGN(elf_brk);
66900+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
66901+ flags = MAP_FIXED | MAP_PRIVATE;
66902+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
66903+
66904+ down_write(&current->mm->mmap_sem);
66905+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
66906+ retval = -ENOMEM;
66907+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
66908+// if (current->personality & ADDR_NO_RANDOMIZE)
66909+// vm_flags |= VM_READ | VM_MAYREAD;
66910+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
66911+ retval = IS_ERR_VALUE(start) ? start : 0;
66912+ }
66913+ up_write(&current->mm->mmap_sem);
66914+ if (retval == 0)
66915+ retval = set_brk(start + size, start + size + PAGE_SIZE);
66916+ if (retval < 0)
66917+ goto out_free_dentry;
66918+ }
66919+#endif
66920+
66921 if (elf_interpreter) {
66922- unsigned long interp_map_addr = 0;
66923-
66924 elf_entry = load_elf_interp(&loc->interp_elf_ex,
66925 interpreter,
66926- &interp_map_addr,
66927 load_bias, interp_elf_phdata);
66928 if (!IS_ERR((void *)elf_entry)) {
66929 /*
66930@@ -1237,7 +1717,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
66931 * Decide what to dump of a segment, part, all or none.
66932 */
66933 static unsigned long vma_dump_size(struct vm_area_struct *vma,
66934- unsigned long mm_flags)
66935+ unsigned long mm_flags, long signr)
66936 {
66937 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
66938
66939@@ -1275,7 +1755,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
66940 if (vma->vm_file == NULL)
66941 return 0;
66942
66943- if (FILTER(MAPPED_PRIVATE))
66944+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
66945 goto whole;
66946
66947 /*
66948@@ -1482,9 +1962,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
66949 {
66950 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
66951 int i = 0;
66952- do
66953+ do {
66954 i += 2;
66955- while (auxv[i - 2] != AT_NULL);
66956+ } while (auxv[i - 2] != AT_NULL);
66957 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
66958 }
66959
66960@@ -1493,7 +1973,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
66961 {
66962 mm_segment_t old_fs = get_fs();
66963 set_fs(KERNEL_DS);
66964- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
66965+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
66966 set_fs(old_fs);
66967 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
66968 }
66969@@ -2213,7 +2693,7 @@ static int elf_core_dump(struct coredump_params *cprm)
66970 vma = next_vma(vma, gate_vma)) {
66971 unsigned long dump_size;
66972
66973- dump_size = vma_dump_size(vma, cprm->mm_flags);
66974+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
66975 vma_filesz[i++] = dump_size;
66976 vma_data_size += dump_size;
66977 }
66978@@ -2321,6 +2801,167 @@ out:
66979
66980 #endif /* CONFIG_ELF_CORE */
66981
66982+#ifdef CONFIG_PAX_MPROTECT
66983+/* PaX: non-PIC ELF libraries need relocations on their executable segments
66984+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
66985+ * we'll remove VM_MAYWRITE for good on RELRO segments.
66986+ *
66987+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
66988+ * basis because we want to allow the common case and not the special ones.
66989+ */
66990+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
66991+{
66992+ struct elfhdr elf_h;
66993+ struct elf_phdr elf_p;
66994+ unsigned long i;
66995+ unsigned long oldflags;
66996+ bool is_textrel_rw, is_textrel_rx, is_relro;
66997+
66998+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
66999+ return;
67000+
67001+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
67002+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
67003+
67004+#ifdef CONFIG_PAX_ELFRELOCS
67005+ /* possible TEXTREL */
67006+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
67007+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
67008+#else
67009+ is_textrel_rw = false;
67010+ is_textrel_rx = false;
67011+#endif
67012+
67013+ /* possible RELRO */
67014+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
67015+
67016+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
67017+ return;
67018+
67019+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67020+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67021+
67022+#ifdef CONFIG_PAX_ETEXECRELOCS
67023+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67024+#else
67025+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
67026+#endif
67027+
67028+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67029+ !elf_check_arch(&elf_h) ||
67030+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67031+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67032+ return;
67033+
67034+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67035+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67036+ return;
67037+ switch (elf_p.p_type) {
67038+ case PT_DYNAMIC:
67039+ if (!is_textrel_rw && !is_textrel_rx)
67040+ continue;
67041+ i = 0UL;
67042+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
67043+ elf_dyn dyn;
67044+
67045+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
67046+ break;
67047+ if (dyn.d_tag == DT_NULL)
67048+ break;
67049+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
67050+ gr_log_textrel(vma);
67051+ if (is_textrel_rw)
67052+ vma->vm_flags |= VM_MAYWRITE;
67053+ else
67054+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
67055+ vma->vm_flags &= ~VM_MAYWRITE;
67056+ break;
67057+ }
67058+ i++;
67059+ }
67060+ is_textrel_rw = false;
67061+ is_textrel_rx = false;
67062+ continue;
67063+
67064+ case PT_GNU_RELRO:
67065+ if (!is_relro)
67066+ continue;
67067+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
67068+ vma->vm_flags &= ~VM_MAYWRITE;
67069+ is_relro = false;
67070+ continue;
67071+
67072+#ifdef CONFIG_PAX_PT_PAX_FLAGS
67073+ case PT_PAX_FLAGS: {
67074+ const char *msg_mprotect = "", *msg_emutramp = "";
67075+ char *buffer_lib, *buffer_exe;
67076+
67077+ if (elf_p.p_flags & PF_NOMPROTECT)
67078+ msg_mprotect = "MPROTECT disabled";
67079+
67080+#ifdef CONFIG_PAX_EMUTRAMP
67081+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
67082+ msg_emutramp = "EMUTRAMP enabled";
67083+#endif
67084+
67085+ if (!msg_mprotect[0] && !msg_emutramp[0])
67086+ continue;
67087+
67088+ if (!printk_ratelimit())
67089+ continue;
67090+
67091+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
67092+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
67093+ if (buffer_lib && buffer_exe) {
67094+ char *path_lib, *path_exe;
67095+
67096+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
67097+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
67098+
67099+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
67100+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
67101+
67102+ }
67103+ free_page((unsigned long)buffer_exe);
67104+ free_page((unsigned long)buffer_lib);
67105+ continue;
67106+ }
67107+#endif
67108+
67109+ }
67110+ }
67111+}
67112+#endif
67113+
67114+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
67115+
67116+extern int grsec_enable_log_rwxmaps;
67117+
67118+static void elf_handle_mmap(struct file *file)
67119+{
67120+ struct elfhdr elf_h;
67121+ struct elf_phdr elf_p;
67122+ unsigned long i;
67123+
67124+ if (!grsec_enable_log_rwxmaps)
67125+ return;
67126+
67127+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67128+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67129+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
67130+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67131+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67132+ return;
67133+
67134+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67135+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67136+ return;
67137+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
67138+ gr_log_ptgnustack(file);
67139+ }
67140+}
67141+#endif
67142+
67143 static int __init init_elf_binfmt(void)
67144 {
67145 register_binfmt(&elf_format);
67146diff --git a/fs/block_dev.c b/fs/block_dev.c
67147index 975266b..c3d1856 100644
67148--- a/fs/block_dev.c
67149+++ b/fs/block_dev.c
67150@@ -734,7 +734,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
67151 else if (bdev->bd_contains == bdev)
67152 return true; /* is a whole device which isn't held */
67153
67154- else if (whole->bd_holder == bd_may_claim)
67155+ else if (whole->bd_holder == (void *)bd_may_claim)
67156 return true; /* is a partition of a device that is being partitioned */
67157 else if (whole->bd_holder != NULL)
67158 return false; /* is a partition of a held device */
67159diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
67160index 6d67f32..8f33187 100644
67161--- a/fs/btrfs/ctree.c
67162+++ b/fs/btrfs/ctree.c
67163@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
67164 free_extent_buffer(buf);
67165 add_root_to_dirty_list(root);
67166 } else {
67167- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
67168- parent_start = parent->start;
67169- else
67170+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
67171+ if (parent)
67172+ parent_start = parent->start;
67173+ else
67174+ parent_start = 0;
67175+ } else
67176 parent_start = 0;
67177
67178 WARN_ON(trans->transid != btrfs_header_generation(parent));
67179diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
67180index 82f0c7c..dff78a8 100644
67181--- a/fs/btrfs/delayed-inode.c
67182+++ b/fs/btrfs/delayed-inode.c
67183@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
67184
67185 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
67186 {
67187- int seq = atomic_inc_return(&delayed_root->items_seq);
67188+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
67189 if ((atomic_dec_return(&delayed_root->items) <
67190 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
67191 waitqueue_active(&delayed_root->wait))
67192@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
67193
67194 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
67195 {
67196- int val = atomic_read(&delayed_root->items_seq);
67197+ int val = atomic_read_unchecked(&delayed_root->items_seq);
67198
67199 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
67200 return 1;
67201@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
67202 int seq;
67203 int ret;
67204
67205- seq = atomic_read(&delayed_root->items_seq);
67206+ seq = atomic_read_unchecked(&delayed_root->items_seq);
67207
67208 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
67209 if (ret)
67210diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
67211index f70119f..ab5894d 100644
67212--- a/fs/btrfs/delayed-inode.h
67213+++ b/fs/btrfs/delayed-inode.h
67214@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
67215 */
67216 struct list_head prepare_list;
67217 atomic_t items; /* for delayed items */
67218- atomic_t items_seq; /* for delayed items */
67219+ atomic_unchecked_t items_seq; /* for delayed items */
67220 int nodes; /* for delayed nodes */
67221 wait_queue_head_t wait;
67222 };
67223@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
67224 struct btrfs_delayed_root *delayed_root)
67225 {
67226 atomic_set(&delayed_root->items, 0);
67227- atomic_set(&delayed_root->items_seq, 0);
67228+ atomic_set_unchecked(&delayed_root->items_seq, 0);
67229 delayed_root->nodes = 0;
67230 spin_lock_init(&delayed_root->lock);
67231 init_waitqueue_head(&delayed_root->wait);
67232diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
67233index 05fef19..f3774b8 100644
67234--- a/fs/btrfs/super.c
67235+++ b/fs/btrfs/super.c
67236@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
67237 function, line, errstr);
67238 return;
67239 }
67240- ACCESS_ONCE(trans->transaction->aborted) = errno;
67241+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
67242 /* Wake up anybody who may be waiting on this transaction */
67243 wake_up(&root->fs_info->transaction_wait);
67244 wake_up(&root->fs_info->transaction_blocked_wait);
67245diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
67246index 94edb0a..e94dc93 100644
67247--- a/fs/btrfs/sysfs.c
67248+++ b/fs/btrfs/sysfs.c
67249@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
67250 for (set = 0; set < FEAT_MAX; set++) {
67251 int i;
67252 struct attribute *attrs[2];
67253- struct attribute_group agroup = {
67254+ attribute_group_no_const agroup = {
67255 .name = "features",
67256 .attrs = attrs,
67257 };
67258diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
67259index 2299bfd..4098e72 100644
67260--- a/fs/btrfs/tests/free-space-tests.c
67261+++ b/fs/btrfs/tests/free-space-tests.c
67262@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67263 * extent entry.
67264 */
67265 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
67266- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67267+ pax_open_kernel();
67268+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67269+ pax_close_kernel();
67270
67271 /*
67272 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
67273@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67274 if (ret)
67275 return ret;
67276
67277- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67278+ pax_open_kernel();
67279+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67280+ pax_close_kernel();
67281 __btrfs_remove_free_space_cache(cache->free_space_ctl);
67282
67283 return 0;
67284diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
67285index 154990c..d0cf699 100644
67286--- a/fs/btrfs/tree-log.h
67287+++ b/fs/btrfs/tree-log.h
67288@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
67289 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
67290 struct btrfs_trans_handle *trans)
67291 {
67292- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
67293+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
67294 }
67295
67296 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
67297diff --git a/fs/buffer.c b/fs/buffer.c
67298index 20805db..2e8fc69 100644
67299--- a/fs/buffer.c
67300+++ b/fs/buffer.c
67301@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
67302 bh_cachep = kmem_cache_create("buffer_head",
67303 sizeof(struct buffer_head), 0,
67304 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
67305- SLAB_MEM_SPREAD),
67306+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
67307 NULL);
67308
67309 /*
67310diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
67311index fbb08e9..0fda764 100644
67312--- a/fs/cachefiles/bind.c
67313+++ b/fs/cachefiles/bind.c
67314@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
67315 args);
67316
67317 /* start by checking things over */
67318- ASSERT(cache->fstop_percent >= 0 &&
67319- cache->fstop_percent < cache->fcull_percent &&
67320+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
67321 cache->fcull_percent < cache->frun_percent &&
67322 cache->frun_percent < 100);
67323
67324- ASSERT(cache->bstop_percent >= 0 &&
67325- cache->bstop_percent < cache->bcull_percent &&
67326+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
67327 cache->bcull_percent < cache->brun_percent &&
67328 cache->brun_percent < 100);
67329
67330diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
67331index f601def..b2cf704 100644
67332--- a/fs/cachefiles/daemon.c
67333+++ b/fs/cachefiles/daemon.c
67334@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
67335 if (n > buflen)
67336 return -EMSGSIZE;
67337
67338- if (copy_to_user(_buffer, buffer, n) != 0)
67339+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
67340 return -EFAULT;
67341
67342 return n;
67343@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
67344 if (test_bit(CACHEFILES_DEAD, &cache->flags))
67345 return -EIO;
67346
67347- if (datalen < 0 || datalen > PAGE_SIZE - 1)
67348+ if (datalen > PAGE_SIZE - 1)
67349 return -EOPNOTSUPP;
67350
67351 /* drag the command string into the kernel so we can parse it */
67352@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
67353 if (args[0] != '%' || args[1] != '\0')
67354 return -EINVAL;
67355
67356- if (fstop < 0 || fstop >= cache->fcull_percent)
67357+ if (fstop >= cache->fcull_percent)
67358 return cachefiles_daemon_range_error(cache, args);
67359
67360 cache->fstop_percent = fstop;
67361@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
67362 if (args[0] != '%' || args[1] != '\0')
67363 return -EINVAL;
67364
67365- if (bstop < 0 || bstop >= cache->bcull_percent)
67366+ if (bstop >= cache->bcull_percent)
67367 return cachefiles_daemon_range_error(cache, args);
67368
67369 cache->bstop_percent = bstop;
67370diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
67371index 8c52472..c4e3a69 100644
67372--- a/fs/cachefiles/internal.h
67373+++ b/fs/cachefiles/internal.h
67374@@ -66,7 +66,7 @@ struct cachefiles_cache {
67375 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
67376 struct rb_root active_nodes; /* active nodes (can't be culled) */
67377 rwlock_t active_lock; /* lock for active_nodes */
67378- atomic_t gravecounter; /* graveyard uniquifier */
67379+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
67380 unsigned frun_percent; /* when to stop culling (% files) */
67381 unsigned fcull_percent; /* when to start culling (% files) */
67382 unsigned fstop_percent; /* when to stop allocating (% files) */
67383@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
67384 * proc.c
67385 */
67386 #ifdef CONFIG_CACHEFILES_HISTOGRAM
67387-extern atomic_t cachefiles_lookup_histogram[HZ];
67388-extern atomic_t cachefiles_mkdir_histogram[HZ];
67389-extern atomic_t cachefiles_create_histogram[HZ];
67390+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67391+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67392+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
67393
67394 extern int __init cachefiles_proc_init(void);
67395 extern void cachefiles_proc_cleanup(void);
67396 static inline
67397-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
67398+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
67399 {
67400 unsigned long jif = jiffies - start_jif;
67401 if (jif >= HZ)
67402 jif = HZ - 1;
67403- atomic_inc(&histogram[jif]);
67404+ atomic_inc_unchecked(&histogram[jif]);
67405 }
67406
67407 #else
67408diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
67409index 1e51714..411eded 100644
67410--- a/fs/cachefiles/namei.c
67411+++ b/fs/cachefiles/namei.c
67412@@ -309,7 +309,7 @@ try_again:
67413 /* first step is to make up a grave dentry in the graveyard */
67414 sprintf(nbuffer, "%08x%08x",
67415 (uint32_t) get_seconds(),
67416- (uint32_t) atomic_inc_return(&cache->gravecounter));
67417+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
67418
67419 /* do the multiway lock magic */
67420 trap = lock_rename(cache->graveyard, dir);
67421diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
67422index eccd339..4c1d995 100644
67423--- a/fs/cachefiles/proc.c
67424+++ b/fs/cachefiles/proc.c
67425@@ -14,9 +14,9 @@
67426 #include <linux/seq_file.h>
67427 #include "internal.h"
67428
67429-atomic_t cachefiles_lookup_histogram[HZ];
67430-atomic_t cachefiles_mkdir_histogram[HZ];
67431-atomic_t cachefiles_create_histogram[HZ];
67432+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67433+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67434+atomic_unchecked_t cachefiles_create_histogram[HZ];
67435
67436 /*
67437 * display the latency histogram
67438@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
67439 return 0;
67440 default:
67441 index = (unsigned long) v - 3;
67442- x = atomic_read(&cachefiles_lookup_histogram[index]);
67443- y = atomic_read(&cachefiles_mkdir_histogram[index]);
67444- z = atomic_read(&cachefiles_create_histogram[index]);
67445+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
67446+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
67447+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
67448 if (x == 0 && y == 0 && z == 0)
67449 return 0;
67450
67451diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
67452index 83e9976..bfd1eee 100644
67453--- a/fs/ceph/dir.c
67454+++ b/fs/ceph/dir.c
67455@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
67456 struct dentry *dentry, *last;
67457 struct ceph_dentry_info *di;
67458 int err = 0;
67459+ char d_name[DNAME_INLINE_LEN];
67460+ const unsigned char *name;
67461
67462 /* claim ref on last dentry we returned */
67463 last = fi->dentry;
67464@@ -190,7 +192,12 @@ more:
67465
67466 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
67467 dentry, dentry, dentry->d_inode);
67468- if (!dir_emit(ctx, dentry->d_name.name,
67469+ name = dentry->d_name.name;
67470+ if (name == dentry->d_iname) {
67471+ memcpy(d_name, name, dentry->d_name.len);
67472+ name = d_name;
67473+ }
67474+ if (!dir_emit(ctx, name,
67475 dentry->d_name.len,
67476 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
67477 dentry->d_inode->i_mode >> 12)) {
67478@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
67479 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
67480 struct ceph_mds_client *mdsc = fsc->mdsc;
67481 unsigned frag = fpos_frag(ctx->pos);
67482- int off = fpos_off(ctx->pos);
67483+ unsigned int off = fpos_off(ctx->pos);
67484 int err;
67485 u32 ftype;
67486 struct ceph_mds_reply_info_parsed *rinfo;
67487diff --git a/fs/ceph/super.c b/fs/ceph/super.c
67488index a63997b..ddc0577 100644
67489--- a/fs/ceph/super.c
67490+++ b/fs/ceph/super.c
67491@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
67492 /*
67493 * construct our own bdi so we can control readahead, etc.
67494 */
67495-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
67496+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
67497
67498 static int ceph_register_bdi(struct super_block *sb,
67499 struct ceph_fs_client *fsc)
67500@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
67501 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
67502
67503 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
67504- atomic_long_inc_return(&bdi_seq));
67505+ atomic_long_inc_return_unchecked(&bdi_seq));
67506 if (!err)
67507 sb->s_bdi = &fsc->backing_dev_info;
67508 return err;
67509diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
67510index 7febcf2..62a5721 100644
67511--- a/fs/cifs/cifs_debug.c
67512+++ b/fs/cifs/cifs_debug.c
67513@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67514
67515 if (strtobool(&c, &bv) == 0) {
67516 #ifdef CONFIG_CIFS_STATS2
67517- atomic_set(&totBufAllocCount, 0);
67518- atomic_set(&totSmBufAllocCount, 0);
67519+ atomic_set_unchecked(&totBufAllocCount, 0);
67520+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67521 #endif /* CONFIG_CIFS_STATS2 */
67522 spin_lock(&cifs_tcp_ses_lock);
67523 list_for_each(tmp1, &cifs_tcp_ses_list) {
67524@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67525 tcon = list_entry(tmp3,
67526 struct cifs_tcon,
67527 tcon_list);
67528- atomic_set(&tcon->num_smbs_sent, 0);
67529+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
67530 if (server->ops->clear_stats)
67531 server->ops->clear_stats(tcon);
67532 }
67533@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67534 smBufAllocCount.counter, cifs_min_small);
67535 #ifdef CONFIG_CIFS_STATS2
67536 seq_printf(m, "Total Large %d Small %d Allocations\n",
67537- atomic_read(&totBufAllocCount),
67538- atomic_read(&totSmBufAllocCount));
67539+ atomic_read_unchecked(&totBufAllocCount),
67540+ atomic_read_unchecked(&totSmBufAllocCount));
67541 #endif /* CONFIG_CIFS_STATS2 */
67542
67543 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
67544@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67545 if (tcon->need_reconnect)
67546 seq_puts(m, "\tDISCONNECTED ");
67547 seq_printf(m, "\nSMBs: %d",
67548- atomic_read(&tcon->num_smbs_sent));
67549+ atomic_read_unchecked(&tcon->num_smbs_sent));
67550 if (server->ops->print_stats)
67551 server->ops->print_stats(m, tcon);
67552 }
67553diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
67554index d72fe37..ded5511 100644
67555--- a/fs/cifs/cifsfs.c
67556+++ b/fs/cifs/cifsfs.c
67557@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
67558 */
67559 cifs_req_cachep = kmem_cache_create("cifs_request",
67560 CIFSMaxBufSize + max_hdr_size, 0,
67561- SLAB_HWCACHE_ALIGN, NULL);
67562+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
67563 if (cifs_req_cachep == NULL)
67564 return -ENOMEM;
67565
67566@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
67567 efficient to alloc 1 per page off the slab compared to 17K (5page)
67568 alloc of large cifs buffers even when page debugging is on */
67569 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
67570- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
67571+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
67572 NULL);
67573 if (cifs_sm_req_cachep == NULL) {
67574 mempool_destroy(cifs_req_poolp);
67575@@ -1204,8 +1204,8 @@ init_cifs(void)
67576 atomic_set(&bufAllocCount, 0);
67577 atomic_set(&smBufAllocCount, 0);
67578 #ifdef CONFIG_CIFS_STATS2
67579- atomic_set(&totBufAllocCount, 0);
67580- atomic_set(&totSmBufAllocCount, 0);
67581+ atomic_set_unchecked(&totBufAllocCount, 0);
67582+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67583 #endif /* CONFIG_CIFS_STATS2 */
67584
67585 atomic_set(&midCount, 0);
67586diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
67587index 22b289a..bbbba082 100644
67588--- a/fs/cifs/cifsglob.h
67589+++ b/fs/cifs/cifsglob.h
67590@@ -823,35 +823,35 @@ struct cifs_tcon {
67591 __u16 Flags; /* optional support bits */
67592 enum statusEnum tidStatus;
67593 #ifdef CONFIG_CIFS_STATS
67594- atomic_t num_smbs_sent;
67595+ atomic_unchecked_t num_smbs_sent;
67596 union {
67597 struct {
67598- atomic_t num_writes;
67599- atomic_t num_reads;
67600- atomic_t num_flushes;
67601- atomic_t num_oplock_brks;
67602- atomic_t num_opens;
67603- atomic_t num_closes;
67604- atomic_t num_deletes;
67605- atomic_t num_mkdirs;
67606- atomic_t num_posixopens;
67607- atomic_t num_posixmkdirs;
67608- atomic_t num_rmdirs;
67609- atomic_t num_renames;
67610- atomic_t num_t2renames;
67611- atomic_t num_ffirst;
67612- atomic_t num_fnext;
67613- atomic_t num_fclose;
67614- atomic_t num_hardlinks;
67615- atomic_t num_symlinks;
67616- atomic_t num_locks;
67617- atomic_t num_acl_get;
67618- atomic_t num_acl_set;
67619+ atomic_unchecked_t num_writes;
67620+ atomic_unchecked_t num_reads;
67621+ atomic_unchecked_t num_flushes;
67622+ atomic_unchecked_t num_oplock_brks;
67623+ atomic_unchecked_t num_opens;
67624+ atomic_unchecked_t num_closes;
67625+ atomic_unchecked_t num_deletes;
67626+ atomic_unchecked_t num_mkdirs;
67627+ atomic_unchecked_t num_posixopens;
67628+ atomic_unchecked_t num_posixmkdirs;
67629+ atomic_unchecked_t num_rmdirs;
67630+ atomic_unchecked_t num_renames;
67631+ atomic_unchecked_t num_t2renames;
67632+ atomic_unchecked_t num_ffirst;
67633+ atomic_unchecked_t num_fnext;
67634+ atomic_unchecked_t num_fclose;
67635+ atomic_unchecked_t num_hardlinks;
67636+ atomic_unchecked_t num_symlinks;
67637+ atomic_unchecked_t num_locks;
67638+ atomic_unchecked_t num_acl_get;
67639+ atomic_unchecked_t num_acl_set;
67640 } cifs_stats;
67641 #ifdef CONFIG_CIFS_SMB2
67642 struct {
67643- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67644- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67645+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67646+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67647 } smb2_stats;
67648 #endif /* CONFIG_CIFS_SMB2 */
67649 } stats;
67650@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
67651 }
67652
67653 #ifdef CONFIG_CIFS_STATS
67654-#define cifs_stats_inc atomic_inc
67655+#define cifs_stats_inc atomic_inc_unchecked
67656
67657 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
67658 unsigned int bytes)
67659@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
67660 /* Various Debug counters */
67661 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
67662 #ifdef CONFIG_CIFS_STATS2
67663-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
67664-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
67665+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
67666+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
67667 #endif
67668 GLOBAL_EXTERN atomic_t smBufAllocCount;
67669 GLOBAL_EXTERN atomic_t midCount;
67670diff --git a/fs/cifs/file.c b/fs/cifs/file.c
67671index ca30c39..570fb94 100644
67672--- a/fs/cifs/file.c
67673+++ b/fs/cifs/file.c
67674@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
67675 index = mapping->writeback_index; /* Start from prev offset */
67676 end = -1;
67677 } else {
67678- index = wbc->range_start >> PAGE_CACHE_SHIFT;
67679- end = wbc->range_end >> PAGE_CACHE_SHIFT;
67680- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
67681+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
67682 range_whole = true;
67683+ index = 0;
67684+ end = ULONG_MAX;
67685+ } else {
67686+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
67687+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
67688+ }
67689 scanned = true;
67690 }
67691 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
67692diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
67693index 3379463..3af418a 100644
67694--- a/fs/cifs/misc.c
67695+++ b/fs/cifs/misc.c
67696@@ -170,7 +170,7 @@ cifs_buf_get(void)
67697 memset(ret_buf, 0, buf_size + 3);
67698 atomic_inc(&bufAllocCount);
67699 #ifdef CONFIG_CIFS_STATS2
67700- atomic_inc(&totBufAllocCount);
67701+ atomic_inc_unchecked(&totBufAllocCount);
67702 #endif /* CONFIG_CIFS_STATS2 */
67703 }
67704
67705@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
67706 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
67707 atomic_inc(&smBufAllocCount);
67708 #ifdef CONFIG_CIFS_STATS2
67709- atomic_inc(&totSmBufAllocCount);
67710+ atomic_inc_unchecked(&totSmBufAllocCount);
67711 #endif /* CONFIG_CIFS_STATS2 */
67712
67713 }
67714diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
67715index d297903..1cb7516 100644
67716--- a/fs/cifs/smb1ops.c
67717+++ b/fs/cifs/smb1ops.c
67718@@ -622,27 +622,27 @@ static void
67719 cifs_clear_stats(struct cifs_tcon *tcon)
67720 {
67721 #ifdef CONFIG_CIFS_STATS
67722- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
67723- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
67724- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
67725- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67726- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
67727- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
67728- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67729- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
67730- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
67731- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
67732- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
67733- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
67734- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
67735- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
67736- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
67737- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
67738- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
67739- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
67740- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
67741- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
67742- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
67743+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
67744+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
67745+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
67746+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67747+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
67748+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
67749+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67750+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
67751+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
67752+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
67753+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
67754+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
67755+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
67756+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
67757+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
67758+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
67759+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
67760+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
67761+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
67762+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
67763+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
67764 #endif
67765 }
67766
67767@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67768 {
67769 #ifdef CONFIG_CIFS_STATS
67770 seq_printf(m, " Oplocks breaks: %d",
67771- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
67772+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
67773 seq_printf(m, "\nReads: %d Bytes: %llu",
67774- atomic_read(&tcon->stats.cifs_stats.num_reads),
67775+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
67776 (long long)(tcon->bytes_read));
67777 seq_printf(m, "\nWrites: %d Bytes: %llu",
67778- atomic_read(&tcon->stats.cifs_stats.num_writes),
67779+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
67780 (long long)(tcon->bytes_written));
67781 seq_printf(m, "\nFlushes: %d",
67782- atomic_read(&tcon->stats.cifs_stats.num_flushes));
67783+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
67784 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
67785- atomic_read(&tcon->stats.cifs_stats.num_locks),
67786- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
67787- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
67788+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
67789+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
67790+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
67791 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
67792- atomic_read(&tcon->stats.cifs_stats.num_opens),
67793- atomic_read(&tcon->stats.cifs_stats.num_closes),
67794- atomic_read(&tcon->stats.cifs_stats.num_deletes));
67795+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
67796+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
67797+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
67798 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
67799- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
67800- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
67801+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
67802+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
67803 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
67804- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
67805- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
67806+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
67807+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
67808 seq_printf(m, "\nRenames: %d T2 Renames %d",
67809- atomic_read(&tcon->stats.cifs_stats.num_renames),
67810- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
67811+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
67812+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
67813 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
67814- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
67815- atomic_read(&tcon->stats.cifs_stats.num_fnext),
67816- atomic_read(&tcon->stats.cifs_stats.num_fclose));
67817+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
67818+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
67819+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
67820 #endif
67821 }
67822
67823diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
67824index eab05e1..ffe5ea4 100644
67825--- a/fs/cifs/smb2ops.c
67826+++ b/fs/cifs/smb2ops.c
67827@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
67828 #ifdef CONFIG_CIFS_STATS
67829 int i;
67830 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
67831- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67832- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67833+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67834+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67835 }
67836 #endif
67837 }
67838@@ -459,65 +459,65 @@ static void
67839 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67840 {
67841 #ifdef CONFIG_CIFS_STATS
67842- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67843- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67844+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67845+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67846 seq_printf(m, "\nNegotiates: %d sent %d failed",
67847- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
67848- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
67849+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
67850+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
67851 seq_printf(m, "\nSessionSetups: %d sent %d failed",
67852- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
67853- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
67854+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
67855+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
67856 seq_printf(m, "\nLogoffs: %d sent %d failed",
67857- atomic_read(&sent[SMB2_LOGOFF_HE]),
67858- atomic_read(&failed[SMB2_LOGOFF_HE]));
67859+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
67860+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
67861 seq_printf(m, "\nTreeConnects: %d sent %d failed",
67862- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
67863- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
67864+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
67865+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
67866 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
67867- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
67868- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
67869+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
67870+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
67871 seq_printf(m, "\nCreates: %d sent %d failed",
67872- atomic_read(&sent[SMB2_CREATE_HE]),
67873- atomic_read(&failed[SMB2_CREATE_HE]));
67874+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
67875+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
67876 seq_printf(m, "\nCloses: %d sent %d failed",
67877- atomic_read(&sent[SMB2_CLOSE_HE]),
67878- atomic_read(&failed[SMB2_CLOSE_HE]));
67879+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
67880+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
67881 seq_printf(m, "\nFlushes: %d sent %d failed",
67882- atomic_read(&sent[SMB2_FLUSH_HE]),
67883- atomic_read(&failed[SMB2_FLUSH_HE]));
67884+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
67885+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
67886 seq_printf(m, "\nReads: %d sent %d failed",
67887- atomic_read(&sent[SMB2_READ_HE]),
67888- atomic_read(&failed[SMB2_READ_HE]));
67889+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
67890+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
67891 seq_printf(m, "\nWrites: %d sent %d failed",
67892- atomic_read(&sent[SMB2_WRITE_HE]),
67893- atomic_read(&failed[SMB2_WRITE_HE]));
67894+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
67895+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
67896 seq_printf(m, "\nLocks: %d sent %d failed",
67897- atomic_read(&sent[SMB2_LOCK_HE]),
67898- atomic_read(&failed[SMB2_LOCK_HE]));
67899+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
67900+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
67901 seq_printf(m, "\nIOCTLs: %d sent %d failed",
67902- atomic_read(&sent[SMB2_IOCTL_HE]),
67903- atomic_read(&failed[SMB2_IOCTL_HE]));
67904+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
67905+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
67906 seq_printf(m, "\nCancels: %d sent %d failed",
67907- atomic_read(&sent[SMB2_CANCEL_HE]),
67908- atomic_read(&failed[SMB2_CANCEL_HE]));
67909+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
67910+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
67911 seq_printf(m, "\nEchos: %d sent %d failed",
67912- atomic_read(&sent[SMB2_ECHO_HE]),
67913- atomic_read(&failed[SMB2_ECHO_HE]));
67914+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
67915+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
67916 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
67917- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
67918- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
67919+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
67920+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
67921 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
67922- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
67923- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
67924+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
67925+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
67926 seq_printf(m, "\nQueryInfos: %d sent %d failed",
67927- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
67928- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
67929+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
67930+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
67931 seq_printf(m, "\nSetInfos: %d sent %d failed",
67932- atomic_read(&sent[SMB2_SET_INFO_HE]),
67933- atomic_read(&failed[SMB2_SET_INFO_HE]));
67934+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
67935+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
67936 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
67937- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
67938- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
67939+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
67940+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
67941 #endif
67942 }
67943
67944diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
67945index 65cd7a8..3518676 100644
67946--- a/fs/cifs/smb2pdu.c
67947+++ b/fs/cifs/smb2pdu.c
67948@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
67949 default:
67950 cifs_dbg(VFS, "info level %u isn't supported\n",
67951 srch_inf->info_level);
67952- rc = -EINVAL;
67953- goto qdir_exit;
67954+ return -EINVAL;
67955 }
67956
67957 req->FileIndex = cpu_to_le32(index);
67958diff --git a/fs/coda/cache.c b/fs/coda/cache.c
67959index 46ee6f2..89a9e7f 100644
67960--- a/fs/coda/cache.c
67961+++ b/fs/coda/cache.c
67962@@ -24,7 +24,7 @@
67963 #include "coda_linux.h"
67964 #include "coda_cache.h"
67965
67966-static atomic_t permission_epoch = ATOMIC_INIT(0);
67967+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
67968
67969 /* replace or extend an acl cache hit */
67970 void coda_cache_enter(struct inode *inode, int mask)
67971@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
67972 struct coda_inode_info *cii = ITOC(inode);
67973
67974 spin_lock(&cii->c_lock);
67975- cii->c_cached_epoch = atomic_read(&permission_epoch);
67976+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
67977 if (!uid_eq(cii->c_uid, current_fsuid())) {
67978 cii->c_uid = current_fsuid();
67979 cii->c_cached_perm = mask;
67980@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
67981 {
67982 struct coda_inode_info *cii = ITOC(inode);
67983 spin_lock(&cii->c_lock);
67984- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
67985+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
67986 spin_unlock(&cii->c_lock);
67987 }
67988
67989 /* remove all acl caches */
67990 void coda_cache_clear_all(struct super_block *sb)
67991 {
67992- atomic_inc(&permission_epoch);
67993+ atomic_inc_unchecked(&permission_epoch);
67994 }
67995
67996
67997@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
67998 spin_lock(&cii->c_lock);
67999 hit = (mask & cii->c_cached_perm) == mask &&
68000 uid_eq(cii->c_uid, current_fsuid()) &&
68001- cii->c_cached_epoch == atomic_read(&permission_epoch);
68002+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
68003 spin_unlock(&cii->c_lock);
68004
68005 return hit;
68006diff --git a/fs/compat.c b/fs/compat.c
68007index 6fd272d..dd34ba2 100644
68008--- a/fs/compat.c
68009+++ b/fs/compat.c
68010@@ -54,7 +54,7 @@
68011 #include <asm/ioctls.h>
68012 #include "internal.h"
68013
68014-int compat_log = 1;
68015+int compat_log = 0;
68016
68017 int compat_printk(const char *fmt, ...)
68018 {
68019@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
68020
68021 set_fs(KERNEL_DS);
68022 /* The __user pointer cast is valid because of the set_fs() */
68023- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
68024+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
68025 set_fs(oldfs);
68026 /* truncating is ok because it's a user address */
68027 if (!ret)
68028@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
68029 goto out;
68030
68031 ret = -EINVAL;
68032- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
68033+ if (nr_segs > UIO_MAXIOV)
68034 goto out;
68035 if (nr_segs > fast_segs) {
68036 ret = -ENOMEM;
68037@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
68038 struct compat_readdir_callback {
68039 struct dir_context ctx;
68040 struct compat_old_linux_dirent __user *dirent;
68041+ struct file * file;
68042 int result;
68043 };
68044
68045@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
68046 buf->result = -EOVERFLOW;
68047 return -EOVERFLOW;
68048 }
68049+
68050+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68051+ return 0;
68052+
68053 buf->result++;
68054 dirent = buf->dirent;
68055 if (!access_ok(VERIFY_WRITE, dirent,
68056@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
68057 if (!f.file)
68058 return -EBADF;
68059
68060+ buf.file = f.file;
68061 error = iterate_dir(f.file, &buf.ctx);
68062 if (buf.result)
68063 error = buf.result;
68064@@ -913,6 +919,7 @@ struct compat_getdents_callback {
68065 struct dir_context ctx;
68066 struct compat_linux_dirent __user *current_dir;
68067 struct compat_linux_dirent __user *previous;
68068+ struct file * file;
68069 int count;
68070 int error;
68071 };
68072@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
68073 buf->error = -EOVERFLOW;
68074 return -EOVERFLOW;
68075 }
68076+
68077+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68078+ return 0;
68079+
68080 dirent = buf->previous;
68081 if (dirent) {
68082 if (__put_user(offset, &dirent->d_off))
68083@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
68084 if (!f.file)
68085 return -EBADF;
68086
68087+ buf.file = f.file;
68088 error = iterate_dir(f.file, &buf.ctx);
68089 if (error >= 0)
68090 error = buf.error;
68091@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
68092 struct dir_context ctx;
68093 struct linux_dirent64 __user *current_dir;
68094 struct linux_dirent64 __user *previous;
68095+ struct file * file;
68096 int count;
68097 int error;
68098 };
68099@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
68100 buf->error = -EINVAL; /* only used if we fail.. */
68101 if (reclen > buf->count)
68102 return -EINVAL;
68103+
68104+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68105+ return 0;
68106+
68107 dirent = buf->previous;
68108
68109 if (dirent) {
68110@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
68111 if (!f.file)
68112 return -EBADF;
68113
68114+ buf.file = f.file;
68115 error = iterate_dir(f.file, &buf.ctx);
68116 if (error >= 0)
68117 error = buf.error;
68118diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
68119index 4d24d17..4f8c09e 100644
68120--- a/fs/compat_binfmt_elf.c
68121+++ b/fs/compat_binfmt_elf.c
68122@@ -30,11 +30,13 @@
68123 #undef elf_phdr
68124 #undef elf_shdr
68125 #undef elf_note
68126+#undef elf_dyn
68127 #undef elf_addr_t
68128 #define elfhdr elf32_hdr
68129 #define elf_phdr elf32_phdr
68130 #define elf_shdr elf32_shdr
68131 #define elf_note elf32_note
68132+#define elf_dyn Elf32_Dyn
68133 #define elf_addr_t Elf32_Addr
68134
68135 /*
68136diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
68137index afec645..9c65620 100644
68138--- a/fs/compat_ioctl.c
68139+++ b/fs/compat_ioctl.c
68140@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
68141 return -EFAULT;
68142 if (__get_user(udata, &ss32->iomem_base))
68143 return -EFAULT;
68144- ss.iomem_base = compat_ptr(udata);
68145+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
68146 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
68147 __get_user(ss.port_high, &ss32->port_high))
68148 return -EFAULT;
68149@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
68150 for (i = 0; i < nmsgs; i++) {
68151 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
68152 return -EFAULT;
68153- if (get_user(datap, &umsgs[i].buf) ||
68154- put_user(compat_ptr(datap), &tmsgs[i].buf))
68155+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
68156+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
68157 return -EFAULT;
68158 }
68159 return sys_ioctl(fd, cmd, (unsigned long)tdata);
68160@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
68161 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
68162 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
68163 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
68164- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
68165+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
68166 return -EFAULT;
68167
68168 return ioctl_preallocate(file, p);
68169@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
68170 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
68171 {
68172 unsigned int a, b;
68173- a = *(unsigned int *)p;
68174- b = *(unsigned int *)q;
68175+ a = *(const unsigned int *)p;
68176+ b = *(const unsigned int *)q;
68177 if (a > b)
68178 return 1;
68179 if (a < b)
68180diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
68181index cf0db00..c7f70e8 100644
68182--- a/fs/configfs/dir.c
68183+++ b/fs/configfs/dir.c
68184@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68185 }
68186 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
68187 struct configfs_dirent *next;
68188- const char *name;
68189+ const unsigned char * name;
68190+ char d_name[sizeof(next->s_dentry->d_iname)];
68191 int len;
68192 struct inode *inode = NULL;
68193
68194@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68195 continue;
68196
68197 name = configfs_get_name(next);
68198- len = strlen(name);
68199+ if (next->s_dentry && name == next->s_dentry->d_iname) {
68200+ len = next->s_dentry->d_name.len;
68201+ memcpy(d_name, name, len);
68202+ name = d_name;
68203+ } else
68204+ len = strlen(name);
68205
68206 /*
68207 * We'll have a dentry and an inode for
68208diff --git a/fs/coredump.c b/fs/coredump.c
68209index bbbe139..b76fae5 100644
68210--- a/fs/coredump.c
68211+++ b/fs/coredump.c
68212@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
68213 struct pipe_inode_info *pipe = file->private_data;
68214
68215 pipe_lock(pipe);
68216- pipe->readers++;
68217- pipe->writers--;
68218+ atomic_inc(&pipe->readers);
68219+ atomic_dec(&pipe->writers);
68220 wake_up_interruptible_sync(&pipe->wait);
68221 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
68222 pipe_unlock(pipe);
68223@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
68224 * We actually want wait_event_freezable() but then we need
68225 * to clear TIF_SIGPENDING and improve dump_interrupted().
68226 */
68227- wait_event_interruptible(pipe->wait, pipe->readers == 1);
68228+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
68229
68230 pipe_lock(pipe);
68231- pipe->readers--;
68232- pipe->writers++;
68233+ atomic_dec(&pipe->readers);
68234+ atomic_inc(&pipe->writers);
68235 pipe_unlock(pipe);
68236 }
68237
68238@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
68239 struct files_struct *displaced;
68240 bool need_nonrelative = false;
68241 bool core_dumped = false;
68242- static atomic_t core_dump_count = ATOMIC_INIT(0);
68243+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
68244+ long signr = siginfo->si_signo;
68245+ int dumpable;
68246 struct coredump_params cprm = {
68247 .siginfo = siginfo,
68248 .regs = signal_pt_regs(),
68249@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
68250 .mm_flags = mm->flags,
68251 };
68252
68253- audit_core_dumps(siginfo->si_signo);
68254+ audit_core_dumps(signr);
68255+
68256+ dumpable = __get_dumpable(cprm.mm_flags);
68257+
68258+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
68259+ gr_handle_brute_attach(dumpable);
68260
68261 binfmt = mm->binfmt;
68262 if (!binfmt || !binfmt->core_dump)
68263 goto fail;
68264- if (!__get_dumpable(cprm.mm_flags))
68265+ if (!dumpable)
68266 goto fail;
68267
68268 cred = prepare_creds();
68269@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
68270 need_nonrelative = true;
68271 }
68272
68273- retval = coredump_wait(siginfo->si_signo, &core_state);
68274+ retval = coredump_wait(signr, &core_state);
68275 if (retval < 0)
68276 goto fail_creds;
68277
68278@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
68279 }
68280 cprm.limit = RLIM_INFINITY;
68281
68282- dump_count = atomic_inc_return(&core_dump_count);
68283+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
68284 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
68285 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
68286 task_tgid_vnr(current), current->comm);
68287@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
68288 } else {
68289 struct inode *inode;
68290
68291+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
68292+
68293 if (cprm.limit < binfmt->min_coredump)
68294 goto fail_unlock;
68295
68296@@ -681,7 +690,7 @@ close_fail:
68297 filp_close(cprm.file, NULL);
68298 fail_dropcount:
68299 if (ispipe)
68300- atomic_dec(&core_dump_count);
68301+ atomic_dec_unchecked(&core_dump_count);
68302 fail_unlock:
68303 kfree(cn.corename);
68304 coredump_finish(mm, core_dumped);
68305@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
68306 struct file *file = cprm->file;
68307 loff_t pos = file->f_pos;
68308 ssize_t n;
68309+
68310+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
68311 if (cprm->written + nr > cprm->limit)
68312 return 0;
68313 while (nr) {
68314diff --git a/fs/dcache.c b/fs/dcache.c
68315index 922f23e..05e38ae 100644
68316--- a/fs/dcache.c
68317+++ b/fs/dcache.c
68318@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
68319 * dentry_iput drops the locks, at which point nobody (except
68320 * transient RCU lookups) can reach this dentry.
68321 */
68322- BUG_ON(dentry->d_lockref.count > 0);
68323+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
68324 this_cpu_dec(nr_dentry);
68325 if (dentry->d_op && dentry->d_op->d_release)
68326 dentry->d_op->d_release(dentry);
68327@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
68328 struct dentry *parent = dentry->d_parent;
68329 if (IS_ROOT(dentry))
68330 return NULL;
68331- if (unlikely(dentry->d_lockref.count < 0))
68332+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
68333 return NULL;
68334 if (likely(spin_trylock(&parent->d_lock)))
68335 return parent;
68336@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
68337 */
68338 if (unlikely(ret < 0)) {
68339 spin_lock(&dentry->d_lock);
68340- if (dentry->d_lockref.count > 1) {
68341- dentry->d_lockref.count--;
68342+ if (__lockref_read(&dentry->d_lockref) > 1) {
68343+ __lockref_dec(&dentry->d_lockref);
68344 spin_unlock(&dentry->d_lock);
68345 return 1;
68346 }
68347@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
68348 * else could have killed it and marked it dead. Either way, we
68349 * don't need to do anything else.
68350 */
68351- if (dentry->d_lockref.count) {
68352+ if (__lockref_read(&dentry->d_lockref)) {
68353 spin_unlock(&dentry->d_lock);
68354 return 1;
68355 }
68356@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
68357 * lock, and we just tested that it was zero, so we can just
68358 * set it to 1.
68359 */
68360- dentry->d_lockref.count = 1;
68361+ __lockref_set(&dentry->d_lockref, 1);
68362 return 0;
68363 }
68364
68365@@ -751,7 +751,7 @@ repeat:
68366 dentry->d_flags |= DCACHE_REFERENCED;
68367 dentry_lru_add(dentry);
68368
68369- dentry->d_lockref.count--;
68370+ __lockref_dec(&dentry->d_lockref);
68371 spin_unlock(&dentry->d_lock);
68372 return;
68373
68374@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
68375 /* This must be called with d_lock held */
68376 static inline void __dget_dlock(struct dentry *dentry)
68377 {
68378- dentry->d_lockref.count++;
68379+ __lockref_inc(&dentry->d_lockref);
68380 }
68381
68382 static inline void __dget(struct dentry *dentry)
68383@@ -807,8 +807,8 @@ repeat:
68384 goto repeat;
68385 }
68386 rcu_read_unlock();
68387- BUG_ON(!ret->d_lockref.count);
68388- ret->d_lockref.count++;
68389+ BUG_ON(!__lockref_read(&ret->d_lockref));
68390+ __lockref_inc(&ret->d_lockref);
68391 spin_unlock(&ret->d_lock);
68392 return ret;
68393 }
68394@@ -886,9 +886,9 @@ restart:
68395 spin_lock(&inode->i_lock);
68396 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
68397 spin_lock(&dentry->d_lock);
68398- if (!dentry->d_lockref.count) {
68399+ if (!__lockref_read(&dentry->d_lockref)) {
68400 struct dentry *parent = lock_parent(dentry);
68401- if (likely(!dentry->d_lockref.count)) {
68402+ if (likely(!__lockref_read(&dentry->d_lockref))) {
68403 __dentry_kill(dentry);
68404 dput(parent);
68405 goto restart;
68406@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
68407 * We found an inuse dentry which was not removed from
68408 * the LRU because of laziness during lookup. Do not free it.
68409 */
68410- if (dentry->d_lockref.count > 0) {
68411+ if (__lockref_read(&dentry->d_lockref) > 0) {
68412 spin_unlock(&dentry->d_lock);
68413 if (parent)
68414 spin_unlock(&parent->d_lock);
68415@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
68416 dentry = parent;
68417 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
68418 parent = lock_parent(dentry);
68419- if (dentry->d_lockref.count != 1) {
68420- dentry->d_lockref.count--;
68421+ if (__lockref_read(&dentry->d_lockref) != 1) {
68422+ __lockref_inc(&dentry->d_lockref);
68423 spin_unlock(&dentry->d_lock);
68424 if (parent)
68425 spin_unlock(&parent->d_lock);
68426@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
68427 * counts, just remove them from the LRU. Otherwise give them
68428 * another pass through the LRU.
68429 */
68430- if (dentry->d_lockref.count) {
68431+ if (__lockref_read(&dentry->d_lockref)) {
68432 d_lru_isolate(lru, dentry);
68433 spin_unlock(&dentry->d_lock);
68434 return LRU_REMOVED;
68435@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
68436 } else {
68437 if (dentry->d_flags & DCACHE_LRU_LIST)
68438 d_lru_del(dentry);
68439- if (!dentry->d_lockref.count) {
68440+ if (!__lockref_read(&dentry->d_lockref)) {
68441 d_shrink_add(dentry, &data->dispose);
68442 data->found++;
68443 }
68444@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68445 return D_WALK_CONTINUE;
68446
68447 /* root with refcount 1 is fine */
68448- if (dentry == _data && dentry->d_lockref.count == 1)
68449+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
68450 return D_WALK_CONTINUE;
68451
68452 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
68453@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68454 dentry->d_inode ?
68455 dentry->d_inode->i_ino : 0UL,
68456 dentry,
68457- dentry->d_lockref.count,
68458+ __lockref_read(&dentry->d_lockref),
68459 dentry->d_sb->s_type->name,
68460 dentry->d_sb->s_id);
68461 WARN_ON(1);
68462@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68463 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
68464 if (name->len > DNAME_INLINE_LEN-1) {
68465 size_t size = offsetof(struct external_name, name[1]);
68466- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
68467+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
68468 if (!p) {
68469 kmem_cache_free(dentry_cache, dentry);
68470 return NULL;
68471@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68472 smp_wmb();
68473 dentry->d_name.name = dname;
68474
68475- dentry->d_lockref.count = 1;
68476+ __lockref_set(&dentry->d_lockref, 1);
68477 dentry->d_flags = 0;
68478 spin_lock_init(&dentry->d_lock);
68479 seqcount_init(&dentry->d_seq);
68480@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68481 dentry->d_sb = sb;
68482 dentry->d_op = NULL;
68483 dentry->d_fsdata = NULL;
68484+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
68485+ atomic_set(&dentry->chroot_refcnt, 0);
68486+#endif
68487 INIT_HLIST_BL_NODE(&dentry->d_hash);
68488 INIT_LIST_HEAD(&dentry->d_lru);
68489 INIT_LIST_HEAD(&dentry->d_subdirs);
68490@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
68491 goto next;
68492 }
68493
68494- dentry->d_lockref.count++;
68495+ __lockref_inc(&dentry->d_lockref);
68496 found = dentry;
68497 spin_unlock(&dentry->d_lock);
68498 break;
68499@@ -2358,7 +2361,7 @@ again:
68500 spin_lock(&dentry->d_lock);
68501 inode = dentry->d_inode;
68502 isdir = S_ISDIR(inode->i_mode);
68503- if (dentry->d_lockref.count == 1) {
68504+ if (__lockref_read(&dentry->d_lockref) == 1) {
68505 if (!spin_trylock(&inode->i_lock)) {
68506 spin_unlock(&dentry->d_lock);
68507 cpu_relax();
68508@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
68509
68510 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
68511 dentry->d_flags |= DCACHE_GENOCIDE;
68512- dentry->d_lockref.count--;
68513+ __lockref_dec(&dentry->d_lockref);
68514 }
68515 }
68516 return D_WALK_CONTINUE;
68517@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
68518 mempages -= reserve;
68519
68520 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
68521- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
68522+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
68523+ SLAB_NO_SANITIZE, NULL);
68524
68525 dcache_init();
68526 inode_init();
68527diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
68528index 96400ab..906103d 100644
68529--- a/fs/debugfs/inode.c
68530+++ b/fs/debugfs/inode.c
68531@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
68532 }
68533 EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68534
68535+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68536+extern int grsec_enable_sysfs_restrict;
68537+#endif
68538+
68539 /**
68540 * debugfs_create_dir - create a directory in the debugfs filesystem
68541 * @name: a pointer to a string containing the name of the directory to
68542@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68543 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
68544 * returned.
68545 */
68546+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68547+extern int grsec_enable_sysfs_restrict;
68548+#endif
68549+
68550 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68551 {
68552 struct dentry *dentry = start_creating(name, parent);
68553@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68554 if (unlikely(!inode))
68555 return failed_creating(dentry);
68556
68557- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68558+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68559+ if (grsec_enable_sysfs_restrict)
68560+ inode->i_mode = S_IFDIR | S_IRWXU;
68561+ else
68562+#endif
68563+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68564 inode->i_op = &simple_dir_inode_operations;
68565 inode->i_fop = &simple_dir_operations;
68566
68567diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
68568index b08b518..d6acffa 100644
68569--- a/fs/ecryptfs/inode.c
68570+++ b/fs/ecryptfs/inode.c
68571@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
68572 old_fs = get_fs();
68573 set_fs(get_ds());
68574 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
68575- (char __user *)lower_buf,
68576+ (char __force_user *)lower_buf,
68577 PATH_MAX);
68578 set_fs(old_fs);
68579 if (rc < 0)
68580diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
68581index e4141f2..d8263e8 100644
68582--- a/fs/ecryptfs/miscdev.c
68583+++ b/fs/ecryptfs/miscdev.c
68584@@ -304,7 +304,7 @@ check_list:
68585 goto out_unlock_msg_ctx;
68586 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
68587 if (msg_ctx->msg) {
68588- if (copy_to_user(&buf[i], packet_length, packet_length_size))
68589+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
68590 goto out_unlock_msg_ctx;
68591 i += packet_length_size;
68592 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
68593diff --git a/fs/exec.c b/fs/exec.c
68594index 1202445..3065053 100644
68595--- a/fs/exec.c
68596+++ b/fs/exec.c
68597@@ -56,8 +56,20 @@
68598 #include <linux/pipe_fs_i.h>
68599 #include <linux/oom.h>
68600 #include <linux/compat.h>
68601+#include <linux/random.h>
68602+#include <linux/seq_file.h>
68603+#include <linux/coredump.h>
68604+#include <linux/mman.h>
68605+
68606+#ifdef CONFIG_PAX_REFCOUNT
68607+#include <linux/kallsyms.h>
68608+#include <linux/kdebug.h>
68609+#endif
68610+
68611+#include <trace/events/fs.h>
68612
68613 #include <asm/uaccess.h>
68614+#include <asm/sections.h>
68615 #include <asm/mmu_context.h>
68616 #include <asm/tlb.h>
68617
68618@@ -66,19 +78,34 @@
68619
68620 #include <trace/events/sched.h>
68621
68622+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68623+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
68624+{
68625+ 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");
68626+}
68627+#endif
68628+
68629+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
68630+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68631+EXPORT_SYMBOL(pax_set_initial_flags_func);
68632+#endif
68633+
68634 int suid_dumpable = 0;
68635
68636 static LIST_HEAD(formats);
68637 static DEFINE_RWLOCK(binfmt_lock);
68638
68639+extern int gr_process_kernel_exec_ban(void);
68640+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
68641+
68642 void __register_binfmt(struct linux_binfmt * fmt, int insert)
68643 {
68644 BUG_ON(!fmt);
68645 if (WARN_ON(!fmt->load_binary))
68646 return;
68647 write_lock(&binfmt_lock);
68648- insert ? list_add(&fmt->lh, &formats) :
68649- list_add_tail(&fmt->lh, &formats);
68650+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
68651+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
68652 write_unlock(&binfmt_lock);
68653 }
68654
68655@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
68656 void unregister_binfmt(struct linux_binfmt * fmt)
68657 {
68658 write_lock(&binfmt_lock);
68659- list_del(&fmt->lh);
68660+ pax_list_del((struct list_head *)&fmt->lh);
68661 write_unlock(&binfmt_lock);
68662 }
68663
68664@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68665 int write)
68666 {
68667 struct page *page;
68668- int ret;
68669
68670-#ifdef CONFIG_STACK_GROWSUP
68671- if (write) {
68672- ret = expand_downwards(bprm->vma, pos);
68673- if (ret < 0)
68674- return NULL;
68675- }
68676-#endif
68677- ret = get_user_pages(current, bprm->mm, pos,
68678- 1, write, 1, &page, NULL);
68679- if (ret <= 0)
68680+ if (0 > expand_downwards(bprm->vma, pos))
68681+ return NULL;
68682+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
68683 return NULL;
68684
68685 if (write) {
68686@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68687 if (size <= ARG_MAX)
68688 return page;
68689
68690+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68691+ // only allow 512KB for argv+env on suid/sgid binaries
68692+ // to prevent easy ASLR exhaustion
68693+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
68694+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
68695+ (size > (512 * 1024))) {
68696+ put_page(page);
68697+ return NULL;
68698+ }
68699+#endif
68700+
68701 /*
68702 * Limit to 1/4-th the stack size for the argv+env strings.
68703 * This ensures that:
68704@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68705 vma->vm_end = STACK_TOP_MAX;
68706 vma->vm_start = vma->vm_end - PAGE_SIZE;
68707 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
68708+
68709+#ifdef CONFIG_PAX_SEGMEXEC
68710+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68711+#endif
68712+
68713 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
68714 INIT_LIST_HEAD(&vma->anon_vma_chain);
68715
68716@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68717 arch_bprm_mm_init(mm, vma);
68718 up_write(&mm->mmap_sem);
68719 bprm->p = vma->vm_end - sizeof(void *);
68720+
68721+#ifdef CONFIG_PAX_RANDUSTACK
68722+ if (randomize_va_space)
68723+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
68724+#endif
68725+
68726 return 0;
68727 err:
68728 up_write(&mm->mmap_sem);
68729@@ -396,7 +437,7 @@ struct user_arg_ptr {
68730 } ptr;
68731 };
68732
68733-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68734+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68735 {
68736 const char __user *native;
68737
68738@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68739 compat_uptr_t compat;
68740
68741 if (get_user(compat, argv.ptr.compat + nr))
68742- return ERR_PTR(-EFAULT);
68743+ return (const char __force_user *)ERR_PTR(-EFAULT);
68744
68745 return compat_ptr(compat);
68746 }
68747 #endif
68748
68749 if (get_user(native, argv.ptr.native + nr))
68750- return ERR_PTR(-EFAULT);
68751+ return (const char __force_user *)ERR_PTR(-EFAULT);
68752
68753 return native;
68754 }
68755@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
68756 if (!p)
68757 break;
68758
68759- if (IS_ERR(p))
68760+ if (IS_ERR((const char __force_kernel *)p))
68761 return -EFAULT;
68762
68763 if (i >= max)
68764@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
68765
68766 ret = -EFAULT;
68767 str = get_user_arg_ptr(argv, argc);
68768- if (IS_ERR(str))
68769+ if (IS_ERR((const char __force_kernel *)str))
68770 goto out;
68771
68772 len = strnlen_user(str, MAX_ARG_STRLEN);
68773@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
68774 int r;
68775 mm_segment_t oldfs = get_fs();
68776 struct user_arg_ptr argv = {
68777- .ptr.native = (const char __user *const __user *)__argv,
68778+ .ptr.native = (const char __user * const __force_user *)__argv,
68779 };
68780
68781 set_fs(KERNEL_DS);
68782@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68783 unsigned long new_end = old_end - shift;
68784 struct mmu_gather tlb;
68785
68786- BUG_ON(new_start > new_end);
68787+ if (new_start >= new_end || new_start < mmap_min_addr)
68788+ return -ENOMEM;
68789
68790 /*
68791 * ensure there are no vmas between where we want to go
68792@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68793 if (vma != find_vma(mm, new_start))
68794 return -EFAULT;
68795
68796+#ifdef CONFIG_PAX_SEGMEXEC
68797+ BUG_ON(pax_find_mirror_vma(vma));
68798+#endif
68799+
68800 /*
68801 * cover the whole range: [new_start, old_end)
68802 */
68803@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68804 stack_top = arch_align_stack(stack_top);
68805 stack_top = PAGE_ALIGN(stack_top);
68806
68807- if (unlikely(stack_top < mmap_min_addr) ||
68808- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
68809- return -ENOMEM;
68810-
68811 stack_shift = vma->vm_end - stack_top;
68812
68813 bprm->p -= stack_shift;
68814@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
68815 bprm->exec -= stack_shift;
68816
68817 down_write(&mm->mmap_sem);
68818+
68819+ /* Move stack pages down in memory. */
68820+ if (stack_shift) {
68821+ ret = shift_arg_pages(vma, stack_shift);
68822+ if (ret)
68823+ goto out_unlock;
68824+ }
68825+
68826 vm_flags = VM_STACK_FLAGS;
68827
68828+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
68829+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
68830+ vm_flags &= ~VM_EXEC;
68831+
68832+#ifdef CONFIG_PAX_MPROTECT
68833+ if (mm->pax_flags & MF_PAX_MPROTECT)
68834+ vm_flags &= ~VM_MAYEXEC;
68835+#endif
68836+
68837+ }
68838+#endif
68839+
68840 /*
68841 * Adjust stack execute permissions; explicitly enable for
68842 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
68843@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68844 goto out_unlock;
68845 BUG_ON(prev != vma);
68846
68847- /* Move stack pages down in memory. */
68848- if (stack_shift) {
68849- ret = shift_arg_pages(vma, stack_shift);
68850- if (ret)
68851- goto out_unlock;
68852- }
68853-
68854 /* mprotect_fixup is overkill to remove the temporary stack flags */
68855 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
68856
68857@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
68858 #endif
68859 current->mm->start_stack = bprm->p;
68860 ret = expand_stack(vma, stack_base);
68861+
68862+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
68863+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
68864+ unsigned long size;
68865+ vm_flags_t vm_flags;
68866+
68867+ size = STACK_TOP - vma->vm_end;
68868+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
68869+
68870+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
68871+
68872+#ifdef CONFIG_X86
68873+ if (!ret) {
68874+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
68875+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
68876+ }
68877+#endif
68878+
68879+ }
68880+#endif
68881+
68882 if (ret)
68883 ret = -EFAULT;
68884
68885@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
68886 if (err)
68887 goto exit;
68888
68889- if (name->name[0] != '\0')
68890+ if (name->name[0] != '\0') {
68891 fsnotify_open(file);
68892+ trace_open_exec(name->name);
68893+ }
68894
68895 out:
68896 return file;
68897@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
68898 old_fs = get_fs();
68899 set_fs(get_ds());
68900 /* The cast to a user pointer is valid due to the set_fs() */
68901- result = vfs_read(file, (void __user *)addr, count, &pos);
68902+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
68903 set_fs(old_fs);
68904 return result;
68905 }
68906@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
68907 tsk->mm = mm;
68908 tsk->active_mm = mm;
68909 activate_mm(active_mm, mm);
68910+ populate_stack();
68911 tsk->mm->vmacache_seqnum = 0;
68912 vmacache_flush(tsk);
68913 task_unlock(tsk);
68914@@ -929,10 +1008,14 @@ static int de_thread(struct task_struct *tsk)
68915 if (!thread_group_leader(tsk)) {
68916 struct task_struct *leader = tsk->group_leader;
68917
68918- sig->notify_count = -1; /* for exit_notify() */
68919 for (;;) {
68920 threadgroup_change_begin(tsk);
68921 write_lock_irq(&tasklist_lock);
68922+ /*
68923+ * Do this under tasklist_lock to ensure that
68924+ * exit_notify() can't miss ->group_exit_task
68925+ */
68926+ sig->notify_count = -1;
68927 if (likely(leader->exit_state))
68928 break;
68929 __set_current_state(TASK_KILLABLE);
68930@@ -1261,7 +1344,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
68931 }
68932 rcu_read_unlock();
68933
68934- if (p->fs->users > n_fs)
68935+ if (atomic_read(&p->fs->users) > n_fs)
68936 bprm->unsafe |= LSM_UNSAFE_SHARE;
68937 else
68938 p->fs->in_exec = 1;
68939@@ -1462,6 +1545,31 @@ static int exec_binprm(struct linux_binprm *bprm)
68940 return ret;
68941 }
68942
68943+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68944+static DEFINE_PER_CPU(u64, exec_counter);
68945+static int __init init_exec_counters(void)
68946+{
68947+ unsigned int cpu;
68948+
68949+ for_each_possible_cpu(cpu) {
68950+ per_cpu(exec_counter, cpu) = (u64)cpu;
68951+ }
68952+
68953+ return 0;
68954+}
68955+early_initcall(init_exec_counters);
68956+static inline void increment_exec_counter(void)
68957+{
68958+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
68959+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
68960+}
68961+#else
68962+static inline void increment_exec_counter(void) {}
68963+#endif
68964+
68965+extern void gr_handle_exec_args(struct linux_binprm *bprm,
68966+ struct user_arg_ptr argv);
68967+
68968 /*
68969 * sys_execve() executes a new program.
68970 */
68971@@ -1470,6 +1578,11 @@ static int do_execveat_common(int fd, struct filename *filename,
68972 struct user_arg_ptr envp,
68973 int flags)
68974 {
68975+#ifdef CONFIG_GRKERNSEC
68976+ struct file *old_exec_file;
68977+ struct acl_subject_label *old_acl;
68978+ struct rlimit old_rlim[RLIM_NLIMITS];
68979+#endif
68980 char *pathbuf = NULL;
68981 struct linux_binprm *bprm;
68982 struct file *file;
68983@@ -1479,6 +1592,8 @@ static int do_execveat_common(int fd, struct filename *filename,
68984 if (IS_ERR(filename))
68985 return PTR_ERR(filename);
68986
68987+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
68988+
68989 /*
68990 * We move the actual failure in case of RLIMIT_NPROC excess from
68991 * set*uid() to execve() because too many poorly written programs
68992@@ -1516,6 +1631,11 @@ static int do_execveat_common(int fd, struct filename *filename,
68993 if (IS_ERR(file))
68994 goto out_unmark;
68995
68996+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
68997+ retval = -EPERM;
68998+ goto out_unmark;
68999+ }
69000+
69001 sched_exec();
69002
69003 bprm->file = file;
69004@@ -1542,6 +1662,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69005 }
69006 bprm->interp = bprm->filename;
69007
69008+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
69009+ retval = -EACCES;
69010+ goto out_unmark;
69011+ }
69012+
69013 retval = bprm_mm_init(bprm);
69014 if (retval)
69015 goto out_unmark;
69016@@ -1558,24 +1683,70 @@ static int do_execveat_common(int fd, struct filename *filename,
69017 if (retval < 0)
69018 goto out;
69019
69020+#ifdef CONFIG_GRKERNSEC
69021+ old_acl = current->acl;
69022+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
69023+ old_exec_file = current->exec_file;
69024+ get_file(file);
69025+ current->exec_file = file;
69026+#endif
69027+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69028+ /* limit suid stack to 8MB
69029+ * we saved the old limits above and will restore them if this exec fails
69030+ */
69031+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
69032+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
69033+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
69034+#endif
69035+
69036+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
69037+ retval = -EPERM;
69038+ goto out_fail;
69039+ }
69040+
69041+ if (!gr_tpe_allow(file)) {
69042+ retval = -EACCES;
69043+ goto out_fail;
69044+ }
69045+
69046+ if (gr_check_crash_exec(file)) {
69047+ retval = -EACCES;
69048+ goto out_fail;
69049+ }
69050+
69051+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
69052+ bprm->unsafe);
69053+ if (retval < 0)
69054+ goto out_fail;
69055+
69056 retval = copy_strings_kernel(1, &bprm->filename, bprm);
69057 if (retval < 0)
69058- goto out;
69059+ goto out_fail;
69060
69061 bprm->exec = bprm->p;
69062 retval = copy_strings(bprm->envc, envp, bprm);
69063 if (retval < 0)
69064- goto out;
69065+ goto out_fail;
69066
69067 retval = copy_strings(bprm->argc, argv, bprm);
69068 if (retval < 0)
69069- goto out;
69070+ goto out_fail;
69071+
69072+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
69073+
69074+ gr_handle_exec_args(bprm, argv);
69075
69076 retval = exec_binprm(bprm);
69077 if (retval < 0)
69078- goto out;
69079+ goto out_fail;
69080+#ifdef CONFIG_GRKERNSEC
69081+ if (old_exec_file)
69082+ fput(old_exec_file);
69083+#endif
69084
69085 /* execve succeeded */
69086+
69087+ increment_exec_counter();
69088 current->fs->in_exec = 0;
69089 current->in_execve = 0;
69090 acct_update_integrals(current);
69091@@ -1587,6 +1758,14 @@ static int do_execveat_common(int fd, struct filename *filename,
69092 put_files_struct(displaced);
69093 return retval;
69094
69095+out_fail:
69096+#ifdef CONFIG_GRKERNSEC
69097+ current->acl = old_acl;
69098+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
69099+ fput(current->exec_file);
69100+ current->exec_file = old_exec_file;
69101+#endif
69102+
69103 out:
69104 if (bprm->mm) {
69105 acct_arg_size(bprm, 0);
69106@@ -1733,3 +1912,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
69107 argv, envp, flags);
69108 }
69109 #endif
69110+
69111+int pax_check_flags(unsigned long *flags)
69112+{
69113+ int retval = 0;
69114+
69115+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
69116+ if (*flags & MF_PAX_SEGMEXEC)
69117+ {
69118+ *flags &= ~MF_PAX_SEGMEXEC;
69119+ retval = -EINVAL;
69120+ }
69121+#endif
69122+
69123+ if ((*flags & MF_PAX_PAGEEXEC)
69124+
69125+#ifdef CONFIG_PAX_PAGEEXEC
69126+ && (*flags & MF_PAX_SEGMEXEC)
69127+#endif
69128+
69129+ )
69130+ {
69131+ *flags &= ~MF_PAX_PAGEEXEC;
69132+ retval = -EINVAL;
69133+ }
69134+
69135+ if ((*flags & MF_PAX_MPROTECT)
69136+
69137+#ifdef CONFIG_PAX_MPROTECT
69138+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69139+#endif
69140+
69141+ )
69142+ {
69143+ *flags &= ~MF_PAX_MPROTECT;
69144+ retval = -EINVAL;
69145+ }
69146+
69147+ if ((*flags & MF_PAX_EMUTRAMP)
69148+
69149+#ifdef CONFIG_PAX_EMUTRAMP
69150+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69151+#endif
69152+
69153+ )
69154+ {
69155+ *flags &= ~MF_PAX_EMUTRAMP;
69156+ retval = -EINVAL;
69157+ }
69158+
69159+ return retval;
69160+}
69161+
69162+EXPORT_SYMBOL(pax_check_flags);
69163+
69164+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69165+char *pax_get_path(const struct path *path, char *buf, int buflen)
69166+{
69167+ char *pathname = d_path(path, buf, buflen);
69168+
69169+ if (IS_ERR(pathname))
69170+ goto toolong;
69171+
69172+ pathname = mangle_path(buf, pathname, "\t\n\\");
69173+ if (!pathname)
69174+ goto toolong;
69175+
69176+ *pathname = 0;
69177+ return buf;
69178+
69179+toolong:
69180+ return "<path too long>";
69181+}
69182+EXPORT_SYMBOL(pax_get_path);
69183+
69184+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
69185+{
69186+ struct task_struct *tsk = current;
69187+ struct mm_struct *mm = current->mm;
69188+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
69189+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
69190+ char *path_exec = NULL;
69191+ char *path_fault = NULL;
69192+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
69193+ siginfo_t info = { };
69194+
69195+ if (buffer_exec && buffer_fault) {
69196+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
69197+
69198+ down_read(&mm->mmap_sem);
69199+ vma = mm->mmap;
69200+ while (vma && (!vma_exec || !vma_fault)) {
69201+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
69202+ vma_exec = vma;
69203+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
69204+ vma_fault = vma;
69205+ vma = vma->vm_next;
69206+ }
69207+ if (vma_exec)
69208+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
69209+ if (vma_fault) {
69210+ start = vma_fault->vm_start;
69211+ end = vma_fault->vm_end;
69212+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
69213+ if (vma_fault->vm_file)
69214+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
69215+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
69216+ path_fault = "<heap>";
69217+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
69218+ path_fault = "<stack>";
69219+ else
69220+ path_fault = "<anonymous mapping>";
69221+ }
69222+ up_read(&mm->mmap_sem);
69223+ }
69224+ if (tsk->signal->curr_ip)
69225+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
69226+ else
69227+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
69228+ 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),
69229+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
69230+ free_page((unsigned long)buffer_exec);
69231+ free_page((unsigned long)buffer_fault);
69232+ pax_report_insns(regs, pc, sp);
69233+ info.si_signo = SIGKILL;
69234+ info.si_errno = 0;
69235+ info.si_code = SI_KERNEL;
69236+ info.si_pid = 0;
69237+ info.si_uid = 0;
69238+ do_coredump(&info);
69239+}
69240+#endif
69241+
69242+#ifdef CONFIG_PAX_REFCOUNT
69243+void pax_report_refcount_overflow(struct pt_regs *regs)
69244+{
69245+ if (current->signal->curr_ip)
69246+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
69247+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
69248+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69249+ else
69250+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
69251+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69252+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
69253+ preempt_disable();
69254+ show_regs(regs);
69255+ preempt_enable();
69256+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
69257+}
69258+#endif
69259+
69260+#ifdef CONFIG_PAX_USERCOPY
69261+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
69262+static noinline int check_stack_object(const void *obj, unsigned long len)
69263+{
69264+ const void * const stack = task_stack_page(current);
69265+ const void * const stackend = stack + THREAD_SIZE;
69266+
69267+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69268+ const void *frame = NULL;
69269+ const void *oldframe;
69270+#endif
69271+
69272+ if (obj + len < obj)
69273+ return -1;
69274+
69275+ if (obj + len <= stack || stackend <= obj)
69276+ return 0;
69277+
69278+ if (obj < stack || stackend < obj + len)
69279+ return -1;
69280+
69281+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69282+ oldframe = __builtin_frame_address(1);
69283+ if (oldframe)
69284+ frame = __builtin_frame_address(2);
69285+ /*
69286+ low ----------------------------------------------> high
69287+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
69288+ ^----------------^
69289+ allow copies only within here
69290+ */
69291+ while (stack <= frame && frame < stackend) {
69292+ /* if obj + len extends past the last frame, this
69293+ check won't pass and the next frame will be 0,
69294+ causing us to bail out and correctly report
69295+ the copy as invalid
69296+ */
69297+ if (obj + len <= frame)
69298+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
69299+ oldframe = frame;
69300+ frame = *(const void * const *)frame;
69301+ }
69302+ return -1;
69303+#else
69304+ return 1;
69305+#endif
69306+}
69307+
69308+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
69309+{
69310+ if (current->signal->curr_ip)
69311+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69312+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69313+ else
69314+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69315+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69316+ dump_stack();
69317+ gr_handle_kernel_exploit();
69318+ do_group_exit(SIGKILL);
69319+}
69320+#endif
69321+
69322+#ifdef CONFIG_PAX_USERCOPY
69323+
69324+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
69325+{
69326+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
69327+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
69328+#ifdef CONFIG_MODULES
69329+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
69330+#else
69331+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
69332+#endif
69333+
69334+#else
69335+ unsigned long textlow = (unsigned long)_stext;
69336+ unsigned long texthigh = (unsigned long)_etext;
69337+
69338+#ifdef CONFIG_X86_64
69339+ /* check against linear mapping as well */
69340+ if (high > (unsigned long)__va(__pa(textlow)) &&
69341+ low < (unsigned long)__va(__pa(texthigh)))
69342+ return true;
69343+#endif
69344+
69345+#endif
69346+
69347+ if (high <= textlow || low >= texthigh)
69348+ return false;
69349+ else
69350+ return true;
69351+}
69352+#endif
69353+
69354+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
69355+{
69356+#ifdef CONFIG_PAX_USERCOPY
69357+ const char *type;
69358+#endif
69359+
69360+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
69361+ unsigned long stackstart = (unsigned long)task_stack_page(current);
69362+ unsigned long currentsp = (unsigned long)&stackstart;
69363+ if (unlikely((currentsp < stackstart + 512 ||
69364+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
69365+ BUG();
69366+#endif
69367+
69368+#ifndef CONFIG_PAX_USERCOPY_DEBUG
69369+ if (const_size)
69370+ return;
69371+#endif
69372+
69373+#ifdef CONFIG_PAX_USERCOPY
69374+ if (!n)
69375+ return;
69376+
69377+ type = check_heap_object(ptr, n);
69378+ if (!type) {
69379+ int ret = check_stack_object(ptr, n);
69380+ if (ret == 1 || ret == 2)
69381+ return;
69382+ if (ret == 0) {
69383+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
69384+ type = "<kernel text>";
69385+ else
69386+ return;
69387+ } else
69388+ type = "<process stack>";
69389+ }
69390+
69391+ pax_report_usercopy(ptr, n, to_user, type);
69392+#endif
69393+
69394+}
69395+EXPORT_SYMBOL(__check_object_size);
69396+
69397+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
69398+void pax_track_stack(void)
69399+{
69400+ unsigned long sp = (unsigned long)&sp;
69401+ if (sp < current_thread_info()->lowest_stack &&
69402+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
69403+ current_thread_info()->lowest_stack = sp;
69404+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
69405+ BUG();
69406+}
69407+EXPORT_SYMBOL(pax_track_stack);
69408+#endif
69409+
69410+#ifdef CONFIG_PAX_SIZE_OVERFLOW
69411+void __nocapture(1, 3, 4) report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
69412+{
69413+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
69414+ dump_stack();
69415+ do_group_exit(SIGKILL);
69416+}
69417+EXPORT_SYMBOL(report_size_overflow);
69418+#endif
69419diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
69420index 9f9992b..8b59411 100644
69421--- a/fs/ext2/balloc.c
69422+++ b/fs/ext2/balloc.c
69423@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
69424
69425 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69426 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69427- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69428+ if (free_blocks < root_blocks + 1 &&
69429 !uid_eq(sbi->s_resuid, current_fsuid()) &&
69430 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69431- !in_group_p (sbi->s_resgid))) {
69432+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69433 return 0;
69434 }
69435 return 1;
69436diff --git a/fs/ext2/super.c b/fs/ext2/super.c
69437index d0e746e..82e06f0 100644
69438--- a/fs/ext2/super.c
69439+++ b/fs/ext2/super.c
69440@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
69441 #ifdef CONFIG_EXT2_FS_XATTR
69442 if (test_opt(sb, XATTR_USER))
69443 seq_puts(seq, ",user_xattr");
69444- if (!test_opt(sb, XATTR_USER) &&
69445- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
69446+ if (!test_opt(sb, XATTR_USER))
69447 seq_puts(seq, ",nouser_xattr");
69448- }
69449 #endif
69450
69451 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69452@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
69453 if (def_mount_opts & EXT2_DEFM_UID16)
69454 set_opt(sbi->s_mount_opt, NO_UID32);
69455 #ifdef CONFIG_EXT2_FS_XATTR
69456- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
69457- set_opt(sbi->s_mount_opt, XATTR_USER);
69458+ /* always enable user xattrs */
69459+ set_opt(sbi->s_mount_opt, XATTR_USER);
69460 #endif
69461 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69462 if (def_mount_opts & EXT2_DEFM_ACL)
69463diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
69464index 9142614..97484fa 100644
69465--- a/fs/ext2/xattr.c
69466+++ b/fs/ext2/xattr.c
69467@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
69468 struct buffer_head *bh = NULL;
69469 struct ext2_xattr_entry *entry;
69470 char *end;
69471- size_t rest = buffer_size;
69472+ size_t rest = buffer_size, total_size = 0;
69473 int error;
69474
69475 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
69476@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
69477 buffer += size;
69478 }
69479 rest -= size;
69480+ total_size += size;
69481 }
69482 }
69483- error = buffer_size - rest; /* total size */
69484+ error = total_size;
69485
69486 cleanup:
69487 brelse(bh);
69488diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
69489index 158b5d4..2432610 100644
69490--- a/fs/ext3/balloc.c
69491+++ b/fs/ext3/balloc.c
69492@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
69493
69494 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69495 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69496- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69497+ if (free_blocks < root_blocks + 1 &&
69498 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
69499 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69500- !in_group_p (sbi->s_resgid))) {
69501+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69502 return 0;
69503 }
69504 return 1;
69505diff --git a/fs/ext3/super.c b/fs/ext3/super.c
69506index d4dbf3c..906a6fb 100644
69507--- a/fs/ext3/super.c
69508+++ b/fs/ext3/super.c
69509@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
69510 #ifdef CONFIG_EXT3_FS_XATTR
69511 if (test_opt(sb, XATTR_USER))
69512 seq_puts(seq, ",user_xattr");
69513- if (!test_opt(sb, XATTR_USER) &&
69514- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
69515+ if (!test_opt(sb, XATTR_USER))
69516 seq_puts(seq, ",nouser_xattr");
69517- }
69518 #endif
69519 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69520 if (test_opt(sb, POSIX_ACL))
69521@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
69522 if (def_mount_opts & EXT3_DEFM_UID16)
69523 set_opt(sbi->s_mount_opt, NO_UID32);
69524 #ifdef CONFIG_EXT3_FS_XATTR
69525- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
69526- set_opt(sbi->s_mount_opt, XATTR_USER);
69527+ /* always enable user xattrs */
69528+ set_opt(sbi->s_mount_opt, XATTR_USER);
69529 #endif
69530 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69531 if (def_mount_opts & EXT3_DEFM_ACL)
69532diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
69533index c6874be..f8a6ae8 100644
69534--- a/fs/ext3/xattr.c
69535+++ b/fs/ext3/xattr.c
69536@@ -330,7 +330,7 @@ static int
69537 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69538 char *buffer, size_t buffer_size)
69539 {
69540- size_t rest = buffer_size;
69541+ size_t rest = buffer_size, total_size = 0;
69542
69543 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
69544 const struct xattr_handler *handler =
69545@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69546 buffer += size;
69547 }
69548 rest -= size;
69549+ total_size += size;
69550 }
69551 }
69552- return buffer_size - rest;
69553+ return total_size;
69554 }
69555
69556 static int
69557diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
69558index 83a6f49..d4e4d03 100644
69559--- a/fs/ext4/balloc.c
69560+++ b/fs/ext4/balloc.c
69561@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
69562 /* Hm, nope. Are (enough) root reserved clusters available? */
69563 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
69564 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
69565- capable(CAP_SYS_RESOURCE) ||
69566- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
69567+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
69568+ capable_nolog(CAP_SYS_RESOURCE)) {
69569
69570 if (free_clusters >= (nclusters + dirty_clusters +
69571 resv_clusters))
69572diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
69573index f63c3d5..3c1a033 100644
69574--- a/fs/ext4/ext4.h
69575+++ b/fs/ext4/ext4.h
69576@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
69577 unsigned long s_mb_last_start;
69578
69579 /* stats for buddy allocator */
69580- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
69581- atomic_t s_bal_success; /* we found long enough chunks */
69582- atomic_t s_bal_allocated; /* in blocks */
69583- atomic_t s_bal_ex_scanned; /* total extents scanned */
69584- atomic_t s_bal_goals; /* goal hits */
69585- atomic_t s_bal_breaks; /* too long searches */
69586- atomic_t s_bal_2orders; /* 2^order hits */
69587+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
69588+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
69589+ atomic_unchecked_t s_bal_allocated; /* in blocks */
69590+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
69591+ atomic_unchecked_t s_bal_goals; /* goal hits */
69592+ atomic_unchecked_t s_bal_breaks; /* too long searches */
69593+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
69594 spinlock_t s_bal_lock;
69595 unsigned long s_mb_buddies_generated;
69596 unsigned long long s_mb_generation_time;
69597- atomic_t s_mb_lost_chunks;
69598- atomic_t s_mb_preallocated;
69599- atomic_t s_mb_discarded;
69600+ atomic_unchecked_t s_mb_lost_chunks;
69601+ atomic_unchecked_t s_mb_preallocated;
69602+ atomic_unchecked_t s_mb_discarded;
69603 atomic_t s_lock_busy;
69604
69605 /* locality groups */
69606diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
69607index 8d1e602..abf497b 100644
69608--- a/fs/ext4/mballoc.c
69609+++ b/fs/ext4/mballoc.c
69610@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
69611 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
69612
69613 if (EXT4_SB(sb)->s_mb_stats)
69614- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
69615+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
69616
69617 break;
69618 }
69619@@ -2211,7 +2211,7 @@ repeat:
69620 ac->ac_status = AC_STATUS_CONTINUE;
69621 ac->ac_flags |= EXT4_MB_HINT_FIRST;
69622 cr = 3;
69623- atomic_inc(&sbi->s_mb_lost_chunks);
69624+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
69625 goto repeat;
69626 }
69627 }
69628@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
69629 if (sbi->s_mb_stats) {
69630 ext4_msg(sb, KERN_INFO,
69631 "mballoc: %u blocks %u reqs (%u success)",
69632- atomic_read(&sbi->s_bal_allocated),
69633- atomic_read(&sbi->s_bal_reqs),
69634- atomic_read(&sbi->s_bal_success));
69635+ atomic_read_unchecked(&sbi->s_bal_allocated),
69636+ atomic_read_unchecked(&sbi->s_bal_reqs),
69637+ atomic_read_unchecked(&sbi->s_bal_success));
69638 ext4_msg(sb, KERN_INFO,
69639 "mballoc: %u extents scanned, %u goal hits, "
69640 "%u 2^N hits, %u breaks, %u lost",
69641- atomic_read(&sbi->s_bal_ex_scanned),
69642- atomic_read(&sbi->s_bal_goals),
69643- atomic_read(&sbi->s_bal_2orders),
69644- atomic_read(&sbi->s_bal_breaks),
69645- atomic_read(&sbi->s_mb_lost_chunks));
69646+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
69647+ atomic_read_unchecked(&sbi->s_bal_goals),
69648+ atomic_read_unchecked(&sbi->s_bal_2orders),
69649+ atomic_read_unchecked(&sbi->s_bal_breaks),
69650+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
69651 ext4_msg(sb, KERN_INFO,
69652 "mballoc: %lu generated and it took %Lu",
69653 sbi->s_mb_buddies_generated,
69654 sbi->s_mb_generation_time);
69655 ext4_msg(sb, KERN_INFO,
69656 "mballoc: %u preallocated, %u discarded",
69657- atomic_read(&sbi->s_mb_preallocated),
69658- atomic_read(&sbi->s_mb_discarded));
69659+ atomic_read_unchecked(&sbi->s_mb_preallocated),
69660+ atomic_read_unchecked(&sbi->s_mb_discarded));
69661 }
69662
69663 free_percpu(sbi->s_locality_groups);
69664@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
69665 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
69666
69667 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
69668- atomic_inc(&sbi->s_bal_reqs);
69669- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69670+ atomic_inc_unchecked(&sbi->s_bal_reqs);
69671+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69672 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
69673- atomic_inc(&sbi->s_bal_success);
69674- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
69675+ atomic_inc_unchecked(&sbi->s_bal_success);
69676+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
69677 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
69678 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
69679- atomic_inc(&sbi->s_bal_goals);
69680+ atomic_inc_unchecked(&sbi->s_bal_goals);
69681 if (ac->ac_found > sbi->s_mb_max_to_scan)
69682- atomic_inc(&sbi->s_bal_breaks);
69683+ atomic_inc_unchecked(&sbi->s_bal_breaks);
69684 }
69685
69686 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
69687@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
69688 trace_ext4_mb_new_inode_pa(ac, pa);
69689
69690 ext4_mb_use_inode_pa(ac, pa);
69691- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
69692+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
69693
69694 ei = EXT4_I(ac->ac_inode);
69695 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69696@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
69697 trace_ext4_mb_new_group_pa(ac, pa);
69698
69699 ext4_mb_use_group_pa(ac, pa);
69700- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69701+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69702
69703 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69704 lg = ac->ac_lg;
69705@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
69706 * from the bitmap and continue.
69707 */
69708 }
69709- atomic_add(free, &sbi->s_mb_discarded);
69710+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
69711
69712 return err;
69713 }
69714@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
69715 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
69716 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
69717 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
69718- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69719+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69720 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
69721
69722 return 0;
69723diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
69724index 8313ca3..8a37d08 100644
69725--- a/fs/ext4/mmp.c
69726+++ b/fs/ext4/mmp.c
69727@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
69728 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
69729 const char *function, unsigned int line, const char *msg)
69730 {
69731- __ext4_warning(sb, function, line, msg);
69732+ __ext4_warning(sb, function, line, "%s", msg);
69733 __ext4_warning(sb, function, line,
69734 "MMP failure info: last update time: %llu, last update "
69735 "node: %s, last update device: %s\n",
69736diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
69737index 8a8ec62..1b02de5 100644
69738--- a/fs/ext4/resize.c
69739+++ b/fs/ext4/resize.c
69740@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69741
69742 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
69743 for (count2 = count; count > 0; count -= count2, block += count2) {
69744- ext4_fsblk_t start;
69745+ ext4_fsblk_t start, diff;
69746 struct buffer_head *bh;
69747 ext4_group_t group;
69748 int err;
69749@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69750 start = ext4_group_first_block_no(sb, group);
69751 group -= flex_gd->groups[0].group;
69752
69753- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
69754- if (count2 > count)
69755- count2 = count;
69756-
69757 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
69758 BUG_ON(flex_gd->count > 1);
69759 continue;
69760@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69761 err = ext4_journal_get_write_access(handle, bh);
69762 if (err)
69763 return err;
69764+
69765+ diff = block - start;
69766+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
69767+ if (count2 > count)
69768+ count2 = count;
69769+
69770 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
69771- block - start, count2);
69772- ext4_set_bits(bh->b_data, block - start, count2);
69773+ diff, count2);
69774+ ext4_set_bits(bh->b_data, diff, count2);
69775
69776 err = ext4_handle_dirty_metadata(handle, NULL, bh);
69777 if (unlikely(err))
69778diff --git a/fs/ext4/super.c b/fs/ext4/super.c
69779index e061e66..87bc092 100644
69780--- a/fs/ext4/super.c
69781+++ b/fs/ext4/super.c
69782@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
69783 }
69784
69785 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
69786-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69787+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69788 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
69789
69790 #ifdef CONFIG_QUOTA
69791@@ -2443,7 +2443,7 @@ struct ext4_attr {
69792 int offset;
69793 int deprecated_val;
69794 } u;
69795-};
69796+} __do_const;
69797
69798 static int parse_strtoull(const char *buf,
69799 unsigned long long max, unsigned long long *value)
69800diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
69801index 1e09fc7..0400dd4 100644
69802--- a/fs/ext4/xattr.c
69803+++ b/fs/ext4/xattr.c
69804@@ -399,7 +399,7 @@ static int
69805 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69806 char *buffer, size_t buffer_size)
69807 {
69808- size_t rest = buffer_size;
69809+ size_t rest = buffer_size, total_size = 0;
69810
69811 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
69812 const struct xattr_handler *handler =
69813@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69814 buffer += size;
69815 }
69816 rest -= size;
69817+ total_size += size;
69818 }
69819 }
69820- return buffer_size - rest;
69821+ return total_size;
69822 }
69823
69824 static int
69825diff --git a/fs/fcntl.c b/fs/fcntl.c
69826index ee85cd4..9dd0d20 100644
69827--- a/fs/fcntl.c
69828+++ b/fs/fcntl.c
69829@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
69830 int force)
69831 {
69832 security_file_set_fowner(filp);
69833+ if (gr_handle_chroot_fowner(pid, type))
69834+ return;
69835+ if (gr_check_protected_task_fowner(pid, type))
69836+ return;
69837 f_modown(filp, pid, type, force);
69838 }
69839 EXPORT_SYMBOL(__f_setown);
69840diff --git a/fs/fhandle.c b/fs/fhandle.c
69841index d59712d..2281df9 100644
69842--- a/fs/fhandle.c
69843+++ b/fs/fhandle.c
69844@@ -8,6 +8,7 @@
69845 #include <linux/fs_struct.h>
69846 #include <linux/fsnotify.h>
69847 #include <linux/personality.h>
69848+#include <linux/grsecurity.h>
69849 #include <asm/uaccess.h>
69850 #include "internal.h"
69851 #include "mount.h"
69852@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
69853 } else
69854 retval = 0;
69855 /* copy the mount id */
69856- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
69857- sizeof(*mnt_id)) ||
69858+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
69859 copy_to_user(ufh, handle,
69860 sizeof(struct file_handle) + handle_bytes))
69861 retval = -EFAULT;
69862@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
69863 * the directory. Ideally we would like CAP_DAC_SEARCH.
69864 * But we don't have that
69865 */
69866- if (!capable(CAP_DAC_READ_SEARCH)) {
69867+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
69868 retval = -EPERM;
69869 goto out_err;
69870 }
69871diff --git a/fs/file.c b/fs/file.c
69872index ee738ea..f6c15629 100644
69873--- a/fs/file.c
69874+++ b/fs/file.c
69875@@ -16,6 +16,7 @@
69876 #include <linux/slab.h>
69877 #include <linux/vmalloc.h>
69878 #include <linux/file.h>
69879+#include <linux/security.h>
69880 #include <linux/fdtable.h>
69881 #include <linux/bitops.h>
69882 #include <linux/interrupt.h>
69883@@ -139,7 +140,7 @@ out:
69884 * Return <0 error code on error; 1 on successful completion.
69885 * The files->file_lock should be held on entry, and will be held on exit.
69886 */
69887-static int expand_fdtable(struct files_struct *files, int nr)
69888+static int expand_fdtable(struct files_struct *files, unsigned int nr)
69889 __releases(files->file_lock)
69890 __acquires(files->file_lock)
69891 {
69892@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
69893 * expanded and execution may have blocked.
69894 * The files->file_lock should be held on entry, and will be held on exit.
69895 */
69896-static int expand_files(struct files_struct *files, int nr)
69897+static int expand_files(struct files_struct *files, unsigned int nr)
69898 {
69899 struct fdtable *fdt;
69900
69901@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
69902 if (!file)
69903 return __close_fd(files, fd);
69904
69905+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
69906 if (fd >= rlimit(RLIMIT_NOFILE))
69907 return -EBADF;
69908
69909@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
69910 if (unlikely(oldfd == newfd))
69911 return -EINVAL;
69912
69913+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
69914 if (newfd >= rlimit(RLIMIT_NOFILE))
69915 return -EBADF;
69916
69917@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
69918 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
69919 {
69920 int err;
69921+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
69922 if (from >= rlimit(RLIMIT_NOFILE))
69923 return -EINVAL;
69924 err = alloc_fd(from, flags);
69925diff --git a/fs/filesystems.c b/fs/filesystems.c
69926index 5797d45..7d7d79a 100644
69927--- a/fs/filesystems.c
69928+++ b/fs/filesystems.c
69929@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
69930 int len = dot ? dot - name : strlen(name);
69931
69932 fs = __get_fs_type(name, len);
69933+#ifdef CONFIG_GRKERNSEC_MODHARDEN
69934+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
69935+#else
69936 if (!fs && (request_module("fs-%.*s", len, name) == 0))
69937+#endif
69938 fs = __get_fs_type(name, len);
69939
69940 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
69941diff --git a/fs/fs_struct.c b/fs/fs_struct.c
69942index 7dca743..1ff87ae 100644
69943--- a/fs/fs_struct.c
69944+++ b/fs/fs_struct.c
69945@@ -4,6 +4,7 @@
69946 #include <linux/path.h>
69947 #include <linux/slab.h>
69948 #include <linux/fs_struct.h>
69949+#include <linux/grsecurity.h>
69950 #include "internal.h"
69951
69952 /*
69953@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
69954 struct path old_root;
69955
69956 path_get(path);
69957+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
69958 spin_lock(&fs->lock);
69959 write_seqcount_begin(&fs->seq);
69960 old_root = fs->root;
69961 fs->root = *path;
69962+ gr_set_chroot_entries(current, path);
69963 write_seqcount_end(&fs->seq);
69964 spin_unlock(&fs->lock);
69965- if (old_root.dentry)
69966+ if (old_root.dentry) {
69967+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
69968 path_put(&old_root);
69969+ }
69970 }
69971
69972 /*
69973@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
69974 int hits = 0;
69975 spin_lock(&fs->lock);
69976 write_seqcount_begin(&fs->seq);
69977+ /* this root replacement is only done by pivot_root,
69978+ leave grsec's chroot tagging alone for this task
69979+ so that a pivoted root isn't treated as a chroot
69980+ */
69981 hits += replace_path(&fs->root, old_root, new_root);
69982 hits += replace_path(&fs->pwd, old_root, new_root);
69983 write_seqcount_end(&fs->seq);
69984@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
69985
69986 void free_fs_struct(struct fs_struct *fs)
69987 {
69988+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
69989 path_put(&fs->root);
69990 path_put(&fs->pwd);
69991 kmem_cache_free(fs_cachep, fs);
69992@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
69993 task_lock(tsk);
69994 spin_lock(&fs->lock);
69995 tsk->fs = NULL;
69996- kill = !--fs->users;
69997+ gr_clear_chroot_entries(tsk);
69998+ kill = !atomic_dec_return(&fs->users);
69999 spin_unlock(&fs->lock);
70000 task_unlock(tsk);
70001 if (kill)
70002@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70003 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
70004 /* We don't need to lock fs - think why ;-) */
70005 if (fs) {
70006- fs->users = 1;
70007+ atomic_set(&fs->users, 1);
70008 fs->in_exec = 0;
70009 spin_lock_init(&fs->lock);
70010 seqcount_init(&fs->seq);
70011@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70012 spin_lock(&old->lock);
70013 fs->root = old->root;
70014 path_get(&fs->root);
70015+ /* instead of calling gr_set_chroot_entries here,
70016+ we call it from every caller of this function
70017+ */
70018 fs->pwd = old->pwd;
70019 path_get(&fs->pwd);
70020 spin_unlock(&old->lock);
70021+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70022 }
70023 return fs;
70024 }
70025@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
70026
70027 task_lock(current);
70028 spin_lock(&fs->lock);
70029- kill = !--fs->users;
70030+ kill = !atomic_dec_return(&fs->users);
70031 current->fs = new_fs;
70032+ gr_set_chroot_entries(current, &new_fs->root);
70033 spin_unlock(&fs->lock);
70034 task_unlock(current);
70035
70036@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
70037
70038 int current_umask(void)
70039 {
70040- return current->fs->umask;
70041+ return current->fs->umask | gr_acl_umask();
70042 }
70043 EXPORT_SYMBOL(current_umask);
70044
70045 /* to be mentioned only in INIT_TASK */
70046 struct fs_struct init_fs = {
70047- .users = 1,
70048+ .users = ATOMIC_INIT(1),
70049 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
70050 .seq = SEQCNT_ZERO(init_fs.seq),
70051 .umask = 0022,
70052diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
70053index 89acec7..a575262 100644
70054--- a/fs/fscache/cookie.c
70055+++ b/fs/fscache/cookie.c
70056@@ -19,7 +19,7 @@
70057
70058 struct kmem_cache *fscache_cookie_jar;
70059
70060-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
70061+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
70062
70063 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
70064 static int fscache_alloc_object(struct fscache_cache *cache,
70065@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
70066 parent ? (char *) parent->def->name : "<no-parent>",
70067 def->name, netfs_data, enable);
70068
70069- fscache_stat(&fscache_n_acquires);
70070+ fscache_stat_unchecked(&fscache_n_acquires);
70071
70072 /* if there's no parent cookie, then we don't create one here either */
70073 if (!parent) {
70074- fscache_stat(&fscache_n_acquires_null);
70075+ fscache_stat_unchecked(&fscache_n_acquires_null);
70076 _leave(" [no parent]");
70077 return NULL;
70078 }
70079@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70080 /* allocate and initialise a cookie */
70081 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
70082 if (!cookie) {
70083- fscache_stat(&fscache_n_acquires_oom);
70084+ fscache_stat_unchecked(&fscache_n_acquires_oom);
70085 _leave(" [ENOMEM]");
70086 return NULL;
70087 }
70088@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
70089
70090 switch (cookie->def->type) {
70091 case FSCACHE_COOKIE_TYPE_INDEX:
70092- fscache_stat(&fscache_n_cookie_index);
70093+ fscache_stat_unchecked(&fscache_n_cookie_index);
70094 break;
70095 case FSCACHE_COOKIE_TYPE_DATAFILE:
70096- fscache_stat(&fscache_n_cookie_data);
70097+ fscache_stat_unchecked(&fscache_n_cookie_data);
70098 break;
70099 default:
70100- fscache_stat(&fscache_n_cookie_special);
70101+ fscache_stat_unchecked(&fscache_n_cookie_special);
70102 break;
70103 }
70104
70105@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70106 } else {
70107 atomic_dec(&parent->n_children);
70108 __fscache_cookie_put(cookie);
70109- fscache_stat(&fscache_n_acquires_nobufs);
70110+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
70111 _leave(" = NULL");
70112 return NULL;
70113 }
70114@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70115 }
70116 }
70117
70118- fscache_stat(&fscache_n_acquires_ok);
70119+ fscache_stat_unchecked(&fscache_n_acquires_ok);
70120 _leave(" = %p", cookie);
70121 return cookie;
70122 }
70123@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
70124 cache = fscache_select_cache_for_object(cookie->parent);
70125 if (!cache) {
70126 up_read(&fscache_addremove_sem);
70127- fscache_stat(&fscache_n_acquires_no_cache);
70128+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
70129 _leave(" = -ENOMEDIUM [no cache]");
70130 return -ENOMEDIUM;
70131 }
70132@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
70133 object = cache->ops->alloc_object(cache, cookie);
70134 fscache_stat_d(&fscache_n_cop_alloc_object);
70135 if (IS_ERR(object)) {
70136- fscache_stat(&fscache_n_object_no_alloc);
70137+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
70138 ret = PTR_ERR(object);
70139 goto error;
70140 }
70141
70142- fscache_stat(&fscache_n_object_alloc);
70143+ fscache_stat_unchecked(&fscache_n_object_alloc);
70144
70145- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
70146+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
70147
70148 _debug("ALLOC OBJ%x: %s {%lx}",
70149 object->debug_id, cookie->def->name, object->events);
70150@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
70151
70152 _enter("{%s}", cookie->def->name);
70153
70154- fscache_stat(&fscache_n_invalidates);
70155+ fscache_stat_unchecked(&fscache_n_invalidates);
70156
70157 /* Only permit invalidation of data files. Invalidating an index will
70158 * require the caller to release all its attachments to the tree rooted
70159@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
70160 {
70161 struct fscache_object *object;
70162
70163- fscache_stat(&fscache_n_updates);
70164+ fscache_stat_unchecked(&fscache_n_updates);
70165
70166 if (!cookie) {
70167- fscache_stat(&fscache_n_updates_null);
70168+ fscache_stat_unchecked(&fscache_n_updates_null);
70169 _leave(" [no cookie]");
70170 return;
70171 }
70172@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
70173 */
70174 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
70175 {
70176- fscache_stat(&fscache_n_relinquishes);
70177+ fscache_stat_unchecked(&fscache_n_relinquishes);
70178 if (retire)
70179- fscache_stat(&fscache_n_relinquishes_retire);
70180+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
70181
70182 if (!cookie) {
70183- fscache_stat(&fscache_n_relinquishes_null);
70184+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
70185 _leave(" [no cookie]");
70186 return;
70187 }
70188@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
70189 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
70190 goto inconsistent;
70191
70192- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
70193+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
70194
70195 __fscache_use_cookie(cookie);
70196 if (fscache_submit_op(object, op) < 0)
70197diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
70198index 7872a62..d91b19f 100644
70199--- a/fs/fscache/internal.h
70200+++ b/fs/fscache/internal.h
70201@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
70202 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
70203 extern int fscache_wait_for_operation_activation(struct fscache_object *,
70204 struct fscache_operation *,
70205- atomic_t *,
70206- atomic_t *,
70207+ atomic_unchecked_t *,
70208+ atomic_unchecked_t *,
70209 void (*)(struct fscache_operation *));
70210 extern void fscache_invalidate_writes(struct fscache_cookie *);
70211
70212@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
70213 * stats.c
70214 */
70215 #ifdef CONFIG_FSCACHE_STATS
70216-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70217-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70218+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70219+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70220
70221-extern atomic_t fscache_n_op_pend;
70222-extern atomic_t fscache_n_op_run;
70223-extern atomic_t fscache_n_op_enqueue;
70224-extern atomic_t fscache_n_op_deferred_release;
70225-extern atomic_t fscache_n_op_release;
70226-extern atomic_t fscache_n_op_gc;
70227-extern atomic_t fscache_n_op_cancelled;
70228-extern atomic_t fscache_n_op_rejected;
70229+extern atomic_unchecked_t fscache_n_op_pend;
70230+extern atomic_unchecked_t fscache_n_op_run;
70231+extern atomic_unchecked_t fscache_n_op_enqueue;
70232+extern atomic_unchecked_t fscache_n_op_deferred_release;
70233+extern atomic_unchecked_t fscache_n_op_release;
70234+extern atomic_unchecked_t fscache_n_op_gc;
70235+extern atomic_unchecked_t fscache_n_op_cancelled;
70236+extern atomic_unchecked_t fscache_n_op_rejected;
70237
70238-extern atomic_t fscache_n_attr_changed;
70239-extern atomic_t fscache_n_attr_changed_ok;
70240-extern atomic_t fscache_n_attr_changed_nobufs;
70241-extern atomic_t fscache_n_attr_changed_nomem;
70242-extern atomic_t fscache_n_attr_changed_calls;
70243+extern atomic_unchecked_t fscache_n_attr_changed;
70244+extern atomic_unchecked_t fscache_n_attr_changed_ok;
70245+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
70246+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
70247+extern atomic_unchecked_t fscache_n_attr_changed_calls;
70248
70249-extern atomic_t fscache_n_allocs;
70250-extern atomic_t fscache_n_allocs_ok;
70251-extern atomic_t fscache_n_allocs_wait;
70252-extern atomic_t fscache_n_allocs_nobufs;
70253-extern atomic_t fscache_n_allocs_intr;
70254-extern atomic_t fscache_n_allocs_object_dead;
70255-extern atomic_t fscache_n_alloc_ops;
70256-extern atomic_t fscache_n_alloc_op_waits;
70257+extern atomic_unchecked_t fscache_n_allocs;
70258+extern atomic_unchecked_t fscache_n_allocs_ok;
70259+extern atomic_unchecked_t fscache_n_allocs_wait;
70260+extern atomic_unchecked_t fscache_n_allocs_nobufs;
70261+extern atomic_unchecked_t fscache_n_allocs_intr;
70262+extern atomic_unchecked_t fscache_n_allocs_object_dead;
70263+extern atomic_unchecked_t fscache_n_alloc_ops;
70264+extern atomic_unchecked_t fscache_n_alloc_op_waits;
70265
70266-extern atomic_t fscache_n_retrievals;
70267-extern atomic_t fscache_n_retrievals_ok;
70268-extern atomic_t fscache_n_retrievals_wait;
70269-extern atomic_t fscache_n_retrievals_nodata;
70270-extern atomic_t fscache_n_retrievals_nobufs;
70271-extern atomic_t fscache_n_retrievals_intr;
70272-extern atomic_t fscache_n_retrievals_nomem;
70273-extern atomic_t fscache_n_retrievals_object_dead;
70274-extern atomic_t fscache_n_retrieval_ops;
70275-extern atomic_t fscache_n_retrieval_op_waits;
70276+extern atomic_unchecked_t fscache_n_retrievals;
70277+extern atomic_unchecked_t fscache_n_retrievals_ok;
70278+extern atomic_unchecked_t fscache_n_retrievals_wait;
70279+extern atomic_unchecked_t fscache_n_retrievals_nodata;
70280+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
70281+extern atomic_unchecked_t fscache_n_retrievals_intr;
70282+extern atomic_unchecked_t fscache_n_retrievals_nomem;
70283+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
70284+extern atomic_unchecked_t fscache_n_retrieval_ops;
70285+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
70286
70287-extern atomic_t fscache_n_stores;
70288-extern atomic_t fscache_n_stores_ok;
70289-extern atomic_t fscache_n_stores_again;
70290-extern atomic_t fscache_n_stores_nobufs;
70291-extern atomic_t fscache_n_stores_oom;
70292-extern atomic_t fscache_n_store_ops;
70293-extern atomic_t fscache_n_store_calls;
70294-extern atomic_t fscache_n_store_pages;
70295-extern atomic_t fscache_n_store_radix_deletes;
70296-extern atomic_t fscache_n_store_pages_over_limit;
70297+extern atomic_unchecked_t fscache_n_stores;
70298+extern atomic_unchecked_t fscache_n_stores_ok;
70299+extern atomic_unchecked_t fscache_n_stores_again;
70300+extern atomic_unchecked_t fscache_n_stores_nobufs;
70301+extern atomic_unchecked_t fscache_n_stores_oom;
70302+extern atomic_unchecked_t fscache_n_store_ops;
70303+extern atomic_unchecked_t fscache_n_store_calls;
70304+extern atomic_unchecked_t fscache_n_store_pages;
70305+extern atomic_unchecked_t fscache_n_store_radix_deletes;
70306+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
70307
70308-extern atomic_t fscache_n_store_vmscan_not_storing;
70309-extern atomic_t fscache_n_store_vmscan_gone;
70310-extern atomic_t fscache_n_store_vmscan_busy;
70311-extern atomic_t fscache_n_store_vmscan_cancelled;
70312-extern atomic_t fscache_n_store_vmscan_wait;
70313+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
70314+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
70315+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
70316+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
70317+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
70318
70319-extern atomic_t fscache_n_marks;
70320-extern atomic_t fscache_n_uncaches;
70321+extern atomic_unchecked_t fscache_n_marks;
70322+extern atomic_unchecked_t fscache_n_uncaches;
70323
70324-extern atomic_t fscache_n_acquires;
70325-extern atomic_t fscache_n_acquires_null;
70326-extern atomic_t fscache_n_acquires_no_cache;
70327-extern atomic_t fscache_n_acquires_ok;
70328-extern atomic_t fscache_n_acquires_nobufs;
70329-extern atomic_t fscache_n_acquires_oom;
70330+extern atomic_unchecked_t fscache_n_acquires;
70331+extern atomic_unchecked_t fscache_n_acquires_null;
70332+extern atomic_unchecked_t fscache_n_acquires_no_cache;
70333+extern atomic_unchecked_t fscache_n_acquires_ok;
70334+extern atomic_unchecked_t fscache_n_acquires_nobufs;
70335+extern atomic_unchecked_t fscache_n_acquires_oom;
70336
70337-extern atomic_t fscache_n_invalidates;
70338-extern atomic_t fscache_n_invalidates_run;
70339+extern atomic_unchecked_t fscache_n_invalidates;
70340+extern atomic_unchecked_t fscache_n_invalidates_run;
70341
70342-extern atomic_t fscache_n_updates;
70343-extern atomic_t fscache_n_updates_null;
70344-extern atomic_t fscache_n_updates_run;
70345+extern atomic_unchecked_t fscache_n_updates;
70346+extern atomic_unchecked_t fscache_n_updates_null;
70347+extern atomic_unchecked_t fscache_n_updates_run;
70348
70349-extern atomic_t fscache_n_relinquishes;
70350-extern atomic_t fscache_n_relinquishes_null;
70351-extern atomic_t fscache_n_relinquishes_waitcrt;
70352-extern atomic_t fscache_n_relinquishes_retire;
70353+extern atomic_unchecked_t fscache_n_relinquishes;
70354+extern atomic_unchecked_t fscache_n_relinquishes_null;
70355+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
70356+extern atomic_unchecked_t fscache_n_relinquishes_retire;
70357
70358-extern atomic_t fscache_n_cookie_index;
70359-extern atomic_t fscache_n_cookie_data;
70360-extern atomic_t fscache_n_cookie_special;
70361+extern atomic_unchecked_t fscache_n_cookie_index;
70362+extern atomic_unchecked_t fscache_n_cookie_data;
70363+extern atomic_unchecked_t fscache_n_cookie_special;
70364
70365-extern atomic_t fscache_n_object_alloc;
70366-extern atomic_t fscache_n_object_no_alloc;
70367-extern atomic_t fscache_n_object_lookups;
70368-extern atomic_t fscache_n_object_lookups_negative;
70369-extern atomic_t fscache_n_object_lookups_positive;
70370-extern atomic_t fscache_n_object_lookups_timed_out;
70371-extern atomic_t fscache_n_object_created;
70372-extern atomic_t fscache_n_object_avail;
70373-extern atomic_t fscache_n_object_dead;
70374+extern atomic_unchecked_t fscache_n_object_alloc;
70375+extern atomic_unchecked_t fscache_n_object_no_alloc;
70376+extern atomic_unchecked_t fscache_n_object_lookups;
70377+extern atomic_unchecked_t fscache_n_object_lookups_negative;
70378+extern atomic_unchecked_t fscache_n_object_lookups_positive;
70379+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
70380+extern atomic_unchecked_t fscache_n_object_created;
70381+extern atomic_unchecked_t fscache_n_object_avail;
70382+extern atomic_unchecked_t fscache_n_object_dead;
70383
70384-extern atomic_t fscache_n_checkaux_none;
70385-extern atomic_t fscache_n_checkaux_okay;
70386-extern atomic_t fscache_n_checkaux_update;
70387-extern atomic_t fscache_n_checkaux_obsolete;
70388+extern atomic_unchecked_t fscache_n_checkaux_none;
70389+extern atomic_unchecked_t fscache_n_checkaux_okay;
70390+extern atomic_unchecked_t fscache_n_checkaux_update;
70391+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
70392
70393 extern atomic_t fscache_n_cop_alloc_object;
70394 extern atomic_t fscache_n_cop_lookup_object;
70395@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
70396 atomic_inc(stat);
70397 }
70398
70399+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
70400+{
70401+ atomic_inc_unchecked(stat);
70402+}
70403+
70404 static inline void fscache_stat_d(atomic_t *stat)
70405 {
70406 atomic_dec(stat);
70407@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
70408
70409 #define __fscache_stat(stat) (NULL)
70410 #define fscache_stat(stat) do {} while (0)
70411+#define fscache_stat_unchecked(stat) do {} while (0)
70412 #define fscache_stat_d(stat) do {} while (0)
70413 #endif
70414
70415diff --git a/fs/fscache/object.c b/fs/fscache/object.c
70416index da032da..0076ce7 100644
70417--- a/fs/fscache/object.c
70418+++ b/fs/fscache/object.c
70419@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70420 _debug("LOOKUP \"%s\" in \"%s\"",
70421 cookie->def->name, object->cache->tag->name);
70422
70423- fscache_stat(&fscache_n_object_lookups);
70424+ fscache_stat_unchecked(&fscache_n_object_lookups);
70425 fscache_stat(&fscache_n_cop_lookup_object);
70426 ret = object->cache->ops->lookup_object(object);
70427 fscache_stat_d(&fscache_n_cop_lookup_object);
70428@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70429 if (ret == -ETIMEDOUT) {
70430 /* probably stuck behind another object, so move this one to
70431 * the back of the queue */
70432- fscache_stat(&fscache_n_object_lookups_timed_out);
70433+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
70434 _leave(" [timeout]");
70435 return NO_TRANSIT;
70436 }
70437@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
70438 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
70439
70440 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70441- fscache_stat(&fscache_n_object_lookups_negative);
70442+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
70443
70444 /* Allow write requests to begin stacking up and read requests to begin
70445 * returning ENODATA.
70446@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
70447 /* if we were still looking up, then we must have a positive lookup
70448 * result, in which case there may be data available */
70449 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70450- fscache_stat(&fscache_n_object_lookups_positive);
70451+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
70452
70453 /* We do (presumably) have data */
70454 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
70455@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
70456 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
70457 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
70458 } else {
70459- fscache_stat(&fscache_n_object_created);
70460+ fscache_stat_unchecked(&fscache_n_object_created);
70461 }
70462
70463 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
70464@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
70465 fscache_stat_d(&fscache_n_cop_lookup_complete);
70466
70467 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
70468- fscache_stat(&fscache_n_object_avail);
70469+ fscache_stat_unchecked(&fscache_n_object_avail);
70470
70471 _leave("");
70472 return transit_to(JUMPSTART_DEPS);
70473@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
70474
70475 /* this just shifts the object release to the work processor */
70476 fscache_put_object(object);
70477- fscache_stat(&fscache_n_object_dead);
70478+ fscache_stat_unchecked(&fscache_n_object_dead);
70479
70480 _leave("");
70481 return transit_to(OBJECT_DEAD);
70482@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70483 enum fscache_checkaux result;
70484
70485 if (!object->cookie->def->check_aux) {
70486- fscache_stat(&fscache_n_checkaux_none);
70487+ fscache_stat_unchecked(&fscache_n_checkaux_none);
70488 return FSCACHE_CHECKAUX_OKAY;
70489 }
70490
70491@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70492 switch (result) {
70493 /* entry okay as is */
70494 case FSCACHE_CHECKAUX_OKAY:
70495- fscache_stat(&fscache_n_checkaux_okay);
70496+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
70497 break;
70498
70499 /* entry requires update */
70500 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
70501- fscache_stat(&fscache_n_checkaux_update);
70502+ fscache_stat_unchecked(&fscache_n_checkaux_update);
70503 break;
70504
70505 /* entry requires deletion */
70506 case FSCACHE_CHECKAUX_OBSOLETE:
70507- fscache_stat(&fscache_n_checkaux_obsolete);
70508+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
70509 break;
70510
70511 default:
70512@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
70513 {
70514 const struct fscache_state *s;
70515
70516- fscache_stat(&fscache_n_invalidates_run);
70517+ fscache_stat_unchecked(&fscache_n_invalidates_run);
70518 fscache_stat(&fscache_n_cop_invalidate_object);
70519 s = _fscache_invalidate_object(object, event);
70520 fscache_stat_d(&fscache_n_cop_invalidate_object);
70521@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
70522 {
70523 _enter("{OBJ%x},%d", object->debug_id, event);
70524
70525- fscache_stat(&fscache_n_updates_run);
70526+ fscache_stat_unchecked(&fscache_n_updates_run);
70527 fscache_stat(&fscache_n_cop_update_object);
70528 object->cache->ops->update_object(object);
70529 fscache_stat_d(&fscache_n_cop_update_object);
70530diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
70531index e7b87a0..a85d47a 100644
70532--- a/fs/fscache/operation.c
70533+++ b/fs/fscache/operation.c
70534@@ -17,7 +17,7 @@
70535 #include <linux/slab.h>
70536 #include "internal.h"
70537
70538-atomic_t fscache_op_debug_id;
70539+atomic_unchecked_t fscache_op_debug_id;
70540 EXPORT_SYMBOL(fscache_op_debug_id);
70541
70542 /**
70543@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
70544 ASSERTCMP(atomic_read(&op->usage), >, 0);
70545 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
70546
70547- fscache_stat(&fscache_n_op_enqueue);
70548+ fscache_stat_unchecked(&fscache_n_op_enqueue);
70549 switch (op->flags & FSCACHE_OP_TYPE) {
70550 case FSCACHE_OP_ASYNC:
70551 _debug("queue async");
70552@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
70553 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
70554 if (op->processor)
70555 fscache_enqueue_operation(op);
70556- fscache_stat(&fscache_n_op_run);
70557+ fscache_stat_unchecked(&fscache_n_op_run);
70558 }
70559
70560 /*
70561@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70562 if (object->n_in_progress > 0) {
70563 atomic_inc(&op->usage);
70564 list_add_tail(&op->pend_link, &object->pending_ops);
70565- fscache_stat(&fscache_n_op_pend);
70566+ fscache_stat_unchecked(&fscache_n_op_pend);
70567 } else if (!list_empty(&object->pending_ops)) {
70568 atomic_inc(&op->usage);
70569 list_add_tail(&op->pend_link, &object->pending_ops);
70570- fscache_stat(&fscache_n_op_pend);
70571+ fscache_stat_unchecked(&fscache_n_op_pend);
70572 fscache_start_operations(object);
70573 } else {
70574 ASSERTCMP(object->n_in_progress, ==, 0);
70575@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70576 object->n_exclusive++; /* reads and writes must wait */
70577 atomic_inc(&op->usage);
70578 list_add_tail(&op->pend_link, &object->pending_ops);
70579- fscache_stat(&fscache_n_op_pend);
70580+ fscache_stat_unchecked(&fscache_n_op_pend);
70581 ret = 0;
70582 } else {
70583 /* If we're in any other state, there must have been an I/O
70584@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
70585 if (object->n_exclusive > 0) {
70586 atomic_inc(&op->usage);
70587 list_add_tail(&op->pend_link, &object->pending_ops);
70588- fscache_stat(&fscache_n_op_pend);
70589+ fscache_stat_unchecked(&fscache_n_op_pend);
70590 } else if (!list_empty(&object->pending_ops)) {
70591 atomic_inc(&op->usage);
70592 list_add_tail(&op->pend_link, &object->pending_ops);
70593- fscache_stat(&fscache_n_op_pend);
70594+ fscache_stat_unchecked(&fscache_n_op_pend);
70595 fscache_start_operations(object);
70596 } else {
70597 ASSERTCMP(object->n_exclusive, ==, 0);
70598@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
70599 object->n_ops++;
70600 atomic_inc(&op->usage);
70601 list_add_tail(&op->pend_link, &object->pending_ops);
70602- fscache_stat(&fscache_n_op_pend);
70603+ fscache_stat_unchecked(&fscache_n_op_pend);
70604 ret = 0;
70605 } else if (fscache_object_is_dying(object)) {
70606- fscache_stat(&fscache_n_op_rejected);
70607+ fscache_stat_unchecked(&fscache_n_op_rejected);
70608 op->state = FSCACHE_OP_ST_CANCELLED;
70609 ret = -ENOBUFS;
70610 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
70611@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
70612 ret = -EBUSY;
70613 if (op->state == FSCACHE_OP_ST_PENDING) {
70614 ASSERT(!list_empty(&op->pend_link));
70615- fscache_stat(&fscache_n_op_cancelled);
70616+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70617 list_del_init(&op->pend_link);
70618 if (do_cancel)
70619 do_cancel(op);
70620@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
70621 while (!list_empty(&object->pending_ops)) {
70622 op = list_entry(object->pending_ops.next,
70623 struct fscache_operation, pend_link);
70624- fscache_stat(&fscache_n_op_cancelled);
70625+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70626 list_del_init(&op->pend_link);
70627
70628 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
70629@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
70630 op->state, ==, FSCACHE_OP_ST_CANCELLED);
70631 op->state = FSCACHE_OP_ST_DEAD;
70632
70633- fscache_stat(&fscache_n_op_release);
70634+ fscache_stat_unchecked(&fscache_n_op_release);
70635
70636 if (op->release) {
70637 op->release(op);
70638@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
70639 * lock, and defer it otherwise */
70640 if (!spin_trylock(&object->lock)) {
70641 _debug("defer put");
70642- fscache_stat(&fscache_n_op_deferred_release);
70643+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
70644
70645 cache = object->cache;
70646 spin_lock(&cache->op_gc_list_lock);
70647@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
70648
70649 _debug("GC DEFERRED REL OBJ%x OP%x",
70650 object->debug_id, op->debug_id);
70651- fscache_stat(&fscache_n_op_gc);
70652+ fscache_stat_unchecked(&fscache_n_op_gc);
70653
70654 ASSERTCMP(atomic_read(&op->usage), ==, 0);
70655 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
70656diff --git a/fs/fscache/page.c b/fs/fscache/page.c
70657index de33b3f..8be4d29 100644
70658--- a/fs/fscache/page.c
70659+++ b/fs/fscache/page.c
70660@@ -74,7 +74,7 @@ try_again:
70661 val = radix_tree_lookup(&cookie->stores, page->index);
70662 if (!val) {
70663 rcu_read_unlock();
70664- fscache_stat(&fscache_n_store_vmscan_not_storing);
70665+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
70666 __fscache_uncache_page(cookie, page);
70667 return true;
70668 }
70669@@ -104,11 +104,11 @@ try_again:
70670 spin_unlock(&cookie->stores_lock);
70671
70672 if (xpage) {
70673- fscache_stat(&fscache_n_store_vmscan_cancelled);
70674- fscache_stat(&fscache_n_store_radix_deletes);
70675+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
70676+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70677 ASSERTCMP(xpage, ==, page);
70678 } else {
70679- fscache_stat(&fscache_n_store_vmscan_gone);
70680+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
70681 }
70682
70683 wake_up_bit(&cookie->flags, 0);
70684@@ -123,11 +123,11 @@ page_busy:
70685 * sleeping on memory allocation, so we may need to impose a timeout
70686 * too. */
70687 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
70688- fscache_stat(&fscache_n_store_vmscan_busy);
70689+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
70690 return false;
70691 }
70692
70693- fscache_stat(&fscache_n_store_vmscan_wait);
70694+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
70695 if (!release_page_wait_timeout(cookie, page))
70696 _debug("fscache writeout timeout page: %p{%lx}",
70697 page, page->index);
70698@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
70699 FSCACHE_COOKIE_STORING_TAG);
70700 if (!radix_tree_tag_get(&cookie->stores, page->index,
70701 FSCACHE_COOKIE_PENDING_TAG)) {
70702- fscache_stat(&fscache_n_store_radix_deletes);
70703+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70704 xpage = radix_tree_delete(&cookie->stores, page->index);
70705 }
70706 spin_unlock(&cookie->stores_lock);
70707@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
70708
70709 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
70710
70711- fscache_stat(&fscache_n_attr_changed_calls);
70712+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
70713
70714 if (fscache_object_is_active(object)) {
70715 fscache_stat(&fscache_n_cop_attr_changed);
70716@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70717
70718 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
70719
70720- fscache_stat(&fscache_n_attr_changed);
70721+ fscache_stat_unchecked(&fscache_n_attr_changed);
70722
70723 op = kzalloc(sizeof(*op), GFP_KERNEL);
70724 if (!op) {
70725- fscache_stat(&fscache_n_attr_changed_nomem);
70726+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
70727 _leave(" = -ENOMEM");
70728 return -ENOMEM;
70729 }
70730@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70731 if (fscache_submit_exclusive_op(object, op) < 0)
70732 goto nobufs_dec;
70733 spin_unlock(&cookie->lock);
70734- fscache_stat(&fscache_n_attr_changed_ok);
70735+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
70736 fscache_put_operation(op);
70737 _leave(" = 0");
70738 return 0;
70739@@ -242,7 +242,7 @@ nobufs:
70740 kfree(op);
70741 if (wake_cookie)
70742 __fscache_wake_unused_cookie(cookie);
70743- fscache_stat(&fscache_n_attr_changed_nobufs);
70744+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
70745 _leave(" = %d", -ENOBUFS);
70746 return -ENOBUFS;
70747 }
70748@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
70749 /* allocate a retrieval operation and attempt to submit it */
70750 op = kzalloc(sizeof(*op), GFP_NOIO);
70751 if (!op) {
70752- fscache_stat(&fscache_n_retrievals_nomem);
70753+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70754 return NULL;
70755 }
70756
70757@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
70758 return 0;
70759 }
70760
70761- fscache_stat(&fscache_n_retrievals_wait);
70762+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
70763
70764 jif = jiffies;
70765 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
70766 TASK_INTERRUPTIBLE) != 0) {
70767- fscache_stat(&fscache_n_retrievals_intr);
70768+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70769 _leave(" = -ERESTARTSYS");
70770 return -ERESTARTSYS;
70771 }
70772@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
70773 */
70774 int fscache_wait_for_operation_activation(struct fscache_object *object,
70775 struct fscache_operation *op,
70776- atomic_t *stat_op_waits,
70777- atomic_t *stat_object_dead,
70778+ atomic_unchecked_t *stat_op_waits,
70779+ atomic_unchecked_t *stat_object_dead,
70780 void (*do_cancel)(struct fscache_operation *))
70781 {
70782 int ret;
70783@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70784
70785 _debug(">>> WT");
70786 if (stat_op_waits)
70787- fscache_stat(stat_op_waits);
70788+ fscache_stat_unchecked(stat_op_waits);
70789 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
70790 TASK_INTERRUPTIBLE) != 0) {
70791 ret = fscache_cancel_op(op, do_cancel);
70792@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70793 check_if_dead:
70794 if (op->state == FSCACHE_OP_ST_CANCELLED) {
70795 if (stat_object_dead)
70796- fscache_stat(stat_object_dead);
70797+ fscache_stat_unchecked(stat_object_dead);
70798 _leave(" = -ENOBUFS [cancelled]");
70799 return -ENOBUFS;
70800 }
70801@@ -381,7 +381,7 @@ check_if_dead:
70802 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
70803 fscache_cancel_op(op, do_cancel);
70804 if (stat_object_dead)
70805- fscache_stat(stat_object_dead);
70806+ fscache_stat_unchecked(stat_object_dead);
70807 return -ENOBUFS;
70808 }
70809 return 0;
70810@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70811
70812 _enter("%p,%p,,,", cookie, page);
70813
70814- fscache_stat(&fscache_n_retrievals);
70815+ fscache_stat_unchecked(&fscache_n_retrievals);
70816
70817 if (hlist_empty(&cookie->backing_objects))
70818 goto nobufs;
70819@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70820 goto nobufs_unlock_dec;
70821 spin_unlock(&cookie->lock);
70822
70823- fscache_stat(&fscache_n_retrieval_ops);
70824+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70825
70826 /* pin the netfs read context in case we need to do the actual netfs
70827 * read because we've encountered a cache read failure */
70828@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70829
70830 error:
70831 if (ret == -ENOMEM)
70832- fscache_stat(&fscache_n_retrievals_nomem);
70833+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70834 else if (ret == -ERESTARTSYS)
70835- fscache_stat(&fscache_n_retrievals_intr);
70836+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70837 else if (ret == -ENODATA)
70838- fscache_stat(&fscache_n_retrievals_nodata);
70839+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
70840 else if (ret < 0)
70841- fscache_stat(&fscache_n_retrievals_nobufs);
70842+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70843 else
70844- fscache_stat(&fscache_n_retrievals_ok);
70845+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
70846
70847 fscache_put_retrieval(op);
70848 _leave(" = %d", ret);
70849@@ -505,7 +505,7 @@ nobufs_unlock:
70850 __fscache_wake_unused_cookie(cookie);
70851 kfree(op);
70852 nobufs:
70853- fscache_stat(&fscache_n_retrievals_nobufs);
70854+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70855 _leave(" = -ENOBUFS");
70856 return -ENOBUFS;
70857 }
70858@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70859
70860 _enter("%p,,%d,,,", cookie, *nr_pages);
70861
70862- fscache_stat(&fscache_n_retrievals);
70863+ fscache_stat_unchecked(&fscache_n_retrievals);
70864
70865 if (hlist_empty(&cookie->backing_objects))
70866 goto nobufs;
70867@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70868 goto nobufs_unlock_dec;
70869 spin_unlock(&cookie->lock);
70870
70871- fscache_stat(&fscache_n_retrieval_ops);
70872+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70873
70874 /* pin the netfs read context in case we need to do the actual netfs
70875 * read because we've encountered a cache read failure */
70876@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70877
70878 error:
70879 if (ret == -ENOMEM)
70880- fscache_stat(&fscache_n_retrievals_nomem);
70881+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70882 else if (ret == -ERESTARTSYS)
70883- fscache_stat(&fscache_n_retrievals_intr);
70884+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70885 else if (ret == -ENODATA)
70886- fscache_stat(&fscache_n_retrievals_nodata);
70887+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
70888 else if (ret < 0)
70889- fscache_stat(&fscache_n_retrievals_nobufs);
70890+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70891 else
70892- fscache_stat(&fscache_n_retrievals_ok);
70893+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
70894
70895 fscache_put_retrieval(op);
70896 _leave(" = %d", ret);
70897@@ -636,7 +636,7 @@ nobufs_unlock:
70898 if (wake_cookie)
70899 __fscache_wake_unused_cookie(cookie);
70900 nobufs:
70901- fscache_stat(&fscache_n_retrievals_nobufs);
70902+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70903 _leave(" = -ENOBUFS");
70904 return -ENOBUFS;
70905 }
70906@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
70907
70908 _enter("%p,%p,,,", cookie, page);
70909
70910- fscache_stat(&fscache_n_allocs);
70911+ fscache_stat_unchecked(&fscache_n_allocs);
70912
70913 if (hlist_empty(&cookie->backing_objects))
70914 goto nobufs;
70915@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
70916 goto nobufs_unlock_dec;
70917 spin_unlock(&cookie->lock);
70918
70919- fscache_stat(&fscache_n_alloc_ops);
70920+ fscache_stat_unchecked(&fscache_n_alloc_ops);
70921
70922 ret = fscache_wait_for_operation_activation(
70923 object, &op->op,
70924@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
70925
70926 error:
70927 if (ret == -ERESTARTSYS)
70928- fscache_stat(&fscache_n_allocs_intr);
70929+ fscache_stat_unchecked(&fscache_n_allocs_intr);
70930 else if (ret < 0)
70931- fscache_stat(&fscache_n_allocs_nobufs);
70932+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
70933 else
70934- fscache_stat(&fscache_n_allocs_ok);
70935+ fscache_stat_unchecked(&fscache_n_allocs_ok);
70936
70937 fscache_put_retrieval(op);
70938 _leave(" = %d", ret);
70939@@ -730,7 +730,7 @@ nobufs_unlock:
70940 if (wake_cookie)
70941 __fscache_wake_unused_cookie(cookie);
70942 nobufs:
70943- fscache_stat(&fscache_n_allocs_nobufs);
70944+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
70945 _leave(" = -ENOBUFS");
70946 return -ENOBUFS;
70947 }
70948@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
70949
70950 spin_lock(&cookie->stores_lock);
70951
70952- fscache_stat(&fscache_n_store_calls);
70953+ fscache_stat_unchecked(&fscache_n_store_calls);
70954
70955 /* find a page to store */
70956 page = NULL;
70957@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
70958 page = results[0];
70959 _debug("gang %d [%lx]", n, page->index);
70960 if (page->index > op->store_limit) {
70961- fscache_stat(&fscache_n_store_pages_over_limit);
70962+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
70963 goto superseded;
70964 }
70965
70966@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
70967 spin_unlock(&cookie->stores_lock);
70968 spin_unlock(&object->lock);
70969
70970- fscache_stat(&fscache_n_store_pages);
70971+ fscache_stat_unchecked(&fscache_n_store_pages);
70972 fscache_stat(&fscache_n_cop_write_page);
70973 ret = object->cache->ops->write_page(op, page);
70974 fscache_stat_d(&fscache_n_cop_write_page);
70975@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
70976 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
70977 ASSERT(PageFsCache(page));
70978
70979- fscache_stat(&fscache_n_stores);
70980+ fscache_stat_unchecked(&fscache_n_stores);
70981
70982 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
70983 _leave(" = -ENOBUFS [invalidating]");
70984@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
70985 spin_unlock(&cookie->stores_lock);
70986 spin_unlock(&object->lock);
70987
70988- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
70989+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
70990 op->store_limit = object->store_limit;
70991
70992 __fscache_use_cookie(cookie);
70993@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
70994
70995 spin_unlock(&cookie->lock);
70996 radix_tree_preload_end();
70997- fscache_stat(&fscache_n_store_ops);
70998- fscache_stat(&fscache_n_stores_ok);
70999+ fscache_stat_unchecked(&fscache_n_store_ops);
71000+ fscache_stat_unchecked(&fscache_n_stores_ok);
71001
71002 /* the work queue now carries its own ref on the object */
71003 fscache_put_operation(&op->op);
71004@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71005 return 0;
71006
71007 already_queued:
71008- fscache_stat(&fscache_n_stores_again);
71009+ fscache_stat_unchecked(&fscache_n_stores_again);
71010 already_pending:
71011 spin_unlock(&cookie->stores_lock);
71012 spin_unlock(&object->lock);
71013 spin_unlock(&cookie->lock);
71014 radix_tree_preload_end();
71015 kfree(op);
71016- fscache_stat(&fscache_n_stores_ok);
71017+ fscache_stat_unchecked(&fscache_n_stores_ok);
71018 _leave(" = 0");
71019 return 0;
71020
71021@@ -1039,14 +1039,14 @@ nobufs:
71022 kfree(op);
71023 if (wake_cookie)
71024 __fscache_wake_unused_cookie(cookie);
71025- fscache_stat(&fscache_n_stores_nobufs);
71026+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
71027 _leave(" = -ENOBUFS");
71028 return -ENOBUFS;
71029
71030 nomem_free:
71031 kfree(op);
71032 nomem:
71033- fscache_stat(&fscache_n_stores_oom);
71034+ fscache_stat_unchecked(&fscache_n_stores_oom);
71035 _leave(" = -ENOMEM");
71036 return -ENOMEM;
71037 }
71038@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
71039 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71040 ASSERTCMP(page, !=, NULL);
71041
71042- fscache_stat(&fscache_n_uncaches);
71043+ fscache_stat_unchecked(&fscache_n_uncaches);
71044
71045 /* cache withdrawal may beat us to it */
71046 if (!PageFsCache(page))
71047@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
71048 struct fscache_cookie *cookie = op->op.object->cookie;
71049
71050 #ifdef CONFIG_FSCACHE_STATS
71051- atomic_inc(&fscache_n_marks);
71052+ atomic_inc_unchecked(&fscache_n_marks);
71053 #endif
71054
71055 _debug("- mark %p{%lx}", page, page->index);
71056diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
71057index 40d13c7..ddf52b9 100644
71058--- a/fs/fscache/stats.c
71059+++ b/fs/fscache/stats.c
71060@@ -18,99 +18,99 @@
71061 /*
71062 * operation counters
71063 */
71064-atomic_t fscache_n_op_pend;
71065-atomic_t fscache_n_op_run;
71066-atomic_t fscache_n_op_enqueue;
71067-atomic_t fscache_n_op_requeue;
71068-atomic_t fscache_n_op_deferred_release;
71069-atomic_t fscache_n_op_release;
71070-atomic_t fscache_n_op_gc;
71071-atomic_t fscache_n_op_cancelled;
71072-atomic_t fscache_n_op_rejected;
71073+atomic_unchecked_t fscache_n_op_pend;
71074+atomic_unchecked_t fscache_n_op_run;
71075+atomic_unchecked_t fscache_n_op_enqueue;
71076+atomic_unchecked_t fscache_n_op_requeue;
71077+atomic_unchecked_t fscache_n_op_deferred_release;
71078+atomic_unchecked_t fscache_n_op_release;
71079+atomic_unchecked_t fscache_n_op_gc;
71080+atomic_unchecked_t fscache_n_op_cancelled;
71081+atomic_unchecked_t fscache_n_op_rejected;
71082
71083-atomic_t fscache_n_attr_changed;
71084-atomic_t fscache_n_attr_changed_ok;
71085-atomic_t fscache_n_attr_changed_nobufs;
71086-atomic_t fscache_n_attr_changed_nomem;
71087-atomic_t fscache_n_attr_changed_calls;
71088+atomic_unchecked_t fscache_n_attr_changed;
71089+atomic_unchecked_t fscache_n_attr_changed_ok;
71090+atomic_unchecked_t fscache_n_attr_changed_nobufs;
71091+atomic_unchecked_t fscache_n_attr_changed_nomem;
71092+atomic_unchecked_t fscache_n_attr_changed_calls;
71093
71094-atomic_t fscache_n_allocs;
71095-atomic_t fscache_n_allocs_ok;
71096-atomic_t fscache_n_allocs_wait;
71097-atomic_t fscache_n_allocs_nobufs;
71098-atomic_t fscache_n_allocs_intr;
71099-atomic_t fscache_n_allocs_object_dead;
71100-atomic_t fscache_n_alloc_ops;
71101-atomic_t fscache_n_alloc_op_waits;
71102+atomic_unchecked_t fscache_n_allocs;
71103+atomic_unchecked_t fscache_n_allocs_ok;
71104+atomic_unchecked_t fscache_n_allocs_wait;
71105+atomic_unchecked_t fscache_n_allocs_nobufs;
71106+atomic_unchecked_t fscache_n_allocs_intr;
71107+atomic_unchecked_t fscache_n_allocs_object_dead;
71108+atomic_unchecked_t fscache_n_alloc_ops;
71109+atomic_unchecked_t fscache_n_alloc_op_waits;
71110
71111-atomic_t fscache_n_retrievals;
71112-atomic_t fscache_n_retrievals_ok;
71113-atomic_t fscache_n_retrievals_wait;
71114-atomic_t fscache_n_retrievals_nodata;
71115-atomic_t fscache_n_retrievals_nobufs;
71116-atomic_t fscache_n_retrievals_intr;
71117-atomic_t fscache_n_retrievals_nomem;
71118-atomic_t fscache_n_retrievals_object_dead;
71119-atomic_t fscache_n_retrieval_ops;
71120-atomic_t fscache_n_retrieval_op_waits;
71121+atomic_unchecked_t fscache_n_retrievals;
71122+atomic_unchecked_t fscache_n_retrievals_ok;
71123+atomic_unchecked_t fscache_n_retrievals_wait;
71124+atomic_unchecked_t fscache_n_retrievals_nodata;
71125+atomic_unchecked_t fscache_n_retrievals_nobufs;
71126+atomic_unchecked_t fscache_n_retrievals_intr;
71127+atomic_unchecked_t fscache_n_retrievals_nomem;
71128+atomic_unchecked_t fscache_n_retrievals_object_dead;
71129+atomic_unchecked_t fscache_n_retrieval_ops;
71130+atomic_unchecked_t fscache_n_retrieval_op_waits;
71131
71132-atomic_t fscache_n_stores;
71133-atomic_t fscache_n_stores_ok;
71134-atomic_t fscache_n_stores_again;
71135-atomic_t fscache_n_stores_nobufs;
71136-atomic_t fscache_n_stores_oom;
71137-atomic_t fscache_n_store_ops;
71138-atomic_t fscache_n_store_calls;
71139-atomic_t fscache_n_store_pages;
71140-atomic_t fscache_n_store_radix_deletes;
71141-atomic_t fscache_n_store_pages_over_limit;
71142+atomic_unchecked_t fscache_n_stores;
71143+atomic_unchecked_t fscache_n_stores_ok;
71144+atomic_unchecked_t fscache_n_stores_again;
71145+atomic_unchecked_t fscache_n_stores_nobufs;
71146+atomic_unchecked_t fscache_n_stores_oom;
71147+atomic_unchecked_t fscache_n_store_ops;
71148+atomic_unchecked_t fscache_n_store_calls;
71149+atomic_unchecked_t fscache_n_store_pages;
71150+atomic_unchecked_t fscache_n_store_radix_deletes;
71151+atomic_unchecked_t fscache_n_store_pages_over_limit;
71152
71153-atomic_t fscache_n_store_vmscan_not_storing;
71154-atomic_t fscache_n_store_vmscan_gone;
71155-atomic_t fscache_n_store_vmscan_busy;
71156-atomic_t fscache_n_store_vmscan_cancelled;
71157-atomic_t fscache_n_store_vmscan_wait;
71158+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
71159+atomic_unchecked_t fscache_n_store_vmscan_gone;
71160+atomic_unchecked_t fscache_n_store_vmscan_busy;
71161+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
71162+atomic_unchecked_t fscache_n_store_vmscan_wait;
71163
71164-atomic_t fscache_n_marks;
71165-atomic_t fscache_n_uncaches;
71166+atomic_unchecked_t fscache_n_marks;
71167+atomic_unchecked_t fscache_n_uncaches;
71168
71169-atomic_t fscache_n_acquires;
71170-atomic_t fscache_n_acquires_null;
71171-atomic_t fscache_n_acquires_no_cache;
71172-atomic_t fscache_n_acquires_ok;
71173-atomic_t fscache_n_acquires_nobufs;
71174-atomic_t fscache_n_acquires_oom;
71175+atomic_unchecked_t fscache_n_acquires;
71176+atomic_unchecked_t fscache_n_acquires_null;
71177+atomic_unchecked_t fscache_n_acquires_no_cache;
71178+atomic_unchecked_t fscache_n_acquires_ok;
71179+atomic_unchecked_t fscache_n_acquires_nobufs;
71180+atomic_unchecked_t fscache_n_acquires_oom;
71181
71182-atomic_t fscache_n_invalidates;
71183-atomic_t fscache_n_invalidates_run;
71184+atomic_unchecked_t fscache_n_invalidates;
71185+atomic_unchecked_t fscache_n_invalidates_run;
71186
71187-atomic_t fscache_n_updates;
71188-atomic_t fscache_n_updates_null;
71189-atomic_t fscache_n_updates_run;
71190+atomic_unchecked_t fscache_n_updates;
71191+atomic_unchecked_t fscache_n_updates_null;
71192+atomic_unchecked_t fscache_n_updates_run;
71193
71194-atomic_t fscache_n_relinquishes;
71195-atomic_t fscache_n_relinquishes_null;
71196-atomic_t fscache_n_relinquishes_waitcrt;
71197-atomic_t fscache_n_relinquishes_retire;
71198+atomic_unchecked_t fscache_n_relinquishes;
71199+atomic_unchecked_t fscache_n_relinquishes_null;
71200+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
71201+atomic_unchecked_t fscache_n_relinquishes_retire;
71202
71203-atomic_t fscache_n_cookie_index;
71204-atomic_t fscache_n_cookie_data;
71205-atomic_t fscache_n_cookie_special;
71206+atomic_unchecked_t fscache_n_cookie_index;
71207+atomic_unchecked_t fscache_n_cookie_data;
71208+atomic_unchecked_t fscache_n_cookie_special;
71209
71210-atomic_t fscache_n_object_alloc;
71211-atomic_t fscache_n_object_no_alloc;
71212-atomic_t fscache_n_object_lookups;
71213-atomic_t fscache_n_object_lookups_negative;
71214-atomic_t fscache_n_object_lookups_positive;
71215-atomic_t fscache_n_object_lookups_timed_out;
71216-atomic_t fscache_n_object_created;
71217-atomic_t fscache_n_object_avail;
71218-atomic_t fscache_n_object_dead;
71219+atomic_unchecked_t fscache_n_object_alloc;
71220+atomic_unchecked_t fscache_n_object_no_alloc;
71221+atomic_unchecked_t fscache_n_object_lookups;
71222+atomic_unchecked_t fscache_n_object_lookups_negative;
71223+atomic_unchecked_t fscache_n_object_lookups_positive;
71224+atomic_unchecked_t fscache_n_object_lookups_timed_out;
71225+atomic_unchecked_t fscache_n_object_created;
71226+atomic_unchecked_t fscache_n_object_avail;
71227+atomic_unchecked_t fscache_n_object_dead;
71228
71229-atomic_t fscache_n_checkaux_none;
71230-atomic_t fscache_n_checkaux_okay;
71231-atomic_t fscache_n_checkaux_update;
71232-atomic_t fscache_n_checkaux_obsolete;
71233+atomic_unchecked_t fscache_n_checkaux_none;
71234+atomic_unchecked_t fscache_n_checkaux_okay;
71235+atomic_unchecked_t fscache_n_checkaux_update;
71236+atomic_unchecked_t fscache_n_checkaux_obsolete;
71237
71238 atomic_t fscache_n_cop_alloc_object;
71239 atomic_t fscache_n_cop_lookup_object;
71240@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
71241 seq_puts(m, "FS-Cache statistics\n");
71242
71243 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
71244- atomic_read(&fscache_n_cookie_index),
71245- atomic_read(&fscache_n_cookie_data),
71246- atomic_read(&fscache_n_cookie_special));
71247+ atomic_read_unchecked(&fscache_n_cookie_index),
71248+ atomic_read_unchecked(&fscache_n_cookie_data),
71249+ atomic_read_unchecked(&fscache_n_cookie_special));
71250
71251 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
71252- atomic_read(&fscache_n_object_alloc),
71253- atomic_read(&fscache_n_object_no_alloc),
71254- atomic_read(&fscache_n_object_avail),
71255- atomic_read(&fscache_n_object_dead));
71256+ atomic_read_unchecked(&fscache_n_object_alloc),
71257+ atomic_read_unchecked(&fscache_n_object_no_alloc),
71258+ atomic_read_unchecked(&fscache_n_object_avail),
71259+ atomic_read_unchecked(&fscache_n_object_dead));
71260 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
71261- atomic_read(&fscache_n_checkaux_none),
71262- atomic_read(&fscache_n_checkaux_okay),
71263- atomic_read(&fscache_n_checkaux_update),
71264- atomic_read(&fscache_n_checkaux_obsolete));
71265+ atomic_read_unchecked(&fscache_n_checkaux_none),
71266+ atomic_read_unchecked(&fscache_n_checkaux_okay),
71267+ atomic_read_unchecked(&fscache_n_checkaux_update),
71268+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
71269
71270 seq_printf(m, "Pages : mrk=%u unc=%u\n",
71271- atomic_read(&fscache_n_marks),
71272- atomic_read(&fscache_n_uncaches));
71273+ atomic_read_unchecked(&fscache_n_marks),
71274+ atomic_read_unchecked(&fscache_n_uncaches));
71275
71276 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
71277 " oom=%u\n",
71278- atomic_read(&fscache_n_acquires),
71279- atomic_read(&fscache_n_acquires_null),
71280- atomic_read(&fscache_n_acquires_no_cache),
71281- atomic_read(&fscache_n_acquires_ok),
71282- atomic_read(&fscache_n_acquires_nobufs),
71283- atomic_read(&fscache_n_acquires_oom));
71284+ atomic_read_unchecked(&fscache_n_acquires),
71285+ atomic_read_unchecked(&fscache_n_acquires_null),
71286+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
71287+ atomic_read_unchecked(&fscache_n_acquires_ok),
71288+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
71289+ atomic_read_unchecked(&fscache_n_acquires_oom));
71290
71291 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
71292- atomic_read(&fscache_n_object_lookups),
71293- atomic_read(&fscache_n_object_lookups_negative),
71294- atomic_read(&fscache_n_object_lookups_positive),
71295- atomic_read(&fscache_n_object_created),
71296- atomic_read(&fscache_n_object_lookups_timed_out));
71297+ atomic_read_unchecked(&fscache_n_object_lookups),
71298+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
71299+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
71300+ atomic_read_unchecked(&fscache_n_object_created),
71301+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
71302
71303 seq_printf(m, "Invals : n=%u run=%u\n",
71304- atomic_read(&fscache_n_invalidates),
71305- atomic_read(&fscache_n_invalidates_run));
71306+ atomic_read_unchecked(&fscache_n_invalidates),
71307+ atomic_read_unchecked(&fscache_n_invalidates_run));
71308
71309 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
71310- atomic_read(&fscache_n_updates),
71311- atomic_read(&fscache_n_updates_null),
71312- atomic_read(&fscache_n_updates_run));
71313+ atomic_read_unchecked(&fscache_n_updates),
71314+ atomic_read_unchecked(&fscache_n_updates_null),
71315+ atomic_read_unchecked(&fscache_n_updates_run));
71316
71317 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
71318- atomic_read(&fscache_n_relinquishes),
71319- atomic_read(&fscache_n_relinquishes_null),
71320- atomic_read(&fscache_n_relinquishes_waitcrt),
71321- atomic_read(&fscache_n_relinquishes_retire));
71322+ atomic_read_unchecked(&fscache_n_relinquishes),
71323+ atomic_read_unchecked(&fscache_n_relinquishes_null),
71324+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
71325+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
71326
71327 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
71328- atomic_read(&fscache_n_attr_changed),
71329- atomic_read(&fscache_n_attr_changed_ok),
71330- atomic_read(&fscache_n_attr_changed_nobufs),
71331- atomic_read(&fscache_n_attr_changed_nomem),
71332- atomic_read(&fscache_n_attr_changed_calls));
71333+ atomic_read_unchecked(&fscache_n_attr_changed),
71334+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
71335+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
71336+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
71337+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
71338
71339 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
71340- atomic_read(&fscache_n_allocs),
71341- atomic_read(&fscache_n_allocs_ok),
71342- atomic_read(&fscache_n_allocs_wait),
71343- atomic_read(&fscache_n_allocs_nobufs),
71344- atomic_read(&fscache_n_allocs_intr));
71345+ atomic_read_unchecked(&fscache_n_allocs),
71346+ atomic_read_unchecked(&fscache_n_allocs_ok),
71347+ atomic_read_unchecked(&fscache_n_allocs_wait),
71348+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
71349+ atomic_read_unchecked(&fscache_n_allocs_intr));
71350 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
71351- atomic_read(&fscache_n_alloc_ops),
71352- atomic_read(&fscache_n_alloc_op_waits),
71353- atomic_read(&fscache_n_allocs_object_dead));
71354+ atomic_read_unchecked(&fscache_n_alloc_ops),
71355+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
71356+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
71357
71358 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
71359 " int=%u oom=%u\n",
71360- atomic_read(&fscache_n_retrievals),
71361- atomic_read(&fscache_n_retrievals_ok),
71362- atomic_read(&fscache_n_retrievals_wait),
71363- atomic_read(&fscache_n_retrievals_nodata),
71364- atomic_read(&fscache_n_retrievals_nobufs),
71365- atomic_read(&fscache_n_retrievals_intr),
71366- atomic_read(&fscache_n_retrievals_nomem));
71367+ atomic_read_unchecked(&fscache_n_retrievals),
71368+ atomic_read_unchecked(&fscache_n_retrievals_ok),
71369+ atomic_read_unchecked(&fscache_n_retrievals_wait),
71370+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
71371+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
71372+ atomic_read_unchecked(&fscache_n_retrievals_intr),
71373+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
71374 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
71375- atomic_read(&fscache_n_retrieval_ops),
71376- atomic_read(&fscache_n_retrieval_op_waits),
71377- atomic_read(&fscache_n_retrievals_object_dead));
71378+ atomic_read_unchecked(&fscache_n_retrieval_ops),
71379+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
71380+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
71381
71382 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
71383- atomic_read(&fscache_n_stores),
71384- atomic_read(&fscache_n_stores_ok),
71385- atomic_read(&fscache_n_stores_again),
71386- atomic_read(&fscache_n_stores_nobufs),
71387- atomic_read(&fscache_n_stores_oom));
71388+ atomic_read_unchecked(&fscache_n_stores),
71389+ atomic_read_unchecked(&fscache_n_stores_ok),
71390+ atomic_read_unchecked(&fscache_n_stores_again),
71391+ atomic_read_unchecked(&fscache_n_stores_nobufs),
71392+ atomic_read_unchecked(&fscache_n_stores_oom));
71393 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
71394- atomic_read(&fscache_n_store_ops),
71395- atomic_read(&fscache_n_store_calls),
71396- atomic_read(&fscache_n_store_pages),
71397- atomic_read(&fscache_n_store_radix_deletes),
71398- atomic_read(&fscache_n_store_pages_over_limit));
71399+ atomic_read_unchecked(&fscache_n_store_ops),
71400+ atomic_read_unchecked(&fscache_n_store_calls),
71401+ atomic_read_unchecked(&fscache_n_store_pages),
71402+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
71403+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
71404
71405 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
71406- atomic_read(&fscache_n_store_vmscan_not_storing),
71407- atomic_read(&fscache_n_store_vmscan_gone),
71408- atomic_read(&fscache_n_store_vmscan_busy),
71409- atomic_read(&fscache_n_store_vmscan_cancelled),
71410- atomic_read(&fscache_n_store_vmscan_wait));
71411+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
71412+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
71413+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
71414+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
71415+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
71416
71417 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
71418- atomic_read(&fscache_n_op_pend),
71419- atomic_read(&fscache_n_op_run),
71420- atomic_read(&fscache_n_op_enqueue),
71421- atomic_read(&fscache_n_op_cancelled),
71422- atomic_read(&fscache_n_op_rejected));
71423+ atomic_read_unchecked(&fscache_n_op_pend),
71424+ atomic_read_unchecked(&fscache_n_op_run),
71425+ atomic_read_unchecked(&fscache_n_op_enqueue),
71426+ atomic_read_unchecked(&fscache_n_op_cancelled),
71427+ atomic_read_unchecked(&fscache_n_op_rejected));
71428 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
71429- atomic_read(&fscache_n_op_deferred_release),
71430- atomic_read(&fscache_n_op_release),
71431- atomic_read(&fscache_n_op_gc));
71432+ atomic_read_unchecked(&fscache_n_op_deferred_release),
71433+ atomic_read_unchecked(&fscache_n_op_release),
71434+ atomic_read_unchecked(&fscache_n_op_gc));
71435
71436 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
71437 atomic_read(&fscache_n_cop_alloc_object),
71438diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
71439index 28d0c7a..04816b7 100644
71440--- a/fs/fuse/cuse.c
71441+++ b/fs/fuse/cuse.c
71442@@ -611,10 +611,12 @@ static int __init cuse_init(void)
71443 INIT_LIST_HEAD(&cuse_conntbl[i]);
71444
71445 /* inherit and extend fuse_dev_operations */
71446- cuse_channel_fops = fuse_dev_operations;
71447- cuse_channel_fops.owner = THIS_MODULE;
71448- cuse_channel_fops.open = cuse_channel_open;
71449- cuse_channel_fops.release = cuse_channel_release;
71450+ pax_open_kernel();
71451+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
71452+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
71453+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
71454+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
71455+ pax_close_kernel();
71456
71457 cuse_class = class_create(THIS_MODULE, "cuse");
71458 if (IS_ERR(cuse_class))
71459diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
71460index 39706c5..a803c71 100644
71461--- a/fs/fuse/dev.c
71462+++ b/fs/fuse/dev.c
71463@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71464 ret = 0;
71465 pipe_lock(pipe);
71466
71467- if (!pipe->readers) {
71468+ if (!atomic_read(&pipe->readers)) {
71469 send_sig(SIGPIPE, current, 0);
71470 if (!ret)
71471 ret = -EPIPE;
71472@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71473 page_nr++;
71474 ret += buf->len;
71475
71476- if (pipe->files)
71477+ if (atomic_read(&pipe->files))
71478 do_wakeup = 1;
71479 }
71480
71481diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
71482index 1545b71..7fabe47 100644
71483--- a/fs/fuse/dir.c
71484+++ b/fs/fuse/dir.c
71485@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
71486 return link;
71487 }
71488
71489-static void free_link(char *link)
71490+static void free_link(const char *link)
71491 {
71492 if (!IS_ERR(link))
71493 free_page((unsigned long) link);
71494diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
71495index f42dffb..4a4c435 100644
71496--- a/fs/gfs2/glock.c
71497+++ b/fs/gfs2/glock.c
71498@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
71499 if (held1 != held2) {
71500 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
71501 if (held2)
71502- gl->gl_lockref.count++;
71503+ __lockref_inc(&gl->gl_lockref);
71504 else
71505- gl->gl_lockref.count--;
71506+ __lockref_dec(&gl->gl_lockref);
71507 }
71508 if (held1 && held2 && list_empty(&gl->gl_holders))
71509 clear_bit(GLF_QUEUED, &gl->gl_flags);
71510@@ -614,9 +614,9 @@ out:
71511 out_sched:
71512 clear_bit(GLF_LOCK, &gl->gl_flags);
71513 smp_mb__after_atomic();
71514- gl->gl_lockref.count++;
71515+ __lockref_inc(&gl->gl_lockref);
71516 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71517- gl->gl_lockref.count--;
71518+ __lockref_dec(&gl->gl_lockref);
71519 return;
71520
71521 out_unlock:
71522@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
71523 gl->gl_sbd = sdp;
71524 gl->gl_flags = 0;
71525 gl->gl_name = name;
71526- gl->gl_lockref.count = 1;
71527+ __lockref_set(&gl->gl_lockref, 1);
71528 gl->gl_state = LM_ST_UNLOCKED;
71529 gl->gl_target = LM_ST_UNLOCKED;
71530 gl->gl_demote_state = LM_ST_EXCLUSIVE;
71531@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
71532 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
71533 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
71534 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71535- gl->gl_lockref.count++;
71536+ __lockref_inc(&gl->gl_lockref);
71537 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71538- gl->gl_lockref.count--;
71539+ __lockref_dec(&gl->gl_lockref);
71540 }
71541 run_queue(gl, 1);
71542 spin_unlock(&gl->gl_spin);
71543@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
71544 }
71545 }
71546
71547- gl->gl_lockref.count++;
71548+ __lockref_inc(&gl->gl_lockref);
71549 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71550 spin_unlock(&gl->gl_spin);
71551
71552@@ -1384,12 +1384,12 @@ add_back_to_lru:
71553 goto add_back_to_lru;
71554 }
71555 clear_bit(GLF_LRU, &gl->gl_flags);
71556- gl->gl_lockref.count++;
71557+ __lockref_inc(&gl->gl_lockref);
71558 if (demote_ok(gl))
71559 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
71560 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
71561 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71562- gl->gl_lockref.count--;
71563+ __lockref_dec(&gl->gl_lockref);
71564 spin_unlock(&gl->gl_spin);
71565 cond_resched_lock(&lru_lock);
71566 }
71567@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
71568 state2str(gl->gl_demote_state), dtime,
71569 atomic_read(&gl->gl_ail_count),
71570 atomic_read(&gl->gl_revokes),
71571- (int)gl->gl_lockref.count, gl->gl_hold_time);
71572+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
71573
71574 list_for_each_entry(gh, &gl->gl_holders, gh_list)
71575 dump_holder(seq, gh);
71576diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
71577index fe91951..ce38a6e 100644
71578--- a/fs/gfs2/glops.c
71579+++ b/fs/gfs2/glops.c
71580@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
71581
71582 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
71583 gl->gl_state == LM_ST_SHARED && ip) {
71584- gl->gl_lockref.count++;
71585+ __lockref_inc(&gl->gl_lockref);
71586 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
71587- gl->gl_lockref.count--;
71588+ __lockref_dec(&gl->gl_lockref);
71589 }
71590 }
71591
71592diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
71593index 3aa17d4..b338075 100644
71594--- a/fs/gfs2/quota.c
71595+++ b/fs/gfs2/quota.c
71596@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
71597 if (!spin_trylock(&qd->qd_lockref.lock))
71598 return LRU_SKIP;
71599
71600- if (qd->qd_lockref.count == 0) {
71601+ if (__lockref_read(&qd->qd_lockref) == 0) {
71602 lockref_mark_dead(&qd->qd_lockref);
71603 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
71604 }
71605@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
71606 return NULL;
71607
71608 qd->qd_sbd = sdp;
71609- qd->qd_lockref.count = 1;
71610+ __lockref_set(&qd->qd_lockref, 1);
71611 spin_lock_init(&qd->qd_lockref.lock);
71612 qd->qd_id = qid;
71613 qd->qd_slot = -1;
71614@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
71615 if (lockref_put_or_lock(&qd->qd_lockref))
71616 return;
71617
71618- qd->qd_lockref.count = 0;
71619+ __lockref_set(&qd->qd_lockref, 0);
71620 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
71621 spin_unlock(&qd->qd_lockref.lock);
71622
71623diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
71624index fd62cae..3494dfa 100644
71625--- a/fs/hostfs/hostfs_kern.c
71626+++ b/fs/hostfs/hostfs_kern.c
71627@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71628
71629 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
71630 {
71631- char *s = nd_get_link(nd);
71632+ const char *s = nd_get_link(nd);
71633 if (!IS_ERR(s))
71634 __putname(s);
71635 }
71636diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
71637index c274aca..772fa5e 100644
71638--- a/fs/hugetlbfs/inode.c
71639+++ b/fs/hugetlbfs/inode.c
71640@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71641 struct mm_struct *mm = current->mm;
71642 struct vm_area_struct *vma;
71643 struct hstate *h = hstate_file(file);
71644+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
71645 struct vm_unmapped_area_info info;
71646
71647 if (len & ~huge_page_mask(h))
71648@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71649 return addr;
71650 }
71651
71652+#ifdef CONFIG_PAX_RANDMMAP
71653+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71654+#endif
71655+
71656 if (addr) {
71657 addr = ALIGN(addr, huge_page_size(h));
71658 vma = find_vma(mm, addr);
71659- if (TASK_SIZE - len >= addr &&
71660- (!vma || addr + len <= vma->vm_start))
71661+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
71662 return addr;
71663 }
71664
71665 info.flags = 0;
71666 info.length = len;
71667 info.low_limit = TASK_UNMAPPED_BASE;
71668+
71669+#ifdef CONFIG_PAX_RANDMMAP
71670+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71671+ info.low_limit += mm->delta_mmap;
71672+#endif
71673+
71674 info.high_limit = TASK_SIZE;
71675 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
71676 info.align_offset = 0;
71677@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
71678 };
71679 MODULE_ALIAS_FS("hugetlbfs");
71680
71681-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71682+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71683
71684 static int can_do_hugetlb_shm(void)
71685 {
71686diff --git a/fs/inode.c b/fs/inode.c
71687index f00b16f..b653fea 100644
71688--- a/fs/inode.c
71689+++ b/fs/inode.c
71690@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
71691 unsigned int *p = &get_cpu_var(last_ino);
71692 unsigned int res = *p;
71693
71694+start:
71695+
71696 #ifdef CONFIG_SMP
71697 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
71698- static atomic_t shared_last_ino;
71699- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
71700+ static atomic_unchecked_t shared_last_ino;
71701+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
71702
71703 res = next - LAST_INO_BATCH;
71704 }
71705 #endif
71706
71707- *p = ++res;
71708+ if (unlikely(!++res))
71709+ goto start; /* never zero */
71710+ *p = res;
71711 put_cpu_var(last_ino);
71712 return res;
71713 }
71714diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
71715index 4a6cf28..d3a29d3 100644
71716--- a/fs/jffs2/erase.c
71717+++ b/fs/jffs2/erase.c
71718@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
71719 struct jffs2_unknown_node marker = {
71720 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
71721 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71722- .totlen = cpu_to_je32(c->cleanmarker_size)
71723+ .totlen = cpu_to_je32(c->cleanmarker_size),
71724+ .hdr_crc = cpu_to_je32(0)
71725 };
71726
71727 jffs2_prealloc_raw_node_refs(c, jeb, 1);
71728diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
71729index 09ed551..45684f8 100644
71730--- a/fs/jffs2/wbuf.c
71731+++ b/fs/jffs2/wbuf.c
71732@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
71733 {
71734 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
71735 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71736- .totlen = constant_cpu_to_je32(8)
71737+ .totlen = constant_cpu_to_je32(8),
71738+ .hdr_crc = constant_cpu_to_je32(0)
71739 };
71740
71741 /*
71742diff --git a/fs/jfs/super.c b/fs/jfs/super.c
71743index 5d30c56..8c45372 100644
71744--- a/fs/jfs/super.c
71745+++ b/fs/jfs/super.c
71746@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
71747
71748 jfs_inode_cachep =
71749 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
71750- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
71751+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
71752 init_once);
71753 if (jfs_inode_cachep == NULL)
71754 return -ENOMEM;
71755diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
71756index 345b35f..da7e0da 100644
71757--- a/fs/kernfs/dir.c
71758+++ b/fs/kernfs/dir.c
71759@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
71760 *
71761 * Returns 31 bit hash of ns + name (so it fits in an off_t )
71762 */
71763-static unsigned int kernfs_name_hash(const char *name, const void *ns)
71764+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
71765 {
71766 unsigned long hash = init_name_hash();
71767 unsigned int len = strlen(name);
71768@@ -838,6 +838,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
71769 ret = scops->mkdir(parent, dentry->d_name.name, mode);
71770
71771 kernfs_put_active(parent);
71772+
71773+ if (!ret) {
71774+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
71775+ ret = PTR_ERR_OR_ZERO(dentry_ret);
71776+ }
71777+
71778 return ret;
71779 }
71780
71781diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
71782index 2bacb99..f745182 100644
71783--- a/fs/kernfs/file.c
71784+++ b/fs/kernfs/file.c
71785@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
71786
71787 struct kernfs_open_node {
71788 atomic_t refcnt;
71789- atomic_t event;
71790+ atomic_unchecked_t event;
71791 wait_queue_head_t poll;
71792 struct list_head files; /* goes through kernfs_open_file.list */
71793 };
71794@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
71795 {
71796 struct kernfs_open_file *of = sf->private;
71797
71798- of->event = atomic_read(&of->kn->attr.open->event);
71799+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71800
71801 return of->kn->attr.ops->seq_show(sf, v);
71802 }
71803@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
71804 goto out_free;
71805 }
71806
71807- of->event = atomic_read(&of->kn->attr.open->event);
71808+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71809 ops = kernfs_ops(of->kn);
71810 if (ops->read)
71811 len = ops->read(of, buf, len, *ppos);
71812@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
71813 {
71814 struct kernfs_open_file *of = kernfs_of(file);
71815 const struct kernfs_ops *ops;
71816- size_t len;
71817+ ssize_t len;
71818 char *buf;
71819
71820 if (of->atomic_write_len) {
71821@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
71822 return ret;
71823 }
71824
71825-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71826- void *buf, int len, int write)
71827+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71828+ void *buf, size_t len, int write)
71829 {
71830 struct file *file = vma->vm_file;
71831 struct kernfs_open_file *of = kernfs_of(file);
71832- int ret;
71833+ ssize_t ret;
71834
71835 if (!of->vm_ops)
71836 return -EINVAL;
71837@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
71838 return -ENOMEM;
71839
71840 atomic_set(&new_on->refcnt, 0);
71841- atomic_set(&new_on->event, 1);
71842+ atomic_set_unchecked(&new_on->event, 1);
71843 init_waitqueue_head(&new_on->poll);
71844 INIT_LIST_HEAD(&new_on->files);
71845 goto retry;
71846@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
71847
71848 kernfs_put_active(kn);
71849
71850- if (of->event != atomic_read(&on->event))
71851+ if (of->event != atomic_read_unchecked(&on->event))
71852 goto trigger;
71853
71854 return DEFAULT_POLLMASK;
71855@@ -824,7 +824,7 @@ repeat:
71856
71857 on = kn->attr.open;
71858 if (on) {
71859- atomic_inc(&on->event);
71860+ atomic_inc_unchecked(&on->event);
71861 wake_up_interruptible(&on->poll);
71862 }
71863
71864diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
71865index 8a19889..4c3069a 100644
71866--- a/fs/kernfs/symlink.c
71867+++ b/fs/kernfs/symlink.c
71868@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
71869 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
71870 void *cookie)
71871 {
71872- char *page = nd_get_link(nd);
71873+ const char *page = nd_get_link(nd);
71874 if (!IS_ERR(page))
71875 free_page((unsigned long)page);
71876 }
71877diff --git a/fs/libfs.c b/fs/libfs.c
71878index 0ab6512..cd9982d 100644
71879--- a/fs/libfs.c
71880+++ b/fs/libfs.c
71881@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
71882
71883 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
71884 struct dentry *next = list_entry(p, struct dentry, d_child);
71885+ char d_name[sizeof(next->d_iname)];
71886+ const unsigned char *name;
71887+
71888 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
71889 if (!simple_positive(next)) {
71890 spin_unlock(&next->d_lock);
71891@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
71892
71893 spin_unlock(&next->d_lock);
71894 spin_unlock(&dentry->d_lock);
71895- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
71896+ name = next->d_name.name;
71897+ if (name == next->d_iname) {
71898+ memcpy(d_name, name, next->d_name.len);
71899+ name = d_name;
71900+ }
71901+ if (!dir_emit(ctx, name, next->d_name.len,
71902 next->d_inode->i_ino, dt_type(next->d_inode)))
71903 return 0;
71904 spin_lock(&dentry->d_lock);
71905@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
71906 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
71907 void *cookie)
71908 {
71909- char *s = nd_get_link(nd);
71910+ const char *s = nd_get_link(nd);
71911 if (!IS_ERR(s))
71912 kfree(s);
71913 }
71914diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
71915index acd3947..1f896e2 100644
71916--- a/fs/lockd/clntproc.c
71917+++ b/fs/lockd/clntproc.c
71918@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
71919 /*
71920 * Cookie counter for NLM requests
71921 */
71922-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
71923+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
71924
71925 void nlmclnt_next_cookie(struct nlm_cookie *c)
71926 {
71927- u32 cookie = atomic_inc_return(&nlm_cookie);
71928+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
71929
71930 memcpy(c->data, &cookie, 4);
71931 c->len=4;
71932diff --git a/fs/mount.h b/fs/mount.h
71933index 6a61c2b..bd79179 100644
71934--- a/fs/mount.h
71935+++ b/fs/mount.h
71936@@ -13,7 +13,7 @@ struct mnt_namespace {
71937 u64 seq; /* Sequence number to prevent loops */
71938 wait_queue_head_t poll;
71939 u64 event;
71940-};
71941+} __randomize_layout;
71942
71943 struct mnt_pcp {
71944 int mnt_count;
71945@@ -65,7 +65,7 @@ struct mount {
71946 struct hlist_head mnt_pins;
71947 struct fs_pin mnt_umount;
71948 struct dentry *mnt_ex_mountpoint;
71949-};
71950+} __randomize_layout;
71951
71952 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
71953
71954diff --git a/fs/namei.c b/fs/namei.c
71955index 50a8583..44c470a 100644
71956--- a/fs/namei.c
71957+++ b/fs/namei.c
71958@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
71959 if (ret != -EACCES)
71960 return ret;
71961
71962+#ifdef CONFIG_GRKERNSEC
71963+ /* we'll block if we have to log due to a denied capability use */
71964+ if (mask & MAY_NOT_BLOCK)
71965+ return -ECHILD;
71966+#endif
71967+
71968 if (S_ISDIR(inode->i_mode)) {
71969 /* DACs are overridable for directories */
71970- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
71971- return 0;
71972 if (!(mask & MAY_WRITE))
71973- if (capable_wrt_inode_uidgid(inode,
71974- CAP_DAC_READ_SEARCH))
71975+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
71976+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
71977 return 0;
71978+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
71979+ return 0;
71980 return -EACCES;
71981 }
71982 /*
71983+ * Searching includes executable on directories, else just read.
71984+ */
71985+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
71986+ if (mask == MAY_READ)
71987+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
71988+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
71989+ return 0;
71990+
71991+ /*
71992 * Read/write DACs are always overridable.
71993 * Executable DACs are overridable when there is
71994 * at least one exec bit set.
71995@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
71996 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
71997 return 0;
71998
71999- /*
72000- * Searching includes executable on directories, else just read.
72001- */
72002- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72003- if (mask == MAY_READ)
72004- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72005- return 0;
72006-
72007 return -EACCES;
72008 }
72009 EXPORT_SYMBOL(generic_permission);
72010@@ -503,7 +510,7 @@ struct nameidata {
72011 int last_type;
72012 unsigned depth;
72013 struct file *base;
72014- char *saved_names[MAX_NESTED_LINKS + 1];
72015+ const char *saved_names[MAX_NESTED_LINKS + 1];
72016 };
72017
72018 /*
72019@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
72020 nd->flags |= LOOKUP_JUMPED;
72021 }
72022
72023-void nd_set_link(struct nameidata *nd, char *path)
72024+void nd_set_link(struct nameidata *nd, const char *path)
72025 {
72026 nd->saved_names[nd->depth] = path;
72027 }
72028 EXPORT_SYMBOL(nd_set_link);
72029
72030-char *nd_get_link(struct nameidata *nd)
72031+const char *nd_get_link(const struct nameidata *nd)
72032 {
72033 return nd->saved_names[nd->depth];
72034 }
72035@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72036 {
72037 struct dentry *dentry = link->dentry;
72038 int error;
72039- char *s;
72040+ const char *s;
72041
72042 BUG_ON(nd->flags & LOOKUP_RCU);
72043
72044@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72045 if (error)
72046 goto out_put_nd_path;
72047
72048+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
72049+ dentry->d_inode, dentry, nd->path.mnt)) {
72050+ error = -EACCES;
72051+ goto out_put_nd_path;
72052+ }
72053+
72054 nd->last_type = LAST_BIND;
72055 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
72056 error = PTR_ERR(*p);
72057@@ -1640,6 +1653,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
72058 if (res)
72059 break;
72060 res = walk_component(nd, path, LOOKUP_FOLLOW);
72061+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
72062+ res = -EACCES;
72063 put_link(nd, &link, cookie);
72064 } while (res > 0);
72065
72066@@ -1712,7 +1727,7 @@ EXPORT_SYMBOL(full_name_hash);
72067 static inline u64 hash_name(const char *name)
72068 {
72069 unsigned long a, b, adata, bdata, mask, hash, len;
72070- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72071+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72072
72073 hash = a = 0;
72074 len = -sizeof(unsigned long);
72075@@ -2007,6 +2022,8 @@ static int path_lookupat(int dfd, const char *name,
72076 if (err)
72077 break;
72078 err = lookup_last(nd, &path);
72079+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
72080+ err = -EACCES;
72081 put_link(nd, &link, cookie);
72082 }
72083 }
72084@@ -2014,6 +2031,13 @@ static int path_lookupat(int dfd, const char *name,
72085 if (!err)
72086 err = complete_walk(nd);
72087
72088+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
72089+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72090+ path_put(&nd->path);
72091+ err = -ENOENT;
72092+ }
72093+ }
72094+
72095 if (!err && nd->flags & LOOKUP_DIRECTORY) {
72096 if (!d_can_lookup(nd->path.dentry)) {
72097 path_put(&nd->path);
72098@@ -2035,8 +2059,15 @@ static int filename_lookup(int dfd, struct filename *name,
72099 retval = path_lookupat(dfd, name->name,
72100 flags | LOOKUP_REVAL, nd);
72101
72102- if (likely(!retval))
72103+ if (likely(!retval)) {
72104 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
72105+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
72106+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
72107+ path_put(&nd->path);
72108+ return -ENOENT;
72109+ }
72110+ }
72111+ }
72112 return retval;
72113 }
72114
72115@@ -2615,6 +2646,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
72116 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
72117 return -EPERM;
72118
72119+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
72120+ return -EPERM;
72121+ if (gr_handle_rawio(inode))
72122+ return -EPERM;
72123+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
72124+ return -EACCES;
72125+
72126 return 0;
72127 }
72128
72129@@ -2846,7 +2884,7 @@ looked_up:
72130 * cleared otherwise prior to returning.
72131 */
72132 static int lookup_open(struct nameidata *nd, struct path *path,
72133- struct file *file,
72134+ struct path *link, struct file *file,
72135 const struct open_flags *op,
72136 bool got_write, int *opened)
72137 {
72138@@ -2881,6 +2919,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72139 /* Negative dentry, just create the file */
72140 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
72141 umode_t mode = op->mode;
72142+
72143+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
72144+ error = -EACCES;
72145+ goto out_dput;
72146+ }
72147+
72148+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
72149+ error = -EACCES;
72150+ goto out_dput;
72151+ }
72152+
72153 if (!IS_POSIXACL(dir->d_inode))
72154 mode &= ~current_umask();
72155 /*
72156@@ -2902,6 +2951,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72157 nd->flags & LOOKUP_EXCL);
72158 if (error)
72159 goto out_dput;
72160+ else
72161+ gr_handle_create(dentry, nd->path.mnt);
72162 }
72163 out_no_open:
72164 path->dentry = dentry;
72165@@ -2916,7 +2967,7 @@ out_dput:
72166 /*
72167 * Handle the last step of open()
72168 */
72169-static int do_last(struct nameidata *nd, struct path *path,
72170+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
72171 struct file *file, const struct open_flags *op,
72172 int *opened, struct filename *name)
72173 {
72174@@ -2966,6 +3017,15 @@ static int do_last(struct nameidata *nd, struct path *path,
72175 if (error)
72176 return error;
72177
72178+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
72179+ error = -ENOENT;
72180+ goto out;
72181+ }
72182+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72183+ error = -EACCES;
72184+ goto out;
72185+ }
72186+
72187 audit_inode(name, dir, LOOKUP_PARENT);
72188 error = -EISDIR;
72189 /* trailing slashes? */
72190@@ -2985,7 +3045,7 @@ retry_lookup:
72191 */
72192 }
72193 mutex_lock(&dir->d_inode->i_mutex);
72194- error = lookup_open(nd, path, file, op, got_write, opened);
72195+ error = lookup_open(nd, path, link, file, op, got_write, opened);
72196 mutex_unlock(&dir->d_inode->i_mutex);
72197
72198 if (error <= 0) {
72199@@ -3009,11 +3069,28 @@ retry_lookup:
72200 goto finish_open_created;
72201 }
72202
72203+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
72204+ error = -ENOENT;
72205+ goto exit_dput;
72206+ }
72207+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
72208+ error = -EACCES;
72209+ goto exit_dput;
72210+ }
72211+
72212 /*
72213 * create/update audit record if it already exists.
72214 */
72215- if (d_is_positive(path->dentry))
72216+ if (d_is_positive(path->dentry)) {
72217+ /* only check if O_CREAT is specified, all other checks need to go
72218+ into may_open */
72219+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
72220+ error = -EACCES;
72221+ goto exit_dput;
72222+ }
72223+
72224 audit_inode(name, path->dentry, 0);
72225+ }
72226
72227 /*
72228 * If atomic_open() acquired write access it is dropped now due to
72229@@ -3055,6 +3132,11 @@ finish_lookup:
72230 }
72231 }
72232 BUG_ON(inode != path->dentry->d_inode);
72233+ /* if we're resolving a symlink to another symlink */
72234+ if (link && gr_handle_symlink_owner(link, inode)) {
72235+ error = -EACCES;
72236+ goto out;
72237+ }
72238 return 1;
72239 }
72240
72241@@ -3074,7 +3156,18 @@ finish_open:
72242 path_put(&save_parent);
72243 return error;
72244 }
72245+
72246+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72247+ error = -ENOENT;
72248+ goto out;
72249+ }
72250+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72251+ error = -EACCES;
72252+ goto out;
72253+ }
72254+
72255 audit_inode(name, nd->path.dentry, 0);
72256+
72257 error = -EISDIR;
72258 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
72259 goto out;
72260@@ -3235,7 +3328,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72261 if (unlikely(error))
72262 goto out;
72263
72264- error = do_last(nd, &path, file, op, &opened, pathname);
72265+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
72266 while (unlikely(error > 0)) { /* trailing symlink */
72267 struct path link = path;
72268 void *cookie;
72269@@ -3253,7 +3346,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72270 error = follow_link(&link, nd, &cookie);
72271 if (unlikely(error))
72272 break;
72273- error = do_last(nd, &path, file, op, &opened, pathname);
72274+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
72275 put_link(nd, &link, cookie);
72276 }
72277 out:
72278@@ -3356,9 +3449,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
72279 goto unlock;
72280
72281 error = -EEXIST;
72282- if (d_is_positive(dentry))
72283+ if (d_is_positive(dentry)) {
72284+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
72285+ error = -ENOENT;
72286 goto fail;
72287-
72288+ }
72289 /*
72290 * Special case - lookup gave negative, but... we had foo/bar/
72291 * From the vfs_mknod() POV we just have a negative dentry -
72292@@ -3423,6 +3518,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
72293 }
72294 EXPORT_SYMBOL(user_path_create);
72295
72296+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
72297+{
72298+ struct filename *tmp = getname(pathname);
72299+ struct dentry *res;
72300+ if (IS_ERR(tmp))
72301+ return ERR_CAST(tmp);
72302+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
72303+ if (IS_ERR(res))
72304+ putname(tmp);
72305+ else
72306+ *to = tmp;
72307+ return res;
72308+}
72309+
72310 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
72311 {
72312 int error = may_create(dir, dentry);
72313@@ -3486,6 +3595,17 @@ retry:
72314
72315 if (!IS_POSIXACL(path.dentry->d_inode))
72316 mode &= ~current_umask();
72317+
72318+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
72319+ error = -EPERM;
72320+ goto out;
72321+ }
72322+
72323+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
72324+ error = -EACCES;
72325+ goto out;
72326+ }
72327+
72328 error = security_path_mknod(&path, dentry, mode, dev);
72329 if (error)
72330 goto out;
72331@@ -3501,6 +3621,8 @@ retry:
72332 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
72333 break;
72334 }
72335+ if (!error)
72336+ gr_handle_create(dentry, path.mnt);
72337 out:
72338 done_path_create(&path, dentry);
72339 if (retry_estale(error, lookup_flags)) {
72340@@ -3555,9 +3677,16 @@ retry:
72341
72342 if (!IS_POSIXACL(path.dentry->d_inode))
72343 mode &= ~current_umask();
72344+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
72345+ error = -EACCES;
72346+ goto out;
72347+ }
72348 error = security_path_mkdir(&path, dentry, mode);
72349 if (!error)
72350 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
72351+ if (!error)
72352+ gr_handle_create(dentry, path.mnt);
72353+out:
72354 done_path_create(&path, dentry);
72355 if (retry_estale(error, lookup_flags)) {
72356 lookup_flags |= LOOKUP_REVAL;
72357@@ -3590,7 +3719,7 @@ void dentry_unhash(struct dentry *dentry)
72358 {
72359 shrink_dcache_parent(dentry);
72360 spin_lock(&dentry->d_lock);
72361- if (dentry->d_lockref.count == 1)
72362+ if (__lockref_read(&dentry->d_lockref) == 1)
72363 __d_drop(dentry);
72364 spin_unlock(&dentry->d_lock);
72365 }
72366@@ -3641,6 +3770,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
72367 struct filename *name;
72368 struct dentry *dentry;
72369 struct nameidata nd;
72370+ u64 saved_ino = 0;
72371+ dev_t saved_dev = 0;
72372 unsigned int lookup_flags = 0;
72373 retry:
72374 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72375@@ -3673,10 +3804,21 @@ retry:
72376 error = -ENOENT;
72377 goto exit3;
72378 }
72379+
72380+ saved_ino = gr_get_ino_from_dentry(dentry);
72381+ saved_dev = gr_get_dev_from_dentry(dentry);
72382+
72383+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
72384+ error = -EACCES;
72385+ goto exit3;
72386+ }
72387+
72388 error = security_path_rmdir(&nd.path, dentry);
72389 if (error)
72390 goto exit3;
72391 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
72392+ if (!error && (saved_dev || saved_ino))
72393+ gr_handle_delete(saved_ino, saved_dev);
72394 exit3:
72395 dput(dentry);
72396 exit2:
72397@@ -3769,6 +3911,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
72398 struct nameidata nd;
72399 struct inode *inode = NULL;
72400 struct inode *delegated_inode = NULL;
72401+ u64 saved_ino = 0;
72402+ dev_t saved_dev = 0;
72403 unsigned int lookup_flags = 0;
72404 retry:
72405 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72406@@ -3795,10 +3939,22 @@ retry_deleg:
72407 if (d_is_negative(dentry))
72408 goto slashes;
72409 ihold(inode);
72410+
72411+ if (inode->i_nlink <= 1) {
72412+ saved_ino = gr_get_ino_from_dentry(dentry);
72413+ saved_dev = gr_get_dev_from_dentry(dentry);
72414+ }
72415+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
72416+ error = -EACCES;
72417+ goto exit2;
72418+ }
72419+
72420 error = security_path_unlink(&nd.path, dentry);
72421 if (error)
72422 goto exit2;
72423 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
72424+ if (!error && (saved_ino || saved_dev))
72425+ gr_handle_delete(saved_ino, saved_dev);
72426 exit2:
72427 dput(dentry);
72428 }
72429@@ -3887,9 +4043,17 @@ retry:
72430 if (IS_ERR(dentry))
72431 goto out_putname;
72432
72433+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
72434+ error = -EACCES;
72435+ goto out;
72436+ }
72437+
72438 error = security_path_symlink(&path, dentry, from->name);
72439 if (!error)
72440 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
72441+ if (!error)
72442+ gr_handle_create(dentry, path.mnt);
72443+out:
72444 done_path_create(&path, dentry);
72445 if (retry_estale(error, lookup_flags)) {
72446 lookup_flags |= LOOKUP_REVAL;
72447@@ -3993,6 +4157,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
72448 struct dentry *new_dentry;
72449 struct path old_path, new_path;
72450 struct inode *delegated_inode = NULL;
72451+ struct filename *to = NULL;
72452 int how = 0;
72453 int error;
72454
72455@@ -4016,7 +4181,7 @@ retry:
72456 if (error)
72457 return error;
72458
72459- new_dentry = user_path_create(newdfd, newname, &new_path,
72460+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
72461 (how & LOOKUP_REVAL));
72462 error = PTR_ERR(new_dentry);
72463 if (IS_ERR(new_dentry))
72464@@ -4028,11 +4193,28 @@ retry:
72465 error = may_linkat(&old_path);
72466 if (unlikely(error))
72467 goto out_dput;
72468+
72469+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
72470+ old_path.dentry->d_inode,
72471+ old_path.dentry->d_inode->i_mode, to)) {
72472+ error = -EACCES;
72473+ goto out_dput;
72474+ }
72475+
72476+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
72477+ old_path.dentry, old_path.mnt, to)) {
72478+ error = -EACCES;
72479+ goto out_dput;
72480+ }
72481+
72482 error = security_path_link(old_path.dentry, &new_path, new_dentry);
72483 if (error)
72484 goto out_dput;
72485 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
72486+ if (!error)
72487+ gr_handle_create(new_dentry, new_path.mnt);
72488 out_dput:
72489+ putname(to);
72490 done_path_create(&new_path, new_dentry);
72491 if (delegated_inode) {
72492 error = break_deleg_wait(&delegated_inode);
72493@@ -4348,6 +4530,20 @@ retry_deleg:
72494 if (new_dentry == trap)
72495 goto exit5;
72496
72497+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
72498+ /* use EXDEV error to cause 'mv' to switch to an alternative
72499+ * method for usability
72500+ */
72501+ error = -EXDEV;
72502+ goto exit5;
72503+ }
72504+
72505+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
72506+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
72507+ to, flags);
72508+ if (error)
72509+ goto exit5;
72510+
72511 error = security_path_rename(&oldnd.path, old_dentry,
72512 &newnd.path, new_dentry, flags);
72513 if (error)
72514@@ -4355,6 +4551,9 @@ retry_deleg:
72515 error = vfs_rename(old_dir->d_inode, old_dentry,
72516 new_dir->d_inode, new_dentry,
72517 &delegated_inode, flags);
72518+ if (!error)
72519+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
72520+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
72521 exit5:
72522 dput(new_dentry);
72523 exit4:
72524@@ -4411,14 +4610,24 @@ EXPORT_SYMBOL(vfs_whiteout);
72525
72526 int readlink_copy(char __user *buffer, int buflen, const char *link)
72527 {
72528+ char tmpbuf[64];
72529+ const char *newlink;
72530 int len = PTR_ERR(link);
72531+
72532 if (IS_ERR(link))
72533 goto out;
72534
72535 len = strlen(link);
72536 if (len > (unsigned) buflen)
72537 len = buflen;
72538- if (copy_to_user(buffer, link, len))
72539+
72540+ if (len < sizeof(tmpbuf)) {
72541+ memcpy(tmpbuf, link, len);
72542+ newlink = tmpbuf;
72543+ } else
72544+ newlink = link;
72545+
72546+ if (copy_to_user(buffer, newlink, len))
72547 len = -EFAULT;
72548 out:
72549 return len;
72550diff --git a/fs/namespace.c b/fs/namespace.c
72551index 13b0f7b..1ee96e7 100644
72552--- a/fs/namespace.c
72553+++ b/fs/namespace.c
72554@@ -1480,6 +1480,9 @@ static int do_umount(struct mount *mnt, int flags)
72555 if (!(sb->s_flags & MS_RDONLY))
72556 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
72557 up_write(&sb->s_umount);
72558+
72559+ gr_log_remount(mnt->mnt_devname, retval);
72560+
72561 return retval;
72562 }
72563
72564@@ -1502,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
72565 }
72566 unlock_mount_hash();
72567 namespace_unlock();
72568+
72569+ gr_log_unmount(mnt->mnt_devname, retval);
72570+
72571 return retval;
72572 }
72573
72574@@ -1559,7 +1565,7 @@ static inline bool may_mount(void)
72575 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
72576 */
72577
72578-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
72579+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
72580 {
72581 struct path path;
72582 struct mount *mnt;
72583@@ -1604,7 +1610,7 @@ out:
72584 /*
72585 * The 2.0 compatible umount. No flags.
72586 */
72587-SYSCALL_DEFINE1(oldumount, char __user *, name)
72588+SYSCALL_DEFINE1(oldumount, const char __user *, name)
72589 {
72590 return sys_umount(name, 0);
72591 }
72592@@ -2673,6 +2679,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72593 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
72594 MS_STRICTATIME);
72595
72596+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
72597+ retval = -EPERM;
72598+ goto dput_out;
72599+ }
72600+
72601+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
72602+ retval = -EPERM;
72603+ goto dput_out;
72604+ }
72605+
72606 if (flags & MS_REMOUNT)
72607 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
72608 data_page);
72609@@ -2686,7 +2702,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72610 retval = do_new_mount(&path, type_page, flags, mnt_flags,
72611 dev_name, data_page);
72612 dput_out:
72613+ gr_log_mount(dev_name, &path, retval);
72614+
72615 path_put(&path);
72616+
72617 return retval;
72618 }
72619
72620@@ -2704,7 +2723,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
72621 * number incrementing at 10Ghz will take 12,427 years to wrap which
72622 * is effectively never, so we can ignore the possibility.
72623 */
72624-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
72625+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
72626
72627 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72628 {
72629@@ -2720,7 +2739,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72630 return ERR_PTR(ret);
72631 }
72632 new_ns->ns.ops = &mntns_operations;
72633- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
72634+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
72635 atomic_set(&new_ns->count, 1);
72636 new_ns->root = NULL;
72637 INIT_LIST_HEAD(&new_ns->list);
72638@@ -2730,7 +2749,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72639 return new_ns;
72640 }
72641
72642-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72643+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72644 struct user_namespace *user_ns, struct fs_struct *new_fs)
72645 {
72646 struct mnt_namespace *new_ns;
72647@@ -2851,8 +2870,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
72648 }
72649 EXPORT_SYMBOL(mount_subtree);
72650
72651-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
72652- char __user *, type, unsigned long, flags, void __user *, data)
72653+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
72654+ const char __user *, type, unsigned long, flags, void __user *, data)
72655 {
72656 int ret;
72657 char *kernel_type;
72658@@ -2958,6 +2977,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
72659 if (error)
72660 goto out2;
72661
72662+ if (gr_handle_chroot_pivot()) {
72663+ error = -EPERM;
72664+ goto out2;
72665+ }
72666+
72667 get_fs_root(current->fs, &root);
72668 old_mp = lock_mount(&old);
72669 error = PTR_ERR(old_mp);
72670@@ -3238,7 +3262,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
72671 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
72672 return -EPERM;
72673
72674- if (fs->users != 1)
72675+ if (atomic_read(&fs->users) != 1)
72676 return -EINVAL;
72677
72678 get_mnt_ns(mnt_ns);
72679diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
72680index 19ca95c..b28702c 100644
72681--- a/fs/nfs/callback_xdr.c
72682+++ b/fs/nfs/callback_xdr.c
72683@@ -51,7 +51,7 @@ struct callback_op {
72684 callback_decode_arg_t decode_args;
72685 callback_encode_res_t encode_res;
72686 long res_maxsize;
72687-};
72688+} __do_const;
72689
72690 static struct callback_op callback_ops[];
72691
72692diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
72693index d42dff6..ecbdf42 100644
72694--- a/fs/nfs/inode.c
72695+++ b/fs/nfs/inode.c
72696@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
72697 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
72698 }
72699
72700-static atomic_long_t nfs_attr_generation_counter;
72701+static atomic_long_unchecked_t nfs_attr_generation_counter;
72702
72703 static unsigned long nfs_read_attr_generation_counter(void)
72704 {
72705- return atomic_long_read(&nfs_attr_generation_counter);
72706+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
72707 }
72708
72709 unsigned long nfs_inc_attr_generation_counter(void)
72710 {
72711- return atomic_long_inc_return(&nfs_attr_generation_counter);
72712+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
72713 }
72714 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
72715
72716diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
72717index 5416968..0942042 100644
72718--- a/fs/nfsd/nfs4proc.c
72719+++ b/fs/nfsd/nfs4proc.c
72720@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
72721 nfsd4op_rsize op_rsize_bop;
72722 stateid_getter op_get_currentstateid;
72723 stateid_setter op_set_currentstateid;
72724-};
72725+} __do_const;
72726
72727 static struct nfsd4_operation nfsd4_ops[];
72728
72729diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
72730index 5b33ce1..c2a92aa 100644
72731--- a/fs/nfsd/nfs4xdr.c
72732+++ b/fs/nfsd/nfs4xdr.c
72733@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
72734
72735 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
72736
72737-static nfsd4_dec nfsd4_dec_ops[] = {
72738+static const nfsd4_dec nfsd4_dec_ops[] = {
72739 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
72740 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
72741 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
72742diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
72743index 46ec934..f384e41 100644
72744--- a/fs/nfsd/nfscache.c
72745+++ b/fs/nfsd/nfscache.c
72746@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72747 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
72748 u32 hash;
72749 struct nfsd_drc_bucket *b;
72750- int len;
72751+ long len;
72752 size_t bufsize = 0;
72753
72754 if (!rp)
72755@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72756 hash = nfsd_cache_hash(rp->c_xid);
72757 b = &drc_hashtbl[hash];
72758
72759- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
72760- len >>= 2;
72761+ if (statp) {
72762+ len = (char*)statp - (char*)resv->iov_base;
72763+ len = resv->iov_len - len;
72764+ len >>= 2;
72765+ }
72766
72767 /* Don't cache excessive amounts of data and XDR failures */
72768- if (!statp || len > (256 >> 2)) {
72769+ if (!statp || len > (256 >> 2) || len < 0) {
72770 nfsd_reply_cache_free(b, rp);
72771 return;
72772 }
72773@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72774 switch (cachetype) {
72775 case RC_REPLSTAT:
72776 if (len != 1)
72777- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
72778+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
72779 rp->c_replstat = *statp;
72780 break;
72781 case RC_REPLBUFF:
72782diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
72783index 3685265..e77261e 100644
72784--- a/fs/nfsd/vfs.c
72785+++ b/fs/nfsd/vfs.c
72786@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
72787
72788 oldfs = get_fs();
72789 set_fs(KERNEL_DS);
72790- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
72791+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
72792 set_fs(oldfs);
72793 return nfsd_finish_read(file, count, host_err);
72794 }
72795@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
72796
72797 /* Write the data. */
72798 oldfs = get_fs(); set_fs(KERNEL_DS);
72799- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
72800+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
72801 set_fs(oldfs);
72802 if (host_err < 0)
72803 goto out_nfserr;
72804@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
72805 */
72806
72807 oldfs = get_fs(); set_fs(KERNEL_DS);
72808- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
72809+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
72810 set_fs(oldfs);
72811
72812 if (host_err < 0)
72813diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
72814index 52ccd34..7a6b202 100644
72815--- a/fs/nls/nls_base.c
72816+++ b/fs/nls/nls_base.c
72817@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
72818
72819 int __register_nls(struct nls_table *nls, struct module *owner)
72820 {
72821- struct nls_table ** tmp = &tables;
72822+ struct nls_table *tmp = tables;
72823
72824 if (nls->next)
72825 return -EBUSY;
72826
72827- nls->owner = owner;
72828+ pax_open_kernel();
72829+ *(void **)&nls->owner = owner;
72830+ pax_close_kernel();
72831 spin_lock(&nls_lock);
72832- while (*tmp) {
72833- if (nls == *tmp) {
72834+ while (tmp) {
72835+ if (nls == tmp) {
72836 spin_unlock(&nls_lock);
72837 return -EBUSY;
72838 }
72839- tmp = &(*tmp)->next;
72840+ tmp = tmp->next;
72841 }
72842- nls->next = tables;
72843+ pax_open_kernel();
72844+ *(struct nls_table **)&nls->next = tables;
72845+ pax_close_kernel();
72846 tables = nls;
72847 spin_unlock(&nls_lock);
72848 return 0;
72849@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
72850
72851 int unregister_nls(struct nls_table * nls)
72852 {
72853- struct nls_table ** tmp = &tables;
72854+ struct nls_table * const * tmp = &tables;
72855
72856 spin_lock(&nls_lock);
72857 while (*tmp) {
72858 if (nls == *tmp) {
72859- *tmp = nls->next;
72860+ pax_open_kernel();
72861+ *(struct nls_table **)tmp = nls->next;
72862+ pax_close_kernel();
72863 spin_unlock(&nls_lock);
72864 return 0;
72865 }
72866@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
72867 return -EINVAL;
72868 }
72869
72870-static struct nls_table *find_nls(char *charset)
72871+static struct nls_table *find_nls(const char *charset)
72872 {
72873 struct nls_table *nls;
72874 spin_lock(&nls_lock);
72875@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
72876 return nls;
72877 }
72878
72879-struct nls_table *load_nls(char *charset)
72880+struct nls_table *load_nls(const char *charset)
72881 {
72882 return try_then_request_module(find_nls(charset), "nls_%s", charset);
72883 }
72884diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
72885index 162b3f1..6076a7c 100644
72886--- a/fs/nls/nls_euc-jp.c
72887+++ b/fs/nls/nls_euc-jp.c
72888@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
72889 p_nls = load_nls("cp932");
72890
72891 if (p_nls) {
72892- table.charset2upper = p_nls->charset2upper;
72893- table.charset2lower = p_nls->charset2lower;
72894+ pax_open_kernel();
72895+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
72896+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
72897+ pax_close_kernel();
72898 return register_nls(&table);
72899 }
72900
72901diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
72902index a80a741..7b96e1b 100644
72903--- a/fs/nls/nls_koi8-ru.c
72904+++ b/fs/nls/nls_koi8-ru.c
72905@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
72906 p_nls = load_nls("koi8-u");
72907
72908 if (p_nls) {
72909- table.charset2upper = p_nls->charset2upper;
72910- table.charset2lower = p_nls->charset2lower;
72911+ pax_open_kernel();
72912+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
72913+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
72914+ pax_close_kernel();
72915 return register_nls(&table);
72916 }
72917
72918diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
72919index cf27550..6c70f29d 100644
72920--- a/fs/notify/fanotify/fanotify_user.c
72921+++ b/fs/notify/fanotify/fanotify_user.c
72922@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
72923
72924 fd = fanotify_event_metadata.fd;
72925 ret = -EFAULT;
72926- if (copy_to_user(buf, &fanotify_event_metadata,
72927- fanotify_event_metadata.event_len))
72928+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
72929+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
72930 goto out_close_fd;
72931
72932 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
72933diff --git a/fs/notify/notification.c b/fs/notify/notification.c
72934index a95d8e0..a91a5fd 100644
72935--- a/fs/notify/notification.c
72936+++ b/fs/notify/notification.c
72937@@ -48,7 +48,7 @@
72938 #include <linux/fsnotify_backend.h>
72939 #include "fsnotify.h"
72940
72941-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
72942+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
72943
72944 /**
72945 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
72946@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
72947 */
72948 u32 fsnotify_get_cookie(void)
72949 {
72950- return atomic_inc_return(&fsnotify_sync_cookie);
72951+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
72952 }
72953 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
72954
72955diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
72956index 9e38daf..5727cae 100644
72957--- a/fs/ntfs/dir.c
72958+++ b/fs/ntfs/dir.c
72959@@ -1310,7 +1310,7 @@ find_next_index_buffer:
72960 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
72961 ~(s64)(ndir->itype.index.block_size - 1)));
72962 /* Bounds checks. */
72963- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
72964+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
72965 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
72966 "inode 0x%lx or driver bug.", vdir->i_ino);
72967 goto err_out;
72968diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
72969index 1da9b2d..9cca092a 100644
72970--- a/fs/ntfs/file.c
72971+++ b/fs/ntfs/file.c
72972@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
72973 char *addr;
72974 size_t total = 0;
72975 unsigned len;
72976- int left;
72977+ unsigned left;
72978
72979 do {
72980 len = PAGE_CACHE_SIZE - ofs;
72981diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
72982index 9e1e112..241a52a 100644
72983--- a/fs/ntfs/super.c
72984+++ b/fs/ntfs/super.c
72985@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
72986 if (!silent)
72987 ntfs_error(sb, "Primary boot sector is invalid.");
72988 } else if (!silent)
72989- ntfs_error(sb, read_err_str, "primary");
72990+ ntfs_error(sb, read_err_str, "%s", "primary");
72991 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
72992 if (bh_primary)
72993 brelse(bh_primary);
72994@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
72995 goto hotfix_primary_boot_sector;
72996 brelse(bh_backup);
72997 } else if (!silent)
72998- ntfs_error(sb, read_err_str, "backup");
72999+ ntfs_error(sb, read_err_str, "%s", "backup");
73000 /* Try to read NT3.51- backup boot sector. */
73001 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
73002 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
73003@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73004 "sector.");
73005 brelse(bh_backup);
73006 } else if (!silent)
73007- ntfs_error(sb, read_err_str, "backup");
73008+ ntfs_error(sb, read_err_str, "%s", "backup");
73009 /* We failed. Cleanup and return. */
73010 if (bh_primary)
73011 brelse(bh_primary);
73012diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
73013index 0440134..d52c93a 100644
73014--- a/fs/ocfs2/localalloc.c
73015+++ b/fs/ocfs2/localalloc.c
73016@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
73017 goto bail;
73018 }
73019
73020- atomic_inc(&osb->alloc_stats.moves);
73021+ atomic_inc_unchecked(&osb->alloc_stats.moves);
73022
73023 bail:
73024 if (handle)
73025diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
73026index 460c6c3..b4ef513 100644
73027--- a/fs/ocfs2/ocfs2.h
73028+++ b/fs/ocfs2/ocfs2.h
73029@@ -247,11 +247,11 @@ enum ocfs2_vol_state
73030
73031 struct ocfs2_alloc_stats
73032 {
73033- atomic_t moves;
73034- atomic_t local_data;
73035- atomic_t bitmap_data;
73036- atomic_t bg_allocs;
73037- atomic_t bg_extends;
73038+ atomic_unchecked_t moves;
73039+ atomic_unchecked_t local_data;
73040+ atomic_unchecked_t bitmap_data;
73041+ atomic_unchecked_t bg_allocs;
73042+ atomic_unchecked_t bg_extends;
73043 };
73044
73045 enum ocfs2_local_alloc_state
73046diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
73047index ee541f9..df3a500 100644
73048--- a/fs/ocfs2/refcounttree.c
73049+++ b/fs/ocfs2/refcounttree.c
73050@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
73051 error = posix_acl_create(dir, &mode, &default_acl, &acl);
73052 if (error) {
73053 mlog_errno(error);
73054- goto out;
73055+ return error;
73056 }
73057
73058 error = ocfs2_create_inode_in_orphan(dir, mode,
73059diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
73060index 0cb889a..6a26b24 100644
73061--- a/fs/ocfs2/suballoc.c
73062+++ b/fs/ocfs2/suballoc.c
73063@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
73064 mlog_errno(status);
73065 goto bail;
73066 }
73067- atomic_inc(&osb->alloc_stats.bg_extends);
73068+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
73069
73070 /* You should never ask for this much metadata */
73071 BUG_ON(bits_wanted >
73072@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
73073 mlog_errno(status);
73074 goto bail;
73075 }
73076- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73077+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73078
73079 *suballoc_loc = res.sr_bg_blkno;
73080 *suballoc_bit_start = res.sr_bit_offset;
73081@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
73082 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
73083 res->sr_bits);
73084
73085- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73086+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73087
73088 BUG_ON(res->sr_bits != 1);
73089
73090@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
73091 mlog_errno(status);
73092 goto bail;
73093 }
73094- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73095+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73096
73097 BUG_ON(res.sr_bits != 1);
73098
73099@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73100 cluster_start,
73101 num_clusters);
73102 if (!status)
73103- atomic_inc(&osb->alloc_stats.local_data);
73104+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
73105 } else {
73106 if (min_clusters > (osb->bitmap_cpg - 1)) {
73107 /* The only paths asking for contiguousness
73108@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73109 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
73110 res.sr_bg_blkno,
73111 res.sr_bit_offset);
73112- atomic_inc(&osb->alloc_stats.bitmap_data);
73113+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
73114 *num_clusters = res.sr_bits;
73115 }
73116 }
73117diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
73118index 2667518..24bcf79 100644
73119--- a/fs/ocfs2/super.c
73120+++ b/fs/ocfs2/super.c
73121@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
73122 "%10s => GlobalAllocs: %d LocalAllocs: %d "
73123 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
73124 "Stats",
73125- atomic_read(&osb->alloc_stats.bitmap_data),
73126- atomic_read(&osb->alloc_stats.local_data),
73127- atomic_read(&osb->alloc_stats.bg_allocs),
73128- atomic_read(&osb->alloc_stats.moves),
73129- atomic_read(&osb->alloc_stats.bg_extends));
73130+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
73131+ atomic_read_unchecked(&osb->alloc_stats.local_data),
73132+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
73133+ atomic_read_unchecked(&osb->alloc_stats.moves),
73134+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
73135
73136 out += snprintf(buf + out, len - out,
73137 "%10s => State: %u Descriptor: %llu Size: %u bits "
73138@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
73139
73140 mutex_init(&osb->system_file_mutex);
73141
73142- atomic_set(&osb->alloc_stats.moves, 0);
73143- atomic_set(&osb->alloc_stats.local_data, 0);
73144- atomic_set(&osb->alloc_stats.bitmap_data, 0);
73145- atomic_set(&osb->alloc_stats.bg_allocs, 0);
73146- atomic_set(&osb->alloc_stats.bg_extends, 0);
73147+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
73148+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
73149+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
73150+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
73151+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
73152
73153 /* Copy the blockcheck stats from the superblock probe */
73154 osb->osb_ecc_stats = *stats;
73155diff --git a/fs/open.c b/fs/open.c
73156index 44a3be1..5e97aa1 100644
73157--- a/fs/open.c
73158+++ b/fs/open.c
73159@@ -32,6 +32,8 @@
73160 #include <linux/dnotify.h>
73161 #include <linux/compat.h>
73162
73163+#define CREATE_TRACE_POINTS
73164+#include <trace/events/fs.h>
73165 #include "internal.h"
73166
73167 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
73168@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
73169 error = locks_verify_truncate(inode, NULL, length);
73170 if (!error)
73171 error = security_path_truncate(path);
73172+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
73173+ error = -EACCES;
73174 if (!error)
73175 error = do_truncate(path->dentry, length, 0, NULL);
73176
73177@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
73178 error = locks_verify_truncate(inode, f.file, length);
73179 if (!error)
73180 error = security_path_truncate(&f.file->f_path);
73181+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
73182+ error = -EACCES;
73183 if (!error)
73184 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
73185 sb_end_write(inode->i_sb);
73186@@ -392,6 +398,9 @@ retry:
73187 if (__mnt_is_readonly(path.mnt))
73188 res = -EROFS;
73189
73190+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
73191+ res = -EACCES;
73192+
73193 out_path_release:
73194 path_put(&path);
73195 if (retry_estale(res, lookup_flags)) {
73196@@ -423,6 +432,8 @@ retry:
73197 if (error)
73198 goto dput_and_out;
73199
73200+ gr_log_chdir(path.dentry, path.mnt);
73201+
73202 set_fs_pwd(current->fs, &path);
73203
73204 dput_and_out:
73205@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
73206 goto out_putf;
73207
73208 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
73209+
73210+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
73211+ error = -EPERM;
73212+
73213+ if (!error)
73214+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
73215+
73216 if (!error)
73217 set_fs_pwd(current->fs, &f.file->f_path);
73218 out_putf:
73219@@ -481,7 +499,13 @@ retry:
73220 if (error)
73221 goto dput_and_out;
73222
73223+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
73224+ goto dput_and_out;
73225+
73226 set_fs_root(current->fs, &path);
73227+
73228+ gr_handle_chroot_chdir(&path);
73229+
73230 error = 0;
73231 dput_and_out:
73232 path_put(&path);
73233@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
73234 return error;
73235 retry_deleg:
73236 mutex_lock(&inode->i_mutex);
73237+
73238+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
73239+ error = -EACCES;
73240+ goto out_unlock;
73241+ }
73242+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
73243+ error = -EACCES;
73244+ goto out_unlock;
73245+ }
73246+
73247 error = security_path_chmod(path, mode);
73248 if (error)
73249 goto out_unlock;
73250@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
73251 uid = make_kuid(current_user_ns(), user);
73252 gid = make_kgid(current_user_ns(), group);
73253
73254+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
73255+ return -EACCES;
73256+
73257 retry_deleg:
73258 newattrs.ia_valid = ATTR_CTIME;
73259 if (user != (uid_t) -1) {
73260@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
73261 } else {
73262 fsnotify_open(f);
73263 fd_install(fd, f);
73264+ trace_do_sys_open(tmp->name, flags, mode);
73265 }
73266 }
73267 putname(tmp);
73268diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
73269index bf8537c..c16ef7d 100644
73270--- a/fs/overlayfs/super.c
73271+++ b/fs/overlayfs/super.c
73272@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
73273 {
73274 struct ovl_entry *oe = dentry->d_fsdata;
73275
73276- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
73277+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
73278 }
73279
73280 int ovl_want_write(struct dentry *dentry)
73281@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
73282
73283 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
73284 {
73285- struct path upperpath = { NULL, NULL };
73286- struct path workpath = { NULL, NULL };
73287+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
73288+ struct path workpath = { .dentry = NULL, .mnt = NULL };
73289 struct dentry *root_dentry;
73290 struct ovl_entry *oe;
73291 struct ovl_fs *ufs;
73292diff --git a/fs/pipe.c b/fs/pipe.c
73293index 21981e5..2c0bffb 100644
73294--- a/fs/pipe.c
73295+++ b/fs/pipe.c
73296@@ -37,7 +37,7 @@ unsigned int pipe_max_size = 1048576;
73297 /*
73298 * Minimum pipe size, as required by POSIX
73299 */
73300-unsigned int pipe_min_size = PAGE_SIZE;
73301+unsigned int pipe_min_size __read_only = PAGE_SIZE;
73302
73303 /*
73304 * We use a start+len construction, which provides full use of the
73305@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
73306
73307 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
73308 {
73309- if (pipe->files)
73310+ if (atomic_read(&pipe->files))
73311 mutex_lock_nested(&pipe->mutex, subclass);
73312 }
73313
73314@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
73315
73316 void pipe_unlock(struct pipe_inode_info *pipe)
73317 {
73318- if (pipe->files)
73319+ if (atomic_read(&pipe->files))
73320 mutex_unlock(&pipe->mutex);
73321 }
73322 EXPORT_SYMBOL(pipe_unlock);
73323@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
73324 }
73325 if (bufs) /* More to do? */
73326 continue;
73327- if (!pipe->writers)
73328+ if (!atomic_read(&pipe->writers))
73329 break;
73330- if (!pipe->waiting_writers) {
73331+ if (!atomic_read(&pipe->waiting_writers)) {
73332 /* syscall merging: Usually we must not sleep
73333 * if O_NONBLOCK is set, or if we got some data.
73334 * But if a writer sleeps in kernel space, then
73335@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73336
73337 __pipe_lock(pipe);
73338
73339- if (!pipe->readers) {
73340+ if (!atomic_read(&pipe->readers)) {
73341 send_sig(SIGPIPE, current, 0);
73342 ret = -EPIPE;
73343 goto out;
73344@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73345 for (;;) {
73346 int bufs;
73347
73348- if (!pipe->readers) {
73349+ if (!atomic_read(&pipe->readers)) {
73350 send_sig(SIGPIPE, current, 0);
73351 if (!ret)
73352 ret = -EPIPE;
73353@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73354 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73355 do_wakeup = 0;
73356 }
73357- pipe->waiting_writers++;
73358+ atomic_inc(&pipe->waiting_writers);
73359 pipe_wait(pipe);
73360- pipe->waiting_writers--;
73361+ atomic_dec(&pipe->waiting_writers);
73362 }
73363 out:
73364 __pipe_unlock(pipe);
73365@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73366 mask = 0;
73367 if (filp->f_mode & FMODE_READ) {
73368 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
73369- if (!pipe->writers && filp->f_version != pipe->w_counter)
73370+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
73371 mask |= POLLHUP;
73372 }
73373
73374@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73375 * Most Unices do not set POLLERR for FIFOs but on Linux they
73376 * behave exactly like pipes for poll().
73377 */
73378- if (!pipe->readers)
73379+ if (!atomic_read(&pipe->readers))
73380 mask |= POLLERR;
73381 }
73382
73383@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
73384 int kill = 0;
73385
73386 spin_lock(&inode->i_lock);
73387- if (!--pipe->files) {
73388+ if (atomic_dec_and_test(&pipe->files)) {
73389 inode->i_pipe = NULL;
73390 kill = 1;
73391 }
73392@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
73393
73394 __pipe_lock(pipe);
73395 if (file->f_mode & FMODE_READ)
73396- pipe->readers--;
73397+ atomic_dec(&pipe->readers);
73398 if (file->f_mode & FMODE_WRITE)
73399- pipe->writers--;
73400+ atomic_dec(&pipe->writers);
73401
73402- if (pipe->readers || pipe->writers) {
73403+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
73404 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
73405 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73406 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
73407@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
73408 kfree(pipe);
73409 }
73410
73411-static struct vfsmount *pipe_mnt __read_mostly;
73412+struct vfsmount *pipe_mnt __read_mostly;
73413
73414 /*
73415 * pipefs_dname() is called from d_path().
73416@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
73417 goto fail_iput;
73418
73419 inode->i_pipe = pipe;
73420- pipe->files = 2;
73421- pipe->readers = pipe->writers = 1;
73422+ atomic_set(&pipe->files, 2);
73423+ atomic_set(&pipe->readers, 1);
73424+ atomic_set(&pipe->writers, 1);
73425 inode->i_fop = &pipefifo_fops;
73426
73427 /*
73428@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
73429 spin_lock(&inode->i_lock);
73430 if (inode->i_pipe) {
73431 pipe = inode->i_pipe;
73432- pipe->files++;
73433+ atomic_inc(&pipe->files);
73434 spin_unlock(&inode->i_lock);
73435 } else {
73436 spin_unlock(&inode->i_lock);
73437 pipe = alloc_pipe_info();
73438 if (!pipe)
73439 return -ENOMEM;
73440- pipe->files = 1;
73441+ atomic_set(&pipe->files, 1);
73442 spin_lock(&inode->i_lock);
73443 if (unlikely(inode->i_pipe)) {
73444- inode->i_pipe->files++;
73445+ atomic_inc(&inode->i_pipe->files);
73446 spin_unlock(&inode->i_lock);
73447 free_pipe_info(pipe);
73448 pipe = inode->i_pipe;
73449@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
73450 * opened, even when there is no process writing the FIFO.
73451 */
73452 pipe->r_counter++;
73453- if (pipe->readers++ == 0)
73454+ if (atomic_inc_return(&pipe->readers) == 1)
73455 wake_up_partner(pipe);
73456
73457- if (!is_pipe && !pipe->writers) {
73458+ if (!is_pipe && !atomic_read(&pipe->writers)) {
73459 if ((filp->f_flags & O_NONBLOCK)) {
73460 /* suppress POLLHUP until we have
73461 * seen a writer */
73462@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
73463 * errno=ENXIO when there is no process reading the FIFO.
73464 */
73465 ret = -ENXIO;
73466- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
73467+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
73468 goto err;
73469
73470 pipe->w_counter++;
73471- if (!pipe->writers++)
73472+ if (atomic_inc_return(&pipe->writers) == 1)
73473 wake_up_partner(pipe);
73474
73475- if (!is_pipe && !pipe->readers) {
73476+ if (!is_pipe && !atomic_read(&pipe->readers)) {
73477 if (wait_for_partner(pipe, &pipe->r_counter))
73478 goto err_wr;
73479 }
73480@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
73481 * the process can at least talk to itself.
73482 */
73483
73484- pipe->readers++;
73485- pipe->writers++;
73486+ atomic_inc(&pipe->readers);
73487+ atomic_inc(&pipe->writers);
73488 pipe->r_counter++;
73489 pipe->w_counter++;
73490- if (pipe->readers == 1 || pipe->writers == 1)
73491+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
73492 wake_up_partner(pipe);
73493 break;
73494
73495@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
73496 return 0;
73497
73498 err_rd:
73499- if (!--pipe->readers)
73500+ if (atomic_dec_and_test(&pipe->readers))
73501 wake_up_interruptible(&pipe->wait);
73502 ret = -ERESTARTSYS;
73503 goto err;
73504
73505 err_wr:
73506- if (!--pipe->writers)
73507+ if (atomic_dec_and_test(&pipe->writers))
73508 wake_up_interruptible(&pipe->wait);
73509 ret = -ERESTARTSYS;
73510 goto err;
73511@@ -1010,7 +1011,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
73512 * Currently we rely on the pipe array holding a power-of-2 number
73513 * of pages.
73514 */
73515-static inline unsigned int round_pipe_size(unsigned int size)
73516+static inline unsigned long round_pipe_size(unsigned long size)
73517 {
73518 unsigned long nr_pages;
73519
73520@@ -1058,13 +1059,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
73521
73522 switch (cmd) {
73523 case F_SETPIPE_SZ: {
73524- unsigned int size, nr_pages;
73525+ unsigned long size, nr_pages;
73526+
73527+ ret = -EINVAL;
73528+ if (arg < pipe_min_size)
73529+ goto out;
73530
73531 size = round_pipe_size(arg);
73532 nr_pages = size >> PAGE_SHIFT;
73533
73534- ret = -EINVAL;
73535- if (!nr_pages)
73536+ if (size < pipe_min_size)
73537 goto out;
73538
73539 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
73540diff --git a/fs/posix_acl.c b/fs/posix_acl.c
73541index 3a48bb7..403067b 100644
73542--- a/fs/posix_acl.c
73543+++ b/fs/posix_acl.c
73544@@ -20,6 +20,7 @@
73545 #include <linux/xattr.h>
73546 #include <linux/export.h>
73547 #include <linux/user_namespace.h>
73548+#include <linux/grsecurity.h>
73549
73550 struct posix_acl **acl_by_type(struct inode *inode, int type)
73551 {
73552@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
73553 }
73554 }
73555 if (mode_p)
73556- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73557+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73558 return not_equiv;
73559 }
73560 EXPORT_SYMBOL(posix_acl_equiv_mode);
73561@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
73562 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
73563 }
73564
73565- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73566+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73567 return not_equiv;
73568 }
73569
73570@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
73571 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
73572 int err = -ENOMEM;
73573 if (clone) {
73574+ *mode_p &= ~gr_acl_umask();
73575+
73576 err = posix_acl_create_masq(clone, mode_p);
73577 if (err < 0) {
73578 posix_acl_release(clone);
73579@@ -663,11 +666,12 @@ struct posix_acl *
73580 posix_acl_from_xattr(struct user_namespace *user_ns,
73581 const void *value, size_t size)
73582 {
73583- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
73584- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
73585+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
73586+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
73587 int count;
73588 struct posix_acl *acl;
73589 struct posix_acl_entry *acl_e;
73590+ umode_t umask = gr_acl_umask();
73591
73592 if (!value)
73593 return NULL;
73594@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73595
73596 switch(acl_e->e_tag) {
73597 case ACL_USER_OBJ:
73598+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73599+ break;
73600 case ACL_GROUP_OBJ:
73601 case ACL_MASK:
73602+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73603+ break;
73604 case ACL_OTHER:
73605+ acl_e->e_perm &= ~(umask & S_IRWXO);
73606 break;
73607
73608 case ACL_USER:
73609+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73610 acl_e->e_uid =
73611 make_kuid(user_ns,
73612 le32_to_cpu(entry->e_id));
73613@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73614 goto fail;
73615 break;
73616 case ACL_GROUP:
73617+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73618 acl_e->e_gid =
73619 make_kgid(user_ns,
73620 le32_to_cpu(entry->e_id));
73621diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
73622index 2183fcf..3c32a98 100644
73623--- a/fs/proc/Kconfig
73624+++ b/fs/proc/Kconfig
73625@@ -30,7 +30,7 @@ config PROC_FS
73626
73627 config PROC_KCORE
73628 bool "/proc/kcore support" if !ARM
73629- depends on PROC_FS && MMU
73630+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
73631 help
73632 Provides a virtual ELF core file of the live kernel. This can
73633 be read with gdb and other ELF tools. No modifications can be
73634@@ -38,8 +38,8 @@ config PROC_KCORE
73635
73636 config PROC_VMCORE
73637 bool "/proc/vmcore support"
73638- depends on PROC_FS && CRASH_DUMP
73639- default y
73640+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
73641+ default n
73642 help
73643 Exports the dump image of crashed kernel in ELF format.
73644
73645@@ -63,8 +63,8 @@ config PROC_SYSCTL
73646 limited in memory.
73647
73648 config PROC_PAGE_MONITOR
73649- default y
73650- depends on PROC_FS && MMU
73651+ default n
73652+ depends on PROC_FS && MMU && !GRKERNSEC
73653 bool "Enable /proc page monitoring" if EXPERT
73654 help
73655 Various /proc files exist to monitor process memory utilization:
73656diff --git a/fs/proc/array.c b/fs/proc/array.c
73657index 1295a00..4c91a6b 100644
73658--- a/fs/proc/array.c
73659+++ b/fs/proc/array.c
73660@@ -60,6 +60,7 @@
73661 #include <linux/tty.h>
73662 #include <linux/string.h>
73663 #include <linux/mman.h>
73664+#include <linux/grsecurity.h>
73665 #include <linux/proc_fs.h>
73666 #include <linux/ioport.h>
73667 #include <linux/uaccess.h>
73668@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
73669 cpumask_pr_args(&task->cpus_allowed));
73670 }
73671
73672+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73673+static inline void task_pax(struct seq_file *m, struct task_struct *p)
73674+{
73675+ if (p->mm)
73676+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
73677+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
73678+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
73679+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
73680+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
73681+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
73682+ else
73683+ seq_printf(m, "PaX:\t-----\n");
73684+}
73685+#endif
73686+
73687 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73688 struct pid *pid, struct task_struct *task)
73689 {
73690@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73691 task_cpus_allowed(m, task);
73692 cpuset_task_status_allowed(m, task);
73693 task_context_switch_counts(m, task);
73694+
73695+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73696+ task_pax(m, task);
73697+#endif
73698+
73699+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
73700+ task_grsec_rbac(m, task);
73701+#endif
73702+
73703 return 0;
73704 }
73705
73706+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73707+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73708+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73709+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73710+#endif
73711+
73712 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73713 struct pid *pid, struct task_struct *task, int whole)
73714 {
73715@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73716 char tcomm[sizeof(task->comm)];
73717 unsigned long flags;
73718
73719+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73720+ if (current->exec_id != m->exec_id) {
73721+ gr_log_badprocpid("stat");
73722+ return 0;
73723+ }
73724+#endif
73725+
73726 state = *get_task_state(task);
73727 vsize = eip = esp = 0;
73728 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73729@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73730 gtime = task_gtime(task);
73731 }
73732
73733+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73734+ if (PAX_RAND_FLAGS(mm)) {
73735+ eip = 0;
73736+ esp = 0;
73737+ wchan = 0;
73738+ }
73739+#endif
73740+#ifdef CONFIG_GRKERNSEC_HIDESYM
73741+ wchan = 0;
73742+ eip =0;
73743+ esp =0;
73744+#endif
73745+
73746 /* scale priority and nice values from timeslices to -20..20 */
73747 /* to make it look like a "normal" Unix priority/nice value */
73748 priority = task_prio(task);
73749@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73750 seq_put_decimal_ull(m, ' ', vsize);
73751 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
73752 seq_put_decimal_ull(m, ' ', rsslim);
73753+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73754+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
73755+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
73756+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
73757+#else
73758 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
73759 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
73760 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
73761+#endif
73762 seq_put_decimal_ull(m, ' ', esp);
73763 seq_put_decimal_ull(m, ' ', eip);
73764 /* The signal information here is obsolete.
73765@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73766 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
73767 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
73768
73769- if (mm && permitted) {
73770+ if (mm && permitted
73771+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73772+ && !PAX_RAND_FLAGS(mm)
73773+#endif
73774+ ) {
73775 seq_put_decimal_ull(m, ' ', mm->start_data);
73776 seq_put_decimal_ull(m, ' ', mm->end_data);
73777 seq_put_decimal_ull(m, ' ', mm->start_brk);
73778@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73779 struct pid *pid, struct task_struct *task)
73780 {
73781 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
73782- struct mm_struct *mm = get_task_mm(task);
73783+ struct mm_struct *mm;
73784
73785+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73786+ if (current->exec_id != m->exec_id) {
73787+ gr_log_badprocpid("statm");
73788+ return 0;
73789+ }
73790+#endif
73791+ mm = get_task_mm(task);
73792 if (mm) {
73793 size = task_statm(mm, &shared, &text, &data, &resident);
73794 mmput(mm);
73795@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73796 return 0;
73797 }
73798
73799+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
73800+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
73801+{
73802+ unsigned long flags;
73803+ u32 curr_ip = 0;
73804+
73805+ if (lock_task_sighand(task, &flags)) {
73806+ curr_ip = task->signal->curr_ip;
73807+ unlock_task_sighand(task, &flags);
73808+ }
73809+ return seq_printf(m, "%pI4\n", &curr_ip);
73810+}
73811+#endif
73812+
73813 #ifdef CONFIG_CHECKPOINT_RESTORE
73814 static struct pid *
73815 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
73816diff --git a/fs/proc/base.c b/fs/proc/base.c
73817index 3f3d7ae..68de109 100644
73818--- a/fs/proc/base.c
73819+++ b/fs/proc/base.c
73820@@ -113,6 +113,14 @@ struct pid_entry {
73821 union proc_op op;
73822 };
73823
73824+struct getdents_callback {
73825+ struct linux_dirent __user * current_dir;
73826+ struct linux_dirent __user * previous;
73827+ struct file * file;
73828+ int count;
73829+ int error;
73830+};
73831+
73832 #define NOD(NAME, MODE, IOP, FOP, OP) { \
73833 .name = (NAME), \
73834 .len = sizeof(NAME) - 1, \
73835@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
73836 return 0;
73837 }
73838
73839+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73840+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73841+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73842+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73843+#endif
73844+
73845 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
73846 struct pid *pid, struct task_struct *task)
73847 {
73848 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
73849 if (mm && !IS_ERR(mm)) {
73850 unsigned int nwords = 0;
73851+
73852+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73853+ /* allow if we're currently ptracing this task */
73854+ if (PAX_RAND_FLAGS(mm) &&
73855+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
73856+ mmput(mm);
73857+ return 0;
73858+ }
73859+#endif
73860+
73861 do {
73862 nwords += 2;
73863 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
73864@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
73865 }
73866
73867
73868-#ifdef CONFIG_KALLSYMS
73869+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73870 /*
73871 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
73872 * Returns the resolved symbol. If that fails, simply return the address.
73873@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
73874 mutex_unlock(&task->signal->cred_guard_mutex);
73875 }
73876
73877-#ifdef CONFIG_STACKTRACE
73878+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73879
73880 #define MAX_STACK_TRACE_DEPTH 64
73881
73882@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
73883 return 0;
73884 }
73885
73886-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
73887+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
73888 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
73889 struct pid *pid, struct task_struct *task)
73890 {
73891@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
73892 /************************************************************************/
73893
73894 /* permission checks */
73895-static int proc_fd_access_allowed(struct inode *inode)
73896+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
73897 {
73898 struct task_struct *task;
73899 int allowed = 0;
73900@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
73901 */
73902 task = get_proc_task(inode);
73903 if (task) {
73904- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
73905+ if (log)
73906+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
73907+ else
73908+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73909 put_task_struct(task);
73910 }
73911 return allowed;
73912@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
73913 struct task_struct *task,
73914 int hide_pid_min)
73915 {
73916+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
73917+ return false;
73918+
73919+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73920+ rcu_read_lock();
73921+ {
73922+ const struct cred *tmpcred = current_cred();
73923+ const struct cred *cred = __task_cred(task);
73924+
73925+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
73926+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
73927+ || in_group_p(grsec_proc_gid)
73928+#endif
73929+ ) {
73930+ rcu_read_unlock();
73931+ return true;
73932+ }
73933+ }
73934+ rcu_read_unlock();
73935+
73936+ if (!pid->hide_pid)
73937+ return false;
73938+#endif
73939+
73940 if (pid->hide_pid < hide_pid_min)
73941 return true;
73942 if (in_group_p(pid->pid_gid))
73943 return true;
73944+
73945 return ptrace_may_access(task, PTRACE_MODE_READ);
73946 }
73947
73948@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
73949 put_task_struct(task);
73950
73951 if (!has_perms) {
73952+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73953+ {
73954+#else
73955 if (pid->hide_pid == 2) {
73956+#endif
73957 /*
73958 * Let's make getdents(), stat(), and open()
73959 * consistent with each other. If a process
73960@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
73961
73962 if (task) {
73963 mm = mm_access(task, mode);
73964+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
73965+ mmput(mm);
73966+ mm = ERR_PTR(-EPERM);
73967+ }
73968 put_task_struct(task);
73969
73970 if (!IS_ERR_OR_NULL(mm)) {
73971@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
73972 return PTR_ERR(mm);
73973
73974 file->private_data = mm;
73975+
73976+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73977+ file->f_version = current->exec_id;
73978+#endif
73979+
73980 return 0;
73981 }
73982
73983@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
73984 ssize_t copied;
73985 char *page;
73986
73987+#ifdef CONFIG_GRKERNSEC
73988+ if (write)
73989+ return -EPERM;
73990+#endif
73991+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73992+ if (file->f_version != current->exec_id) {
73993+ gr_log_badprocpid("mem");
73994+ return 0;
73995+ }
73996+#endif
73997+
73998 if (!mm)
73999 return 0;
74000
74001@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74002 goto free;
74003
74004 while (count > 0) {
74005- int this_len = min_t(int, count, PAGE_SIZE);
74006+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
74007
74008 if (write && copy_from_user(page, buf, this_len)) {
74009 copied = -EFAULT;
74010@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74011 if (!mm)
74012 return 0;
74013
74014+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74015+ if (file->f_version != current->exec_id) {
74016+ gr_log_badprocpid("environ");
74017+ return 0;
74018+ }
74019+#endif
74020+
74021 page = (char *)__get_free_page(GFP_TEMPORARY);
74022 if (!page)
74023 return -ENOMEM;
74024@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74025 goto free;
74026 while (count > 0) {
74027 size_t this_len, max_len;
74028- int retval;
74029+ ssize_t retval;
74030
74031 if (src >= (mm->env_end - mm->env_start))
74032 break;
74033@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
74034 int error = -EACCES;
74035
74036 /* Are we allowed to snoop on the tasks file descriptors? */
74037- if (!proc_fd_access_allowed(inode))
74038+ if (!proc_fd_access_allowed(inode, 0))
74039 goto out;
74040
74041 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74042@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
74043 struct path path;
74044
74045 /* Are we allowed to snoop on the tasks file descriptors? */
74046- if (!proc_fd_access_allowed(inode))
74047- goto out;
74048+ /* logging this is needed for learning on chromium to work properly,
74049+ but we don't want to flood the logs from 'ps' which does a readlink
74050+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
74051+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
74052+ */
74053+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
74054+ if (!proc_fd_access_allowed(inode,0))
74055+ goto out;
74056+ } else {
74057+ if (!proc_fd_access_allowed(inode,1))
74058+ goto out;
74059+ }
74060
74061 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74062 if (error)
74063@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
74064 rcu_read_lock();
74065 cred = __task_cred(task);
74066 inode->i_uid = cred->euid;
74067+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74068+ inode->i_gid = grsec_proc_gid;
74069+#else
74070 inode->i_gid = cred->egid;
74071+#endif
74072 rcu_read_unlock();
74073 }
74074 security_task_to_inode(task, inode);
74075@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
74076 return -ENOENT;
74077 }
74078 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74079+#ifdef CONFIG_GRKERNSEC_PROC_USER
74080+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74081+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74082+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74083+#endif
74084 task_dumpable(task)) {
74085 cred = __task_cred(task);
74086 stat->uid = cred->euid;
74087+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74088+ stat->gid = grsec_proc_gid;
74089+#else
74090 stat->gid = cred->egid;
74091+#endif
74092 }
74093 }
74094 rcu_read_unlock();
74095@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
74096
74097 if (task) {
74098 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74099+#ifdef CONFIG_GRKERNSEC_PROC_USER
74100+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74101+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74102+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74103+#endif
74104 task_dumpable(task)) {
74105 rcu_read_lock();
74106 cred = __task_cred(task);
74107 inode->i_uid = cred->euid;
74108+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74109+ inode->i_gid = grsec_proc_gid;
74110+#else
74111 inode->i_gid = cred->egid;
74112+#endif
74113 rcu_read_unlock();
74114 } else {
74115 inode->i_uid = GLOBAL_ROOT_UID;
74116@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
74117 if (!task)
74118 goto out_no_task;
74119
74120+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74121+ goto out;
74122+
74123 /*
74124 * Yes, it does not scale. And it should not. Don't add
74125 * new entries into /proc/<tgid>/ without very good reasons.
74126@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
74127 if (!task)
74128 return -ENOENT;
74129
74130+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74131+ goto out;
74132+
74133 if (!dir_emit_dots(file, ctx))
74134 goto out;
74135
74136@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
74137 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
74138 #endif
74139 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74140-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74141+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74142 ONE("syscall", S_IRUSR, proc_pid_syscall),
74143 #endif
74144 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74145@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
74146 #ifdef CONFIG_SECURITY
74147 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74148 #endif
74149-#ifdef CONFIG_KALLSYMS
74150+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74151 ONE("wchan", S_IRUGO, proc_pid_wchan),
74152 #endif
74153-#ifdef CONFIG_STACKTRACE
74154+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74155 ONE("stack", S_IRUSR, proc_pid_stack),
74156 #endif
74157 #ifdef CONFIG_SCHEDSTATS
74158@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
74159 #ifdef CONFIG_HARDWALL
74160 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
74161 #endif
74162+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74163+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
74164+#endif
74165 #ifdef CONFIG_USER_NS
74166 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
74167 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
74168@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
74169 if (!inode)
74170 goto out;
74171
74172+#ifdef CONFIG_GRKERNSEC_PROC_USER
74173+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
74174+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74175+ inode->i_gid = grsec_proc_gid;
74176+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
74177+#else
74178 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
74179+#endif
74180 inode->i_op = &proc_tgid_base_inode_operations;
74181 inode->i_fop = &proc_tgid_base_operations;
74182 inode->i_flags|=S_IMMUTABLE;
74183@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
74184 if (!task)
74185 goto out;
74186
74187+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74188+ goto out_put_task;
74189+
74190 result = proc_pid_instantiate(dir, dentry, task, NULL);
74191+out_put_task:
74192 put_task_struct(task);
74193 out:
74194 return ERR_PTR(result);
74195@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
74196 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
74197 #endif
74198 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74199-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74200+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74201 ONE("syscall", S_IRUSR, proc_pid_syscall),
74202 #endif
74203 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74204@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
74205 #ifdef CONFIG_SECURITY
74206 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74207 #endif
74208-#ifdef CONFIG_KALLSYMS
74209+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74210 ONE("wchan", S_IRUGO, proc_pid_wchan),
74211 #endif
74212-#ifdef CONFIG_STACKTRACE
74213+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74214 ONE("stack", S_IRUSR, proc_pid_stack),
74215 #endif
74216 #ifdef CONFIG_SCHEDSTATS
74217diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
74218index cbd82df..c0407d2 100644
74219--- a/fs/proc/cmdline.c
74220+++ b/fs/proc/cmdline.c
74221@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
74222
74223 static int __init proc_cmdline_init(void)
74224 {
74225+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74226+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
74227+#else
74228 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
74229+#endif
74230 return 0;
74231 }
74232 fs_initcall(proc_cmdline_init);
74233diff --git a/fs/proc/devices.c b/fs/proc/devices.c
74234index 50493ed..248166b 100644
74235--- a/fs/proc/devices.c
74236+++ b/fs/proc/devices.c
74237@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
74238
74239 static int __init proc_devices_init(void)
74240 {
74241+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74242+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
74243+#else
74244 proc_create("devices", 0, NULL, &proc_devinfo_operations);
74245+#endif
74246 return 0;
74247 }
74248 fs_initcall(proc_devices_init);
74249diff --git a/fs/proc/fd.c b/fs/proc/fd.c
74250index 8e5ad83..1f07a8c 100644
74251--- a/fs/proc/fd.c
74252+++ b/fs/proc/fd.c
74253@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
74254 if (!task)
74255 return -ENOENT;
74256
74257- files = get_files_struct(task);
74258+ if (!gr_acl_handle_procpidmem(task))
74259+ files = get_files_struct(task);
74260 put_task_struct(task);
74261
74262 if (files) {
74263@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
74264 */
74265 int proc_fd_permission(struct inode *inode, int mask)
74266 {
74267+ struct task_struct *task;
74268 int rv = generic_permission(inode, mask);
74269- if (rv == 0)
74270- return 0;
74271+
74272 if (task_tgid(current) == proc_pid(inode))
74273 rv = 0;
74274+
74275+ task = get_proc_task(inode);
74276+ if (task == NULL)
74277+ return rv;
74278+
74279+ if (gr_acl_handle_procpidmem(task))
74280+ rv = -EACCES;
74281+
74282+ put_task_struct(task);
74283+
74284 return rv;
74285 }
74286
74287diff --git a/fs/proc/generic.c b/fs/proc/generic.c
74288index be65b20..2998ba8 100644
74289--- a/fs/proc/generic.c
74290+++ b/fs/proc/generic.c
74291@@ -22,6 +22,7 @@
74292 #include <linux/bitops.h>
74293 #include <linux/spinlock.h>
74294 #include <linux/completion.h>
74295+#include <linux/grsecurity.h>
74296 #include <asm/uaccess.h>
74297
74298 #include "internal.h"
74299@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
74300 return proc_lookup_de(PDE(dir), dir, dentry);
74301 }
74302
74303+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
74304+ unsigned int flags)
74305+{
74306+ if (gr_proc_is_restricted())
74307+ return ERR_PTR(-EACCES);
74308+
74309+ return proc_lookup_de(PDE(dir), dir, dentry);
74310+}
74311+
74312 /*
74313 * This returns non-zero if at EOF, so that the /proc
74314 * root directory can use this and check if it should
74315@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
74316 return proc_readdir_de(PDE(inode), file, ctx);
74317 }
74318
74319+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
74320+{
74321+ struct inode *inode = file_inode(file);
74322+
74323+ if (gr_proc_is_restricted())
74324+ return -EACCES;
74325+
74326+ return proc_readdir_de(PDE(inode), file, ctx);
74327+}
74328+
74329 /*
74330 * These are the generic /proc directory operations. They
74331 * use the in-memory "struct proc_dir_entry" tree to parse
74332@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
74333 .iterate = proc_readdir,
74334 };
74335
74336+static const struct file_operations proc_dir_restricted_operations = {
74337+ .llseek = generic_file_llseek,
74338+ .read = generic_read_dir,
74339+ .iterate = proc_readdir_restrict,
74340+};
74341+
74342 /*
74343 * proc directories can do almost nothing..
74344 */
74345@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
74346 .setattr = proc_notify_change,
74347 };
74348
74349+static const struct inode_operations proc_dir_restricted_inode_operations = {
74350+ .lookup = proc_lookup_restrict,
74351+ .getattr = proc_getattr,
74352+ .setattr = proc_notify_change,
74353+};
74354+
74355 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
74356 {
74357 int ret;
74358@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
74359 }
74360 EXPORT_SYMBOL_GPL(proc_mkdir_data);
74361
74362+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
74363+ struct proc_dir_entry *parent, void *data)
74364+{
74365+ struct proc_dir_entry *ent;
74366+
74367+ if (mode == 0)
74368+ mode = S_IRUGO | S_IXUGO;
74369+
74370+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
74371+ if (ent) {
74372+ ent->data = data;
74373+ ent->restricted = 1;
74374+ ent->proc_fops = &proc_dir_restricted_operations;
74375+ ent->proc_iops = &proc_dir_restricted_inode_operations;
74376+ parent->nlink++;
74377+ if (proc_register(parent, ent) < 0) {
74378+ kfree(ent);
74379+ parent->nlink--;
74380+ ent = NULL;
74381+ }
74382+ }
74383+ return ent;
74384+}
74385+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
74386+
74387 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
74388 struct proc_dir_entry *parent)
74389 {
74390@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
74391 }
74392 EXPORT_SYMBOL(proc_mkdir);
74393
74394+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
74395+ struct proc_dir_entry *parent)
74396+{
74397+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
74398+}
74399+EXPORT_SYMBOL(proc_mkdir_restrict);
74400+
74401 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
74402 struct proc_dir_entry *parent,
74403 const struct file_operations *proc_fops,
74404diff --git a/fs/proc/inode.c b/fs/proc/inode.c
74405index 7697b66..8d8e541 100644
74406--- a/fs/proc/inode.c
74407+++ b/fs/proc/inode.c
74408@@ -24,11 +24,17 @@
74409 #include <linux/mount.h>
74410 #include <linux/magic.h>
74411 #include <linux/namei.h>
74412+#include <linux/grsecurity.h>
74413
74414 #include <asm/uaccess.h>
74415
74416 #include "internal.h"
74417
74418+#ifdef CONFIG_PROC_SYSCTL
74419+extern const struct inode_operations proc_sys_inode_operations;
74420+extern const struct inode_operations proc_sys_dir_operations;
74421+#endif
74422+
74423 static void proc_evict_inode(struct inode *inode)
74424 {
74425 struct proc_dir_entry *de;
74426@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
74427 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
74428 sysctl_head_put(head);
74429 }
74430+
74431+#ifdef CONFIG_PROC_SYSCTL
74432+ if (inode->i_op == &proc_sys_inode_operations ||
74433+ inode->i_op == &proc_sys_dir_operations)
74434+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
74435+#endif
74436+
74437 }
74438
74439 static struct kmem_cache * proc_inode_cachep;
74440@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
74441 if (de->mode) {
74442 inode->i_mode = de->mode;
74443 inode->i_uid = de->uid;
74444+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74445+ inode->i_gid = grsec_proc_gid;
74446+#else
74447 inode->i_gid = de->gid;
74448+#endif
74449 }
74450 if (de->size)
74451 inode->i_size = de->size;
74452diff --git a/fs/proc/internal.h b/fs/proc/internal.h
74453index c835b94..c9e01a3 100644
74454--- a/fs/proc/internal.h
74455+++ b/fs/proc/internal.h
74456@@ -47,9 +47,10 @@ struct proc_dir_entry {
74457 struct completion *pde_unload_completion;
74458 struct list_head pde_openers; /* who did ->open, but not ->release */
74459 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
74460+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
74461 u8 namelen;
74462 char name[];
74463-};
74464+} __randomize_layout;
74465
74466 union proc_op {
74467 int (*proc_get_link)(struct dentry *, struct path *);
74468@@ -67,7 +68,7 @@ struct proc_inode {
74469 struct ctl_table *sysctl_entry;
74470 const struct proc_ns_operations *ns_ops;
74471 struct inode vfs_inode;
74472-};
74473+} __randomize_layout;
74474
74475 /*
74476 * General functions
74477@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
74478 struct pid *, struct task_struct *);
74479 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
74480 struct pid *, struct task_struct *);
74481+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74482+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
74483+ struct pid *, struct task_struct *);
74484+#endif
74485
74486 /*
74487 * base.c
74488@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
74489 * generic.c
74490 */
74491 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
74492+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
74493 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
74494 struct dentry *);
74495 extern int proc_readdir(struct file *, struct dir_context *);
74496+extern int proc_readdir_restrict(struct file *, struct dir_context *);
74497 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
74498
74499 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
74500diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
74501index a352d57..cb94a5c 100644
74502--- a/fs/proc/interrupts.c
74503+++ b/fs/proc/interrupts.c
74504@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
74505
74506 static int __init proc_interrupts_init(void)
74507 {
74508+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74509+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
74510+#else
74511 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
74512+#endif
74513 return 0;
74514 }
74515 fs_initcall(proc_interrupts_init);
74516diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
74517index 91a4e64..14bf8fa 100644
74518--- a/fs/proc/kcore.c
74519+++ b/fs/proc/kcore.c
74520@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74521 * the addresses in the elf_phdr on our list.
74522 */
74523 start = kc_offset_to_vaddr(*fpos - elf_buflen);
74524- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
74525+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
74526+ if (tsz > buflen)
74527 tsz = buflen;
74528-
74529+
74530 while (buflen) {
74531 struct kcore_list *m;
74532
74533@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74534 } else {
74535 if (kern_addr_valid(start)) {
74536 unsigned long n;
74537+ char *elf_buf;
74538+ mm_segment_t oldfs;
74539
74540- n = copy_to_user(buffer, (char *)start, tsz);
74541- /*
74542- * We cannot distinguish between fault on source
74543- * and fault on destination. When this happens
74544- * we clear too and hope it will trigger the
74545- * EFAULT again.
74546- */
74547- if (n) {
74548- if (clear_user(buffer + tsz - n,
74549- n))
74550- return -EFAULT;
74551- }
74552+ elf_buf = kzalloc(tsz, GFP_KERNEL);
74553+ if (!elf_buf)
74554+ return -ENOMEM;
74555+ oldfs = get_fs();
74556+ set_fs(KERNEL_DS);
74557+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
74558+ set_fs(oldfs);
74559+ n = copy_to_user(buffer, elf_buf, tsz);
74560+ kfree(elf_buf);
74561+ if (n)
74562+ return -EFAULT;
74563 } else {
74564 if (clear_user(buffer, tsz))
74565 return -EFAULT;
74566@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74567
74568 static int open_kcore(struct inode *inode, struct file *filp)
74569 {
74570+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
74571+ return -EPERM;
74572+#endif
74573 if (!capable(CAP_SYS_RAWIO))
74574 return -EPERM;
74575 if (kcore_need_update)
74576@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
74577 return NOTIFY_OK;
74578 }
74579
74580-static struct notifier_block kcore_callback_nb __meminitdata = {
74581+static struct notifier_block kcore_callback_nb __meminitconst = {
74582 .notifier_call = kcore_callback,
74583 .priority = 0,
74584 };
74585diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
74586index d3ebf2e..6ad42d1 100644
74587--- a/fs/proc/meminfo.c
74588+++ b/fs/proc/meminfo.c
74589@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
74590 vmi.used >> 10,
74591 vmi.largest_chunk >> 10
74592 #ifdef CONFIG_MEMORY_FAILURE
74593- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74594+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74595 #endif
74596 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
74597 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
74598diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
74599index d4a3574..b421ce9 100644
74600--- a/fs/proc/nommu.c
74601+++ b/fs/proc/nommu.c
74602@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
74603
74604 if (file) {
74605 seq_pad(m, ' ');
74606- seq_path(m, &file->f_path, "");
74607+ seq_path(m, &file->f_path, "\n\\");
74608 }
74609
74610 seq_putc(m, '\n');
74611diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
74612index 1bde894..22ac7eb 100644
74613--- a/fs/proc/proc_net.c
74614+++ b/fs/proc/proc_net.c
74615@@ -23,9 +23,27 @@
74616 #include <linux/nsproxy.h>
74617 #include <net/net_namespace.h>
74618 #include <linux/seq_file.h>
74619+#include <linux/grsecurity.h>
74620
74621 #include "internal.h"
74622
74623+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74624+static struct seq_operations *ipv6_seq_ops_addr;
74625+
74626+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
74627+{
74628+ ipv6_seq_ops_addr = addr;
74629+}
74630+
74631+void unregister_ipv6_seq_ops_addr(void)
74632+{
74633+ ipv6_seq_ops_addr = NULL;
74634+}
74635+
74636+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
74637+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
74638+#endif
74639+
74640 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
74641 {
74642 return pde->parent->data;
74643@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
74644 return maybe_get_net(PDE_NET(PDE(inode)));
74645 }
74646
74647+extern const struct seq_operations dev_seq_ops;
74648+
74649 int seq_open_net(struct inode *ino, struct file *f,
74650 const struct seq_operations *ops, int size)
74651 {
74652@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
74653
74654 BUG_ON(size < sizeof(*p));
74655
74656+ /* only permit access to /proc/net/dev */
74657+ if (
74658+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74659+ ops != ipv6_seq_ops_addr &&
74660+#endif
74661+ ops != &dev_seq_ops && gr_proc_is_restricted())
74662+ return -EACCES;
74663+
74664 net = get_proc_net(ino);
74665 if (net == NULL)
74666 return -ENXIO;
74667@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
74668 int err;
74669 struct net *net;
74670
74671+ if (gr_proc_is_restricted())
74672+ return -EACCES;
74673+
74674 err = -ENXIO;
74675 net = get_proc_net(inode);
74676 if (net == NULL)
74677diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
74678index f92d5dd..26398ac 100644
74679--- a/fs/proc/proc_sysctl.c
74680+++ b/fs/proc/proc_sysctl.c
74681@@ -11,13 +11,21 @@
74682 #include <linux/namei.h>
74683 #include <linux/mm.h>
74684 #include <linux/module.h>
74685+#include <linux/nsproxy.h>
74686+#ifdef CONFIG_GRKERNSEC
74687+#include <net/net_namespace.h>
74688+#endif
74689 #include "internal.h"
74690
74691+extern int gr_handle_chroot_sysctl(const int op);
74692+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
74693+ const int op);
74694+
74695 static const struct dentry_operations proc_sys_dentry_operations;
74696 static const struct file_operations proc_sys_file_operations;
74697-static const struct inode_operations proc_sys_inode_operations;
74698+const struct inode_operations proc_sys_inode_operations;
74699 static const struct file_operations proc_sys_dir_file_operations;
74700-static const struct inode_operations proc_sys_dir_operations;
74701+const struct inode_operations proc_sys_dir_operations;
74702
74703 void proc_sys_poll_notify(struct ctl_table_poll *poll)
74704 {
74705@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
74706
74707 err = NULL;
74708 d_set_d_op(dentry, &proc_sys_dentry_operations);
74709+
74710+ gr_handle_proc_create(dentry, inode);
74711+
74712 d_add(dentry, inode);
74713
74714 out:
74715@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74716 struct inode *inode = file_inode(filp);
74717 struct ctl_table_header *head = grab_header(inode);
74718 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
74719+ int op = write ? MAY_WRITE : MAY_READ;
74720 ssize_t error;
74721 size_t res;
74722
74723@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74724 * and won't be until we finish.
74725 */
74726 error = -EPERM;
74727- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
74728+ if (sysctl_perm(head, table, op))
74729 goto out;
74730
74731 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
74732@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74733 if (!table->proc_handler)
74734 goto out;
74735
74736+#ifdef CONFIG_GRKERNSEC
74737+ error = -EPERM;
74738+ if (gr_handle_chroot_sysctl(op))
74739+ goto out;
74740+ dget(filp->f_path.dentry);
74741+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
74742+ dput(filp->f_path.dentry);
74743+ goto out;
74744+ }
74745+ dput(filp->f_path.dentry);
74746+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
74747+ goto out;
74748+ if (write) {
74749+ if (current->nsproxy->net_ns != table->extra2) {
74750+ if (!capable(CAP_SYS_ADMIN))
74751+ goto out;
74752+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
74753+ goto out;
74754+ }
74755+#endif
74756+
74757 /* careful: calling conventions are nasty here */
74758 res = count;
74759 error = table->proc_handler(table, write, buf, &res, ppos);
74760@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
74761 return false;
74762 } else {
74763 d_set_d_op(child, &proc_sys_dentry_operations);
74764+
74765+ gr_handle_proc_create(child, inode);
74766+
74767 d_add(child, inode);
74768 }
74769 } else {
74770@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
74771 if ((*pos)++ < ctx->pos)
74772 return true;
74773
74774+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
74775+ return 0;
74776+
74777 if (unlikely(S_ISLNK(table->mode)))
74778 res = proc_sys_link_fill_cache(file, ctx, head, table);
74779 else
74780@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
74781 if (IS_ERR(head))
74782 return PTR_ERR(head);
74783
74784+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
74785+ return -ENOENT;
74786+
74787 generic_fillattr(inode, stat);
74788 if (table)
74789 stat->mode = (stat->mode & S_IFMT) | table->mode;
74790@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
74791 .llseek = generic_file_llseek,
74792 };
74793
74794-static const struct inode_operations proc_sys_inode_operations = {
74795+const struct inode_operations proc_sys_inode_operations = {
74796 .permission = proc_sys_permission,
74797 .setattr = proc_sys_setattr,
74798 .getattr = proc_sys_getattr,
74799 };
74800
74801-static const struct inode_operations proc_sys_dir_operations = {
74802+const struct inode_operations proc_sys_dir_operations = {
74803 .lookup = proc_sys_lookup,
74804 .permission = proc_sys_permission,
74805 .setattr = proc_sys_setattr,
74806@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
74807 static struct ctl_dir *new_dir(struct ctl_table_set *set,
74808 const char *name, int namelen)
74809 {
74810- struct ctl_table *table;
74811+ ctl_table_no_const *table;
74812 struct ctl_dir *new;
74813 struct ctl_node *node;
74814 char *new_name;
74815@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
74816 return NULL;
74817
74818 node = (struct ctl_node *)(new + 1);
74819- table = (struct ctl_table *)(node + 1);
74820+ table = (ctl_table_no_const *)(node + 1);
74821 new_name = (char *)(table + 2);
74822 memcpy(new_name, name, namelen);
74823 new_name[namelen] = '\0';
74824@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
74825 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
74826 struct ctl_table_root *link_root)
74827 {
74828- struct ctl_table *link_table, *entry, *link;
74829+ ctl_table_no_const *link_table, *link;
74830+ struct ctl_table *entry;
74831 struct ctl_table_header *links;
74832 struct ctl_node *node;
74833 char *link_name;
74834@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
74835 return NULL;
74836
74837 node = (struct ctl_node *)(links + 1);
74838- link_table = (struct ctl_table *)(node + nr_entries);
74839+ link_table = (ctl_table_no_const *)(node + nr_entries);
74840 link_name = (char *)&link_table[nr_entries + 1];
74841
74842 for (link = link_table, entry = table; entry->procname; link++, entry++) {
74843@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74844 struct ctl_table_header ***subheader, struct ctl_table_set *set,
74845 struct ctl_table *table)
74846 {
74847- struct ctl_table *ctl_table_arg = NULL;
74848- struct ctl_table *entry, *files;
74849+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
74850+ struct ctl_table *entry;
74851 int nr_files = 0;
74852 int nr_dirs = 0;
74853 int err = -ENOMEM;
74854@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74855 nr_files++;
74856 }
74857
74858- files = table;
74859 /* If there are mixed files and directories we need a new table */
74860 if (nr_dirs && nr_files) {
74861- struct ctl_table *new;
74862+ ctl_table_no_const *new;
74863 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
74864 GFP_KERNEL);
74865 if (!files)
74866@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74867 /* Register everything except a directory full of subdirectories */
74868 if (nr_files || !nr_dirs) {
74869 struct ctl_table_header *header;
74870- header = __register_sysctl_table(set, path, files);
74871+ header = __register_sysctl_table(set, path, files ? files : table);
74872 if (!header) {
74873 kfree(ctl_table_arg);
74874 goto out;
74875diff --git a/fs/proc/root.c b/fs/proc/root.c
74876index e74ac9f..35e89f4 100644
74877--- a/fs/proc/root.c
74878+++ b/fs/proc/root.c
74879@@ -188,7 +188,15 @@ void __init proc_root_init(void)
74880 proc_mkdir("openprom", NULL);
74881 #endif
74882 proc_tty_init();
74883+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74884+#ifdef CONFIG_GRKERNSEC_PROC_USER
74885+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
74886+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74887+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
74888+#endif
74889+#else
74890 proc_mkdir("bus", NULL);
74891+#endif
74892 proc_sys_init();
74893 }
74894
74895diff --git a/fs/proc/stat.c b/fs/proc/stat.c
74896index 510413eb..34d9a8c 100644
74897--- a/fs/proc/stat.c
74898+++ b/fs/proc/stat.c
74899@@ -11,6 +11,7 @@
74900 #include <linux/irqnr.h>
74901 #include <linux/cputime.h>
74902 #include <linux/tick.h>
74903+#include <linux/grsecurity.h>
74904
74905 #ifndef arch_irq_stat_cpu
74906 #define arch_irq_stat_cpu(cpu) 0
74907@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
74908 u64 sum_softirq = 0;
74909 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
74910 struct timespec boottime;
74911+ int unrestricted = 1;
74912+
74913+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74914+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74915+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
74916+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74917+ && !in_group_p(grsec_proc_gid)
74918+#endif
74919+ )
74920+ unrestricted = 0;
74921+#endif
74922+#endif
74923
74924 user = nice = system = idle = iowait =
74925 irq = softirq = steal = 0;
74926@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
74927 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
74928 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
74929 idle += get_idle_time(i);
74930- iowait += get_iowait_time(i);
74931- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
74932- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
74933- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
74934- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
74935- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
74936- sum += kstat_cpu_irqs_sum(i);
74937- sum += arch_irq_stat_cpu(i);
74938+ if (unrestricted) {
74939+ iowait += get_iowait_time(i);
74940+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
74941+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
74942+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
74943+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
74944+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
74945+ sum += kstat_cpu_irqs_sum(i);
74946+ sum += arch_irq_stat_cpu(i);
74947+ for (j = 0; j < NR_SOFTIRQS; j++) {
74948+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
74949
74950- for (j = 0; j < NR_SOFTIRQS; j++) {
74951- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
74952-
74953- per_softirq_sums[j] += softirq_stat;
74954- sum_softirq += softirq_stat;
74955+ per_softirq_sums[j] += softirq_stat;
74956+ sum_softirq += softirq_stat;
74957+ }
74958 }
74959 }
74960- sum += arch_irq_stat();
74961+ if (unrestricted)
74962+ sum += arch_irq_stat();
74963
74964 seq_puts(p, "cpu ");
74965 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
74966@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
74967 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
74968 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
74969 idle = get_idle_time(i);
74970- iowait = get_iowait_time(i);
74971- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
74972- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
74973- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
74974- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
74975- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
74976+ if (unrestricted) {
74977+ iowait = get_iowait_time(i);
74978+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
74979+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
74980+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
74981+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
74982+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
74983+ }
74984 seq_printf(p, "cpu%d", i);
74985 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
74986 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
74987@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
74988
74989 /* sum again ? it could be updated? */
74990 for_each_irq_nr(j)
74991- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
74992+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
74993
74994 seq_printf(p,
74995 "\nctxt %llu\n"
74996@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
74997 "processes %lu\n"
74998 "procs_running %lu\n"
74999 "procs_blocked %lu\n",
75000- nr_context_switches(),
75001+ unrestricted ? nr_context_switches() : 0ULL,
75002 (unsigned long)jif,
75003- total_forks,
75004- nr_running(),
75005- nr_iowait());
75006+ unrestricted ? total_forks : 0UL,
75007+ unrestricted ? nr_running() : 0UL,
75008+ unrestricted ? nr_iowait() : 0UL);
75009
75010 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
75011
75012diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
75013index 6dee68d..1b4add0 100644
75014--- a/fs/proc/task_mmu.c
75015+++ b/fs/proc/task_mmu.c
75016@@ -13,12 +13,19 @@
75017 #include <linux/swap.h>
75018 #include <linux/swapops.h>
75019 #include <linux/mmu_notifier.h>
75020+#include <linux/grsecurity.h>
75021
75022 #include <asm/elf.h>
75023 #include <asm/uaccess.h>
75024 #include <asm/tlbflush.h>
75025 #include "internal.h"
75026
75027+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75028+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
75029+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
75030+ _mm->pax_flags & MF_PAX_SEGMEXEC))
75031+#endif
75032+
75033 void task_mem(struct seq_file *m, struct mm_struct *mm)
75034 {
75035 unsigned long data, text, lib, swap, ptes, pmds;
75036@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75037 "VmLib:\t%8lu kB\n"
75038 "VmPTE:\t%8lu kB\n"
75039 "VmPMD:\t%8lu kB\n"
75040- "VmSwap:\t%8lu kB\n",
75041- hiwater_vm << (PAGE_SHIFT-10),
75042+ "VmSwap:\t%8lu kB\n"
75043+
75044+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75045+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
75046+#endif
75047+
75048+ ,hiwater_vm << (PAGE_SHIFT-10),
75049 total_vm << (PAGE_SHIFT-10),
75050 mm->locked_vm << (PAGE_SHIFT-10),
75051 mm->pinned_vm << (PAGE_SHIFT-10),
75052@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75053 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
75054 ptes >> 10,
75055 pmds >> 10,
75056- swap << (PAGE_SHIFT-10));
75057+ swap << (PAGE_SHIFT-10)
75058+
75059+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75060+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75061+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
75062+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
75063+#else
75064+ , mm->context.user_cs_base
75065+ , mm->context.user_cs_limit
75066+#endif
75067+#endif
75068+
75069+ );
75070 }
75071
75072 unsigned long task_vsize(struct mm_struct *mm)
75073@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75074 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
75075 }
75076
75077- /* We don't show the stack guard page in /proc/maps */
75078+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75079+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
75080+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
75081+#else
75082 start = vma->vm_start;
75083- if (stack_guard_page_start(vma, start))
75084- start += PAGE_SIZE;
75085 end = vma->vm_end;
75086- if (stack_guard_page_end(vma, end))
75087- end -= PAGE_SIZE;
75088+#endif
75089
75090 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
75091 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
75092@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75093 flags & VM_WRITE ? 'w' : '-',
75094 flags & VM_EXEC ? 'x' : '-',
75095 flags & VM_MAYSHARE ? 's' : 'p',
75096+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75097+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
75098+#else
75099 pgoff,
75100+#endif
75101 MAJOR(dev), MINOR(dev), ino);
75102
75103 /*
75104@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75105 */
75106 if (file) {
75107 seq_pad(m, ' ');
75108- seq_path(m, &file->f_path, "\n");
75109+ seq_path(m, &file->f_path, "\n\\");
75110 goto done;
75111 }
75112
75113@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75114 * Thread stack in /proc/PID/task/TID/maps or
75115 * the main process stack.
75116 */
75117- if (!is_pid || (vma->vm_start <= mm->start_stack &&
75118- vma->vm_end >= mm->start_stack)) {
75119+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
75120+ (vma->vm_start <= mm->start_stack &&
75121+ vma->vm_end >= mm->start_stack)) {
75122 name = "[stack]";
75123 } else {
75124 /* Thread stack in /proc/PID/maps */
75125@@ -362,6 +391,12 @@ done:
75126
75127 static int show_map(struct seq_file *m, void *v, int is_pid)
75128 {
75129+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75130+ if (current->exec_id != m->exec_id) {
75131+ gr_log_badprocpid("maps");
75132+ return 0;
75133+ }
75134+#endif
75135 show_map_vma(m, v, is_pid);
75136 m_cache_vma(m, v);
75137 return 0;
75138@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75139 .private = &mss,
75140 };
75141
75142+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75143+ if (current->exec_id != m->exec_id) {
75144+ gr_log_badprocpid("smaps");
75145+ return 0;
75146+ }
75147+#endif
75148 memset(&mss, 0, sizeof mss);
75149- /* mmap_sem is held in m_start */
75150- walk_page_vma(vma, &smaps_walk);
75151+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75152+ if (!PAX_RAND_FLAGS(vma->vm_mm))
75153+#endif
75154+ /* mmap_sem is held in m_start */
75155+ walk_page_vma(vma, &smaps_walk);
75156
75157 show_map_vma(m, vma, is_pid);
75158
75159@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75160 "KernelPageSize: %8lu kB\n"
75161 "MMUPageSize: %8lu kB\n"
75162 "Locked: %8lu kB\n",
75163+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75164+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
75165+#else
75166 (vma->vm_end - vma->vm_start) >> 10,
75167+#endif
75168 mss.resident >> 10,
75169 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
75170 mss.shared_clean >> 10,
75171@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75172 char buffer[64];
75173 int nid;
75174
75175+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75176+ if (current->exec_id != m->exec_id) {
75177+ gr_log_badprocpid("numa_maps");
75178+ return 0;
75179+ }
75180+#endif
75181+
75182 if (!mm)
75183 return 0;
75184
75185@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75186 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
75187 }
75188
75189+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75190+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
75191+#else
75192 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
75193+#endif
75194
75195 if (file) {
75196 seq_puts(m, " file=");
75197- seq_path(m, &file->f_path, "\n\t= ");
75198+ seq_path(m, &file->f_path, "\n\t\\= ");
75199 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
75200 seq_puts(m, " heap");
75201 } else {
75202diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
75203index 599ec2e..f1413ae 100644
75204--- a/fs/proc/task_nommu.c
75205+++ b/fs/proc/task_nommu.c
75206@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75207 else
75208 bytes += kobjsize(mm);
75209
75210- if (current->fs && current->fs->users > 1)
75211+ if (current->fs && atomic_read(&current->fs->users) > 1)
75212 sbytes += kobjsize(current->fs);
75213 else
75214 bytes += kobjsize(current->fs);
75215@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
75216
75217 if (file) {
75218 seq_pad(m, ' ');
75219- seq_path(m, &file->f_path, "");
75220+ seq_path(m, &file->f_path, "\n\\");
75221 } else if (mm) {
75222 pid_t tid = pid_of_stack(priv, vma, is_pid);
75223
75224diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
75225index 4e61388..1a2523d 100644
75226--- a/fs/proc/vmcore.c
75227+++ b/fs/proc/vmcore.c
75228@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
75229 nr_bytes = count;
75230
75231 /* If pfn is not ram, return zeros for sparse dump files */
75232- if (pfn_is_ram(pfn) == 0)
75233- memset(buf, 0, nr_bytes);
75234- else {
75235+ if (pfn_is_ram(pfn) == 0) {
75236+ if (userbuf) {
75237+ if (clear_user((char __force_user *)buf, nr_bytes))
75238+ return -EFAULT;
75239+ } else
75240+ memset(buf, 0, nr_bytes);
75241+ } else {
75242 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
75243 offset, userbuf);
75244 if (tmp < 0)
75245@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
75246 static int copy_to(void *target, void *src, size_t size, int userbuf)
75247 {
75248 if (userbuf) {
75249- if (copy_to_user((char __user *) target, src, size))
75250+ if (copy_to_user((char __force_user *) target, src, size))
75251 return -EFAULT;
75252 } else {
75253 memcpy(target, src, size);
75254@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75255 if (*fpos < m->offset + m->size) {
75256 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
75257 start = m->paddr + *fpos - m->offset;
75258- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
75259+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
75260 if (tmp < 0)
75261 return tmp;
75262 buflen -= tsz;
75263@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75264 static ssize_t read_vmcore(struct file *file, char __user *buffer,
75265 size_t buflen, loff_t *fpos)
75266 {
75267- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
75268+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
75269 }
75270
75271 /*
75272diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
75273index d3fb2b6..43a8140 100644
75274--- a/fs/qnx6/qnx6.h
75275+++ b/fs/qnx6/qnx6.h
75276@@ -74,7 +74,7 @@ enum {
75277 BYTESEX_BE,
75278 };
75279
75280-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75281+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75282 {
75283 if (sbi->s_bytesex == BYTESEX_LE)
75284 return le64_to_cpu((__force __le64)n);
75285@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
75286 return (__force __fs64)cpu_to_be64(n);
75287 }
75288
75289-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75290+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75291 {
75292 if (sbi->s_bytesex == BYTESEX_LE)
75293 return le32_to_cpu((__force __le32)n);
75294diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
75295index bb2869f..d34ada8 100644
75296--- a/fs/quota/netlink.c
75297+++ b/fs/quota/netlink.c
75298@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
75299 void quota_send_warning(struct kqid qid, dev_t dev,
75300 const char warntype)
75301 {
75302- static atomic_t seq;
75303+ static atomic_unchecked_t seq;
75304 struct sk_buff *skb;
75305 void *msg_head;
75306 int ret;
75307@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
75308 "VFS: Not enough memory to send quota warning.\n");
75309 return;
75310 }
75311- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
75312+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
75313 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
75314 if (!msg_head) {
75315 printk(KERN_ERR
75316diff --git a/fs/read_write.c b/fs/read_write.c
75317index 8e1b687..bad2eec 100644
75318--- a/fs/read_write.c
75319+++ b/fs/read_write.c
75320@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
75321
75322 old_fs = get_fs();
75323 set_fs(get_ds());
75324- p = (__force const char __user *)buf;
75325+ p = (const char __force_user *)buf;
75326 if (count > MAX_RW_COUNT)
75327 count = MAX_RW_COUNT;
75328 if (file->f_op->write)
75329diff --git a/fs/readdir.c b/fs/readdir.c
75330index ced6791..936687b 100644
75331--- a/fs/readdir.c
75332+++ b/fs/readdir.c
75333@@ -18,6 +18,7 @@
75334 #include <linux/security.h>
75335 #include <linux/syscalls.h>
75336 #include <linux/unistd.h>
75337+#include <linux/namei.h>
75338
75339 #include <asm/uaccess.h>
75340
75341@@ -71,6 +72,7 @@ struct old_linux_dirent {
75342 struct readdir_callback {
75343 struct dir_context ctx;
75344 struct old_linux_dirent __user * dirent;
75345+ struct file * file;
75346 int result;
75347 };
75348
75349@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
75350 buf->result = -EOVERFLOW;
75351 return -EOVERFLOW;
75352 }
75353+
75354+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75355+ return 0;
75356+
75357 buf->result++;
75358 dirent = buf->dirent;
75359 if (!access_ok(VERIFY_WRITE, dirent,
75360@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
75361 if (!f.file)
75362 return -EBADF;
75363
75364+ buf.file = f.file;
75365 error = iterate_dir(f.file, &buf.ctx);
75366 if (buf.result)
75367 error = buf.result;
75368@@ -145,6 +152,7 @@ struct getdents_callback {
75369 struct dir_context ctx;
75370 struct linux_dirent __user * current_dir;
75371 struct linux_dirent __user * previous;
75372+ struct file * file;
75373 int count;
75374 int error;
75375 };
75376@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
75377 buf->error = -EOVERFLOW;
75378 return -EOVERFLOW;
75379 }
75380+
75381+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75382+ return 0;
75383+
75384 dirent = buf->previous;
75385 if (dirent) {
75386 if (__put_user(offset, &dirent->d_off))
75387@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
75388 if (!f.file)
75389 return -EBADF;
75390
75391+ buf.file = f.file;
75392 error = iterate_dir(f.file, &buf.ctx);
75393 if (error >= 0)
75394 error = buf.error;
75395@@ -230,6 +243,7 @@ struct getdents_callback64 {
75396 struct dir_context ctx;
75397 struct linux_dirent64 __user * current_dir;
75398 struct linux_dirent64 __user * previous;
75399+ struct file *file;
75400 int count;
75401 int error;
75402 };
75403@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
75404 buf->error = -EINVAL; /* only used if we fail.. */
75405 if (reclen > buf->count)
75406 return -EINVAL;
75407+
75408+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75409+ return 0;
75410+
75411 dirent = buf->previous;
75412 if (dirent) {
75413 if (__put_user(offset, &dirent->d_off))
75414@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
75415 if (!f.file)
75416 return -EBADF;
75417
75418+ buf.file = f.file;
75419 error = iterate_dir(f.file, &buf.ctx);
75420 if (error >= 0)
75421 error = buf.error;
75422diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
75423index 9c02d96..6562c10 100644
75424--- a/fs/reiserfs/do_balan.c
75425+++ b/fs/reiserfs/do_balan.c
75426@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
75427 return;
75428 }
75429
75430- atomic_inc(&fs_generation(tb->tb_sb));
75431+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
75432 do_balance_starts(tb);
75433
75434 /*
75435diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
75436index aca73dd..e3c558d 100644
75437--- a/fs/reiserfs/item_ops.c
75438+++ b/fs/reiserfs/item_ops.c
75439@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
75440 }
75441
75442 static struct item_operations errcatch_ops = {
75443- errcatch_bytes_number,
75444- errcatch_decrement_key,
75445- errcatch_is_left_mergeable,
75446- errcatch_print_item,
75447- errcatch_check_item,
75448+ .bytes_number = errcatch_bytes_number,
75449+ .decrement_key = errcatch_decrement_key,
75450+ .is_left_mergeable = errcatch_is_left_mergeable,
75451+ .print_item = errcatch_print_item,
75452+ .check_item = errcatch_check_item,
75453
75454- errcatch_create_vi,
75455- errcatch_check_left,
75456- errcatch_check_right,
75457- errcatch_part_size,
75458- errcatch_unit_num,
75459- errcatch_print_vi
75460+ .create_vi = errcatch_create_vi,
75461+ .check_left = errcatch_check_left,
75462+ .check_right = errcatch_check_right,
75463+ .part_size = errcatch_part_size,
75464+ .unit_num = errcatch_unit_num,
75465+ .print_vi = errcatch_print_vi
75466 };
75467
75468 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
75469diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
75470index 621b9f3..af527fd 100644
75471--- a/fs/reiserfs/procfs.c
75472+++ b/fs/reiserfs/procfs.c
75473@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
75474 "SMALL_TAILS " : "NO_TAILS ",
75475 replay_only(sb) ? "REPLAY_ONLY " : "",
75476 convert_reiserfs(sb) ? "CONV " : "",
75477- atomic_read(&r->s_generation_counter),
75478+ atomic_read_unchecked(&r->s_generation_counter),
75479 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
75480 SF(s_do_balance), SF(s_unneeded_left_neighbor),
75481 SF(s_good_search_by_key_reada), SF(s_bmaps),
75482diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
75483index bb79cdd..fcf49ef 100644
75484--- a/fs/reiserfs/reiserfs.h
75485+++ b/fs/reiserfs/reiserfs.h
75486@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
75487 /* Comment? -Hans */
75488 wait_queue_head_t s_wait;
75489 /* increased by one every time the tree gets re-balanced */
75490- atomic_t s_generation_counter;
75491+ atomic_unchecked_t s_generation_counter;
75492
75493 /* File system properties. Currently holds on-disk FS format */
75494 unsigned long s_properties;
75495@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
75496 #define REISERFS_USER_MEM 1 /* user memory mode */
75497
75498 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
75499-#define get_generation(s) atomic_read (&fs_generation(s))
75500+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
75501 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
75502 #define __fs_changed(gen,s) (gen != get_generation (s))
75503 #define fs_changed(gen,s) \
75504diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
75505index 71fbbe3..eff29ba 100644
75506--- a/fs/reiserfs/super.c
75507+++ b/fs/reiserfs/super.c
75508@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
75509 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
75510 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
75511 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
75512+#ifdef CONFIG_REISERFS_FS_XATTR
75513+ /* turn on user xattrs by default */
75514+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
75515+#endif
75516 /* no preallocation minimum, be smart in reiserfs_file_write instead */
75517 sbi->s_alloc_options.preallocmin = 0;
75518 /* Preallocate by 16 blocks (17-1) at once */
75519diff --git a/fs/select.c b/fs/select.c
75520index f684c75..4117611 100644
75521--- a/fs/select.c
75522+++ b/fs/select.c
75523@@ -20,6 +20,7 @@
75524 #include <linux/export.h>
75525 #include <linux/slab.h>
75526 #include <linux/poll.h>
75527+#include <linux/security.h>
75528 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
75529 #include <linux/file.h>
75530 #include <linux/fdtable.h>
75531@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
75532 struct poll_list *walk = head;
75533 unsigned long todo = nfds;
75534
75535+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
75536 if (nfds > rlimit(RLIMIT_NOFILE))
75537 return -EINVAL;
75538
75539diff --git a/fs/seq_file.c b/fs/seq_file.c
75540index 555f821..34684d7 100644
75541--- a/fs/seq_file.c
75542+++ b/fs/seq_file.c
75543@@ -12,6 +12,8 @@
75544 #include <linux/slab.h>
75545 #include <linux/cred.h>
75546 #include <linux/mm.h>
75547+#include <linux/sched.h>
75548+#include <linux/grsecurity.h>
75549
75550 #include <asm/uaccess.h>
75551 #include <asm/page.h>
75552@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
75553
75554 static void *seq_buf_alloc(unsigned long size)
75555 {
75556- void *buf;
75557-
75558- /*
75559- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
75560- * it's better to fall back to vmalloc() than to kill things.
75561- */
75562- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
75563- if (!buf && size > PAGE_SIZE)
75564- buf = vmalloc(size);
75565- return buf;
75566+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
75567 }
75568
75569 /**
75570@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
75571 #ifdef CONFIG_USER_NS
75572 p->user_ns = file->f_cred->user_ns;
75573 #endif
75574+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75575+ p->exec_id = current->exec_id;
75576+#endif
75577
75578 /*
75579 * Wrappers around seq_open(e.g. swaps_open) need to be
75580@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
75581 }
75582 EXPORT_SYMBOL(seq_open);
75583
75584+
75585+int seq_open_restrict(struct file *file, const struct seq_operations *op)
75586+{
75587+ if (gr_proc_is_restricted())
75588+ return -EACCES;
75589+
75590+ return seq_open(file, op);
75591+}
75592+EXPORT_SYMBOL(seq_open_restrict);
75593+
75594 static int traverse(struct seq_file *m, loff_t offset)
75595 {
75596 loff_t pos = 0, index;
75597@@ -158,7 +164,7 @@ Eoverflow:
75598 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
75599 {
75600 struct seq_file *m = file->private_data;
75601- size_t copied = 0;
75602+ ssize_t copied = 0;
75603 loff_t pos;
75604 size_t n;
75605 void *p;
75606@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
75607 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
75608 void *data)
75609 {
75610- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
75611+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
75612 int res = -ENOMEM;
75613
75614 if (op) {
75615@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
75616 }
75617 EXPORT_SYMBOL(single_open_size);
75618
75619+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
75620+ void *data)
75621+{
75622+ if (gr_proc_is_restricted())
75623+ return -EACCES;
75624+
75625+ return single_open(file, show, data);
75626+}
75627+EXPORT_SYMBOL(single_open_restrict);
75628+
75629+
75630 int single_release(struct inode *inode, struct file *file)
75631 {
75632 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
75633diff --git a/fs/splice.c b/fs/splice.c
75634index 7968da9..4ce985b 100644
75635--- a/fs/splice.c
75636+++ b/fs/splice.c
75637@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75638 pipe_lock(pipe);
75639
75640 for (;;) {
75641- if (!pipe->readers) {
75642+ if (!atomic_read(&pipe->readers)) {
75643 send_sig(SIGPIPE, current, 0);
75644 if (!ret)
75645 ret = -EPIPE;
75646@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75647 page_nr++;
75648 ret += buf->len;
75649
75650- if (pipe->files)
75651+ if (atomic_read(&pipe->files))
75652 do_wakeup = 1;
75653
75654 if (!--spd->nr_pages)
75655@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75656 do_wakeup = 0;
75657 }
75658
75659- pipe->waiting_writers++;
75660+ atomic_inc(&pipe->waiting_writers);
75661 pipe_wait(pipe);
75662- pipe->waiting_writers--;
75663+ atomic_dec(&pipe->waiting_writers);
75664 }
75665
75666 pipe_unlock(pipe);
75667@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
75668 old_fs = get_fs();
75669 set_fs(get_ds());
75670 /* The cast to a user pointer is valid due to the set_fs() */
75671- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
75672+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
75673 set_fs(old_fs);
75674
75675 return res;
75676@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
75677 old_fs = get_fs();
75678 set_fs(get_ds());
75679 /* The cast to a user pointer is valid due to the set_fs() */
75680- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
75681+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
75682 set_fs(old_fs);
75683
75684 return res;
75685@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
75686 goto err;
75687
75688 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
75689- vec[i].iov_base = (void __user *) page_address(page);
75690+ vec[i].iov_base = (void __force_user *) page_address(page);
75691 vec[i].iov_len = this_len;
75692 spd.pages[i] = page;
75693 spd.nr_pages++;
75694@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75695 ops->release(pipe, buf);
75696 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75697 pipe->nrbufs--;
75698- if (pipe->files)
75699+ if (atomic_read(&pipe->files))
75700 sd->need_wakeup = true;
75701 }
75702
75703@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75704 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
75705 {
75706 while (!pipe->nrbufs) {
75707- if (!pipe->writers)
75708+ if (!atomic_read(&pipe->writers))
75709 return 0;
75710
75711- if (!pipe->waiting_writers && sd->num_spliced)
75712+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
75713 return 0;
75714
75715 if (sd->flags & SPLICE_F_NONBLOCK)
75716@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
75717 ops->release(pipe, buf);
75718 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75719 pipe->nrbufs--;
75720- if (pipe->files)
75721+ if (atomic_read(&pipe->files))
75722 sd.need_wakeup = true;
75723 } else {
75724 buf->offset += ret;
75725@@ -1159,7 +1159,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75726 long ret, bytes;
75727 umode_t i_mode;
75728 size_t len;
75729- int i, flags;
75730+ int i, flags, more;
75731
75732 /*
75733 * We require the input being a regular file, as we don't want to
75734@@ -1185,7 +1185,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75735 * out of the pipe right after the splice_to_pipe(). So set
75736 * PIPE_READERS appropriately.
75737 */
75738- pipe->readers = 1;
75739+ atomic_set(&pipe->readers, 1);
75740
75741 current->splice_pipe = pipe;
75742 }
75743@@ -1202,6 +1202,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75744 * Don't block on output, we have to drain the direct pipe.
75745 */
75746 sd->flags &= ~SPLICE_F_NONBLOCK;
75747+ more = sd->flags & SPLICE_F_MORE;
75748
75749 while (len) {
75750 size_t read_len;
75751@@ -1215,6 +1216,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75752 sd->total_len = read_len;
75753
75754 /*
75755+ * If more data is pending, set SPLICE_F_MORE
75756+ * If this is the last data and SPLICE_F_MORE was not set
75757+ * initially, clears it.
75758+ */
75759+ if (read_len < len)
75760+ sd->flags |= SPLICE_F_MORE;
75761+ else if (!more)
75762+ sd->flags &= ~SPLICE_F_MORE;
75763+ /*
75764 * NOTE: nonblocking mode only applies to the input. We
75765 * must not do the output in nonblocking mode as then we
75766 * could get stuck data in the internal pipe:
75767@@ -1482,6 +1492,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
75768
75769 partial[buffers].offset = off;
75770 partial[buffers].len = plen;
75771+ partial[buffers].private = 0;
75772
75773 off = 0;
75774 len -= plen;
75775@@ -1718,9 +1729,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75776 ret = -ERESTARTSYS;
75777 break;
75778 }
75779- if (!pipe->writers)
75780+ if (!atomic_read(&pipe->writers))
75781 break;
75782- if (!pipe->waiting_writers) {
75783+ if (!atomic_read(&pipe->waiting_writers)) {
75784 if (flags & SPLICE_F_NONBLOCK) {
75785 ret = -EAGAIN;
75786 break;
75787@@ -1752,7 +1763,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75788 pipe_lock(pipe);
75789
75790 while (pipe->nrbufs >= pipe->buffers) {
75791- if (!pipe->readers) {
75792+ if (!atomic_read(&pipe->readers)) {
75793 send_sig(SIGPIPE, current, 0);
75794 ret = -EPIPE;
75795 break;
75796@@ -1765,9 +1776,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75797 ret = -ERESTARTSYS;
75798 break;
75799 }
75800- pipe->waiting_writers++;
75801+ atomic_inc(&pipe->waiting_writers);
75802 pipe_wait(pipe);
75803- pipe->waiting_writers--;
75804+ atomic_dec(&pipe->waiting_writers);
75805 }
75806
75807 pipe_unlock(pipe);
75808@@ -1803,14 +1814,14 @@ retry:
75809 pipe_double_lock(ipipe, opipe);
75810
75811 do {
75812- if (!opipe->readers) {
75813+ if (!atomic_read(&opipe->readers)) {
75814 send_sig(SIGPIPE, current, 0);
75815 if (!ret)
75816 ret = -EPIPE;
75817 break;
75818 }
75819
75820- if (!ipipe->nrbufs && !ipipe->writers)
75821+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
75822 break;
75823
75824 /*
75825@@ -1907,7 +1918,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75826 pipe_double_lock(ipipe, opipe);
75827
75828 do {
75829- if (!opipe->readers) {
75830+ if (!atomic_read(&opipe->readers)) {
75831 send_sig(SIGPIPE, current, 0);
75832 if (!ret)
75833 ret = -EPIPE;
75834@@ -1952,7 +1963,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75835 * return EAGAIN if we have the potential of some data in the
75836 * future, otherwise just return 0
75837 */
75838- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
75839+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
75840 ret = -EAGAIN;
75841
75842 pipe_unlock(ipipe);
75843diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
75844index 92fcde7..1687329 100644
75845--- a/fs/squashfs/xattr.c
75846+++ b/fs/squashfs/xattr.c
75847@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75848 + msblk->xattr_table;
75849 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
75850 int count = squashfs_i(inode)->xattr_count;
75851- size_t rest = buffer_size;
75852- int err;
75853+ size_t used = 0;
75854+ ssize_t err;
75855
75856 /* check that the file system has xattrs */
75857 if (msblk->xattr_id_table == NULL)
75858@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75859 name_size = le16_to_cpu(entry.size);
75860 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
75861 if (handler)
75862- prefix_size = handler->list(d, buffer, rest, NULL,
75863+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
75864 name_size, handler->flags);
75865 if (prefix_size) {
75866 if (buffer) {
75867- if (prefix_size + name_size + 1 > rest) {
75868+ if (prefix_size + name_size + 1 > buffer_size - used) {
75869 err = -ERANGE;
75870 goto failed;
75871 }
75872@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75873 buffer[name_size] = '\0';
75874 buffer += name_size + 1;
75875 }
75876- rest -= prefix_size + name_size + 1;
75877+ used += prefix_size + name_size + 1;
75878 } else {
75879 /* no handler or insuffficient privileges, so skip */
75880 err = squashfs_read_metadata(sb, NULL, &start,
75881@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75882 if (err < 0)
75883 goto failed;
75884 }
75885- err = buffer_size - rest;
75886+ err = used;
75887
75888 failed:
75889 return err;
75890diff --git a/fs/stat.c b/fs/stat.c
75891index ae0c3ce..9ee641c 100644
75892--- a/fs/stat.c
75893+++ b/fs/stat.c
75894@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
75895 stat->gid = inode->i_gid;
75896 stat->rdev = inode->i_rdev;
75897 stat->size = i_size_read(inode);
75898- stat->atime = inode->i_atime;
75899- stat->mtime = inode->i_mtime;
75900+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
75901+ stat->atime = inode->i_ctime;
75902+ stat->mtime = inode->i_ctime;
75903+ } else {
75904+ stat->atime = inode->i_atime;
75905+ stat->mtime = inode->i_mtime;
75906+ }
75907 stat->ctime = inode->i_ctime;
75908 stat->blksize = (1 << inode->i_blkbits);
75909 stat->blocks = inode->i_blocks;
75910@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
75911 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
75912 {
75913 struct inode *inode = path->dentry->d_inode;
75914+ int retval;
75915
75916- if (inode->i_op->getattr)
75917- return inode->i_op->getattr(path->mnt, path->dentry, stat);
75918+ if (inode->i_op->getattr) {
75919+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
75920+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
75921+ stat->atime = stat->ctime;
75922+ stat->mtime = stat->ctime;
75923+ }
75924+ return retval;
75925+ }
75926
75927 generic_fillattr(inode, stat);
75928 return 0;
75929diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
75930index 0b45ff4..edf9d3a 100644
75931--- a/fs/sysfs/dir.c
75932+++ b/fs/sysfs/dir.c
75933@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
75934 kfree(buf);
75935 }
75936
75937+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
75938+extern int grsec_enable_sysfs_restrict;
75939+#endif
75940+
75941 /**
75942 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
75943 * @kobj: object we're creating directory for
75944@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
75945 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
75946 {
75947 struct kernfs_node *parent, *kn;
75948+ const char *name;
75949+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
75950+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
75951+ const char *parent_name;
75952+#endif
75953
75954 BUG_ON(!kobj);
75955
75956+ name = kobject_name(kobj);
75957+
75958 if (kobj->parent)
75959 parent = kobj->parent->sd;
75960 else
75961@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
75962 if (!parent)
75963 return -ENOENT;
75964
75965- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
75966- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
75967+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
75968+ parent_name = parent->name;
75969+ mode = S_IRWXU;
75970+
75971+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
75972+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
75973+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
75974+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
75975+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
75976+ if (!grsec_enable_sysfs_restrict)
75977+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
75978+#endif
75979+
75980+ kn = kernfs_create_dir_ns(parent, name,
75981+ mode, kobj, ns);
75982 if (IS_ERR(kn)) {
75983 if (PTR_ERR(kn) == -EEXIST)
75984- sysfs_warn_dup(parent, kobject_name(kobj));
75985+ sysfs_warn_dup(parent, name);
75986 return PTR_ERR(kn);
75987 }
75988
75989diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
75990index 69d4889..a810bd4 100644
75991--- a/fs/sysv/sysv.h
75992+++ b/fs/sysv/sysv.h
75993@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
75994 #endif
75995 }
75996
75997-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
75998+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
75999 {
76000 if (sbi->s_bytesex == BYTESEX_PDP)
76001 return PDP_swab((__force __u32)n);
76002diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
76003index fb08b0c..65fcc7e 100644
76004--- a/fs/ubifs/io.c
76005+++ b/fs/ubifs/io.c
76006@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
76007 return err;
76008 }
76009
76010-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76011+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76012 {
76013 int err;
76014
76015diff --git a/fs/udf/misc.c b/fs/udf/misc.c
76016index c175b4d..8f36a16 100644
76017--- a/fs/udf/misc.c
76018+++ b/fs/udf/misc.c
76019@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
76020
76021 u8 udf_tag_checksum(const struct tag *t)
76022 {
76023- u8 *data = (u8 *)t;
76024+ const u8 *data = (const u8 *)t;
76025 u8 checksum = 0;
76026 int i;
76027 for (i = 0; i < sizeof(struct tag); ++i)
76028diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
76029index 8d974c4..b82f6ec 100644
76030--- a/fs/ufs/swab.h
76031+++ b/fs/ufs/swab.h
76032@@ -22,7 +22,7 @@ enum {
76033 BYTESEX_BE
76034 };
76035
76036-static inline u64
76037+static inline u64 __intentional_overflow(-1)
76038 fs64_to_cpu(struct super_block *sbp, __fs64 n)
76039 {
76040 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76041@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
76042 return (__force __fs64)cpu_to_be64(n);
76043 }
76044
76045-static inline u32
76046+static inline u32 __intentional_overflow(-1)
76047 fs32_to_cpu(struct super_block *sbp, __fs32 n)
76048 {
76049 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76050diff --git a/fs/utimes.c b/fs/utimes.c
76051index aa138d6..5f3a811 100644
76052--- a/fs/utimes.c
76053+++ b/fs/utimes.c
76054@@ -1,6 +1,7 @@
76055 #include <linux/compiler.h>
76056 #include <linux/file.h>
76057 #include <linux/fs.h>
76058+#include <linux/security.h>
76059 #include <linux/linkage.h>
76060 #include <linux/mount.h>
76061 #include <linux/namei.h>
76062@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
76063 }
76064 }
76065 retry_deleg:
76066+
76067+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
76068+ error = -EACCES;
76069+ goto mnt_drop_write_and_out;
76070+ }
76071+
76072 mutex_lock(&inode->i_mutex);
76073 error = notify_change(path->dentry, &newattrs, &delegated_inode);
76074 mutex_unlock(&inode->i_mutex);
76075diff --git a/fs/xattr.c b/fs/xattr.c
76076index 4ef6985..a6cd6567 100644
76077--- a/fs/xattr.c
76078+++ b/fs/xattr.c
76079@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
76080 return rc;
76081 }
76082
76083+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
76084+ssize_t
76085+pax_getxattr(struct dentry *dentry, void *value, size_t size)
76086+{
76087+ struct inode *inode = dentry->d_inode;
76088+ ssize_t error;
76089+
76090+ error = inode_permission(inode, MAY_EXEC);
76091+ if (error)
76092+ return error;
76093+
76094+ if (inode->i_op->getxattr)
76095+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
76096+ else
76097+ error = -EOPNOTSUPP;
76098+
76099+ return error;
76100+}
76101+EXPORT_SYMBOL(pax_getxattr);
76102+#endif
76103+
76104 ssize_t
76105 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
76106 {
76107@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
76108 * Extended attribute SET operations
76109 */
76110 static long
76111-setxattr(struct dentry *d, const char __user *name, const void __user *value,
76112+setxattr(struct path *path, const char __user *name, const void __user *value,
76113 size_t size, int flags)
76114 {
76115 int error;
76116@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
76117 posix_acl_fix_xattr_from_user(kvalue, size);
76118 }
76119
76120- error = vfs_setxattr(d, kname, kvalue, size, flags);
76121+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
76122+ error = -EACCES;
76123+ goto out;
76124+ }
76125+
76126+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
76127 out:
76128 if (vvalue)
76129 vfree(vvalue);
76130@@ -376,7 +402,7 @@ retry:
76131 return error;
76132 error = mnt_want_write(path.mnt);
76133 if (!error) {
76134- error = setxattr(path.dentry, name, value, size, flags);
76135+ error = setxattr(&path, name, value, size, flags);
76136 mnt_drop_write(path.mnt);
76137 }
76138 path_put(&path);
76139@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
76140 audit_file(f.file);
76141 error = mnt_want_write_file(f.file);
76142 if (!error) {
76143- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
76144+ error = setxattr(&f.file->f_path, name, value, size, flags);
76145 mnt_drop_write_file(f.file);
76146 }
76147 fdput(f);
76148@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
76149 * Extended attribute REMOVE operations
76150 */
76151 static long
76152-removexattr(struct dentry *d, const char __user *name)
76153+removexattr(struct path *path, const char __user *name)
76154 {
76155 int error;
76156 char kname[XATTR_NAME_MAX + 1];
76157@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
76158 if (error < 0)
76159 return error;
76160
76161- return vfs_removexattr(d, kname);
76162+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
76163+ return -EACCES;
76164+
76165+ return vfs_removexattr(path->dentry, kname);
76166 }
76167
76168 static int path_removexattr(const char __user *pathname,
76169@@ -623,7 +652,7 @@ retry:
76170 return error;
76171 error = mnt_want_write(path.mnt);
76172 if (!error) {
76173- error = removexattr(path.dentry, name);
76174+ error = removexattr(&path, name);
76175 mnt_drop_write(path.mnt);
76176 }
76177 path_put(&path);
76178@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
76179 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
76180 {
76181 struct fd f = fdget(fd);
76182+ struct path *path;
76183 int error = -EBADF;
76184
76185 if (!f.file)
76186 return error;
76187+ path = &f.file->f_path;
76188 audit_file(f.file);
76189 error = mnt_want_write_file(f.file);
76190 if (!error) {
76191- error = removexattr(f.file->f_path.dentry, name);
76192+ error = removexattr(path, name);
76193 mnt_drop_write_file(f.file);
76194 }
76195 fdput(f);
76196diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
76197index 61ec015..7c18807 100644
76198--- a/fs/xfs/libxfs/xfs_bmap.c
76199+++ b/fs/xfs/libxfs/xfs_bmap.c
76200@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
76201
76202 #else
76203 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
76204-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
76205+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
76206 #endif /* DEBUG */
76207
76208 /*
76209diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
76210index 098cd78..724d3f8 100644
76211--- a/fs/xfs/xfs_dir2_readdir.c
76212+++ b/fs/xfs/xfs_dir2_readdir.c
76213@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
76214 ino = dp->d_ops->sf_get_ino(sfp, sfep);
76215 filetype = dp->d_ops->sf_get_ftype(sfep);
76216 ctx->pos = off & 0x7fffffff;
76217- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76218+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
76219+ char name[sfep->namelen];
76220+ memcpy(name, sfep->name, sfep->namelen);
76221+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
76222+ return 0;
76223+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76224 xfs_dir3_get_dtype(dp->i_mount, filetype)))
76225 return 0;
76226 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
76227diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
76228index ac4feae..386d551 100644
76229--- a/fs/xfs/xfs_ioctl.c
76230+++ b/fs/xfs/xfs_ioctl.c
76231@@ -120,7 +120,7 @@ xfs_find_handle(
76232 }
76233
76234 error = -EFAULT;
76235- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
76236+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
76237 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
76238 goto out_put;
76239
76240diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
76241index c31d2c2..6ec8f62 100644
76242--- a/fs/xfs/xfs_linux.h
76243+++ b/fs/xfs/xfs_linux.h
76244@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
76245 * of the compiler which do not like us using do_div in the middle
76246 * of large functions.
76247 */
76248-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76249+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76250 {
76251 __u32 mod;
76252
76253@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
76254 return 0;
76255 }
76256 #else
76257-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76258+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76259 {
76260 __u32 mod;
76261
76262diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
76263new file mode 100644
76264index 0000000..31f8fe4
76265--- /dev/null
76266+++ b/grsecurity/Kconfig
76267@@ -0,0 +1,1182 @@
76268+#
76269+# grecurity configuration
76270+#
76271+menu "Memory Protections"
76272+depends on GRKERNSEC
76273+
76274+config GRKERNSEC_KMEM
76275+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
76276+ default y if GRKERNSEC_CONFIG_AUTO
76277+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
76278+ help
76279+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
76280+ be written to or read from to modify or leak the contents of the running
76281+ kernel. /dev/port will also not be allowed to be opened, writing to
76282+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
76283+ If you have module support disabled, enabling this will close up several
76284+ ways that are currently used to insert malicious code into the running
76285+ kernel.
76286+
76287+ Even with this feature enabled, we still highly recommend that
76288+ you use the RBAC system, as it is still possible for an attacker to
76289+ modify the running kernel through other more obscure methods.
76290+
76291+ It is highly recommended that you say Y here if you meet all the
76292+ conditions above.
76293+
76294+config GRKERNSEC_VM86
76295+ bool "Restrict VM86 mode"
76296+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76297+ depends on X86_32
76298+
76299+ help
76300+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
76301+ make use of a special execution mode on 32bit x86 processors called
76302+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
76303+ video cards and will still work with this option enabled. The purpose
76304+ of the option is to prevent exploitation of emulation errors in
76305+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
76306+ Nearly all users should be able to enable this option.
76307+
76308+config GRKERNSEC_IO
76309+ bool "Disable privileged I/O"
76310+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76311+ depends on X86
76312+ select RTC_CLASS
76313+ select RTC_INTF_DEV
76314+ select RTC_DRV_CMOS
76315+
76316+ help
76317+ If you say Y here, all ioperm and iopl calls will return an error.
76318+ Ioperm and iopl can be used to modify the running kernel.
76319+ Unfortunately, some programs need this access to operate properly,
76320+ the most notable of which are XFree86 and hwclock. hwclock can be
76321+ remedied by having RTC support in the kernel, so real-time
76322+ clock support is enabled if this option is enabled, to ensure
76323+ that hwclock operates correctly. If hwclock still does not work,
76324+ either update udev or symlink /dev/rtc to /dev/rtc0.
76325+
76326+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
76327+ you may not be able to boot into a graphical environment with this
76328+ option enabled. In this case, you should use the RBAC system instead.
76329+
76330+config GRKERNSEC_BPF_HARDEN
76331+ bool "Harden BPF interpreter"
76332+ default y if GRKERNSEC_CONFIG_AUTO
76333+ help
76334+ Unlike previous versions of grsecurity that hardened both the BPF
76335+ interpreted code against corruption at rest as well as the JIT code
76336+ against JIT-spray attacks and attacker-controlled immediate values
76337+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
76338+ and will ensure the interpreted code is read-only at rest. This feature
76339+ may be removed at a later time when eBPF stabilizes to entirely revert
76340+ back to the more secure pre-3.16 BPF interpreter/JIT.
76341+
76342+ If you're using KERNEXEC, it's recommended that you enable this option
76343+ to supplement the hardening of the kernel.
76344+
76345+config GRKERNSEC_PERF_HARDEN
76346+ bool "Disable unprivileged PERF_EVENTS usage by default"
76347+ default y if GRKERNSEC_CONFIG_AUTO
76348+ depends on PERF_EVENTS
76349+ help
76350+ If you say Y here, the range of acceptable values for the
76351+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
76352+ default to a new value: 3. When the sysctl is set to this value, no
76353+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
76354+
76355+ Though PERF_EVENTS can be used legitimately for performance monitoring
76356+ and low-level application profiling, it is forced on regardless of
76357+ configuration, has been at fault for several vulnerabilities, and
76358+ creates new opportunities for side channels and other information leaks.
76359+
76360+ This feature puts PERF_EVENTS into a secure default state and permits
76361+ the administrator to change out of it temporarily if unprivileged
76362+ application profiling is needed.
76363+
76364+config GRKERNSEC_RAND_THREADSTACK
76365+ bool "Insert random gaps between thread stacks"
76366+ default y if GRKERNSEC_CONFIG_AUTO
76367+ depends on PAX_RANDMMAP && !PPC
76368+ help
76369+ If you say Y here, a random-sized gap will be enforced between allocated
76370+ thread stacks. Glibc's NPTL and other threading libraries that
76371+ pass MAP_STACK to the kernel for thread stack allocation are supported.
76372+ The implementation currently provides 8 bits of entropy for the gap.
76373+
76374+ Many distributions do not compile threaded remote services with the
76375+ -fstack-check argument to GCC, causing the variable-sized stack-based
76376+ allocator, alloca(), to not probe the stack on allocation. This
76377+ permits an unbounded alloca() to skip over any guard page and potentially
76378+ modify another thread's stack reliably. An enforced random gap
76379+ reduces the reliability of such an attack and increases the chance
76380+ that such a read/write to another thread's stack instead lands in
76381+ an unmapped area, causing a crash and triggering grsecurity's
76382+ anti-bruteforcing logic.
76383+
76384+config GRKERNSEC_PROC_MEMMAP
76385+ bool "Harden ASLR against information leaks and entropy reduction"
76386+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
76387+ depends on PAX_NOEXEC || PAX_ASLR
76388+ help
76389+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
76390+ give no information about the addresses of its mappings if
76391+ PaX features that rely on random addresses are enabled on the task.
76392+ In addition to sanitizing this information and disabling other
76393+ dangerous sources of information, this option causes reads of sensitive
76394+ /proc/<pid> entries where the file descriptor was opened in a different
76395+ task than the one performing the read. Such attempts are logged.
76396+ This option also limits argv/env strings for suid/sgid binaries
76397+ to 512KB to prevent a complete exhaustion of the stack entropy provided
76398+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
76399+ binaries to prevent alternative mmap layouts from being abused.
76400+
76401+ If you use PaX it is essential that you say Y here as it closes up
76402+ several holes that make full ASLR useless locally.
76403+
76404+
76405+config GRKERNSEC_KSTACKOVERFLOW
76406+ bool "Prevent kernel stack overflows"
76407+ default y if GRKERNSEC_CONFIG_AUTO
76408+ depends on !IA64 && 64BIT
76409+ help
76410+ If you say Y here, the kernel's process stacks will be allocated
76411+ with vmalloc instead of the kernel's default allocator. This
76412+ introduces guard pages that in combination with the alloca checking
76413+ of the STACKLEAK feature prevents all forms of kernel process stack
76414+ overflow abuse. Note that this is different from kernel stack
76415+ buffer overflows.
76416+
76417+config GRKERNSEC_BRUTE
76418+ bool "Deter exploit bruteforcing"
76419+ default y if GRKERNSEC_CONFIG_AUTO
76420+ help
76421+ If you say Y here, attempts to bruteforce exploits against forking
76422+ daemons such as apache or sshd, as well as against suid/sgid binaries
76423+ will be deterred. When a child of a forking daemon is killed by PaX
76424+ or crashes due to an illegal instruction or other suspicious signal,
76425+ the parent process will be delayed 30 seconds upon every subsequent
76426+ fork until the administrator is able to assess the situation and
76427+ restart the daemon.
76428+ In the suid/sgid case, the attempt is logged, the user has all their
76429+ existing instances of the suid/sgid binary terminated and will
76430+ be unable to execute any suid/sgid binaries for 15 minutes.
76431+
76432+ It is recommended that you also enable signal logging in the auditing
76433+ section so that logs are generated when a process triggers a suspicious
76434+ signal.
76435+ If the sysctl option is enabled, a sysctl option with name
76436+ "deter_bruteforce" is created.
76437+
76438+config GRKERNSEC_MODHARDEN
76439+ bool "Harden module auto-loading"
76440+ default y if GRKERNSEC_CONFIG_AUTO
76441+ depends on MODULES
76442+ help
76443+ If you say Y here, module auto-loading in response to use of some
76444+ feature implemented by an unloaded module will be restricted to
76445+ root users. Enabling this option helps defend against attacks
76446+ by unprivileged users who abuse the auto-loading behavior to
76447+ cause a vulnerable module to load that is then exploited.
76448+
76449+ If this option prevents a legitimate use of auto-loading for a
76450+ non-root user, the administrator can execute modprobe manually
76451+ with the exact name of the module mentioned in the alert log.
76452+ Alternatively, the administrator can add the module to the list
76453+ of modules loaded at boot by modifying init scripts.
76454+
76455+ Modification of init scripts will most likely be needed on
76456+ Ubuntu servers with encrypted home directory support enabled,
76457+ as the first non-root user logging in will cause the ecb(aes),
76458+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
76459+
76460+config GRKERNSEC_HIDESYM
76461+ bool "Hide kernel symbols"
76462+ default y if GRKERNSEC_CONFIG_AUTO
76463+ select PAX_USERCOPY_SLABS
76464+ help
76465+ If you say Y here, getting information on loaded modules, and
76466+ displaying all kernel symbols through a syscall will be restricted
76467+ to users with CAP_SYS_MODULE. For software compatibility reasons,
76468+ /proc/kallsyms will be restricted to the root user. The RBAC
76469+ system can hide that entry even from root.
76470+
76471+ This option also prevents leaking of kernel addresses through
76472+ several /proc entries.
76473+
76474+ Note that this option is only effective provided the following
76475+ conditions are met:
76476+ 1) The kernel using grsecurity is not precompiled by some distribution
76477+ 2) You have also enabled GRKERNSEC_DMESG
76478+ 3) You are using the RBAC system and hiding other files such as your
76479+ kernel image and System.map. Alternatively, enabling this option
76480+ causes the permissions on /boot, /lib/modules, and the kernel
76481+ source directory to change at compile time to prevent
76482+ reading by non-root users.
76483+ If the above conditions are met, this option will aid in providing a
76484+ useful protection against local kernel exploitation of overflows
76485+ and arbitrary read/write vulnerabilities.
76486+
76487+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
76488+ in addition to this feature.
76489+
76490+config GRKERNSEC_RANDSTRUCT
76491+ bool "Randomize layout of sensitive kernel structures"
76492+ default y if GRKERNSEC_CONFIG_AUTO
76493+ select GRKERNSEC_HIDESYM
76494+ select MODVERSIONS if MODULES
76495+ help
76496+ If you say Y here, the layouts of a number of sensitive kernel
76497+ structures (task, fs, cred, etc) and all structures composed entirely
76498+ of function pointers (aka "ops" structs) will be randomized at compile-time.
76499+ This can introduce the requirement of an additional infoleak
76500+ vulnerability for exploits targeting these structure types.
76501+
76502+ Enabling this feature will introduce some performance impact, slightly
76503+ increase memory usage, and prevent the use of forensic tools like
76504+ Volatility against the system (unless the kernel source tree isn't
76505+ cleaned after kernel installation).
76506+
76507+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
76508+ It remains after a make clean to allow for external modules to be compiled
76509+ with the existing seed and will be removed by a make mrproper or
76510+ make distclean.
76511+
76512+ Note that the implementation requires gcc 4.6.4. or newer. You may need
76513+ to install the supporting headers explicitly in addition to the normal
76514+ gcc package.
76515+
76516+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
76517+ bool "Use cacheline-aware structure randomization"
76518+ depends on GRKERNSEC_RANDSTRUCT
76519+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
76520+ help
76521+ If you say Y here, the RANDSTRUCT randomization will make a best effort
76522+ at restricting randomization to cacheline-sized groups of elements. It
76523+ will further not randomize bitfields in structures. This reduces the
76524+ performance hit of RANDSTRUCT at the cost of weakened randomization.
76525+
76526+config GRKERNSEC_KERN_LOCKOUT
76527+ bool "Active kernel exploit response"
76528+ default y if GRKERNSEC_CONFIG_AUTO
76529+ depends on X86 || ARM || PPC || SPARC
76530+ help
76531+ If you say Y here, when a PaX alert is triggered due to suspicious
76532+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
76533+ or an OOPS occurs due to bad memory accesses, instead of just
76534+ terminating the offending process (and potentially allowing
76535+ a subsequent exploit from the same user), we will take one of two
76536+ actions:
76537+ If the user was root, we will panic the system
76538+ If the user was non-root, we will log the attempt, terminate
76539+ all processes owned by the user, then prevent them from creating
76540+ any new processes until the system is restarted
76541+ This deters repeated kernel exploitation/bruteforcing attempts
76542+ and is useful for later forensics.
76543+
76544+config GRKERNSEC_OLD_ARM_USERLAND
76545+ bool "Old ARM userland compatibility"
76546+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
76547+ help
76548+ If you say Y here, stubs of executable code to perform such operations
76549+ as "compare-exchange" will be placed at fixed locations in the ARM vector
76550+ table. This is unfortunately needed for old ARM userland meant to run
76551+ across a wide range of processors. Without this option enabled,
76552+ the get_tls and data memory barrier stubs will be emulated by the kernel,
76553+ which is enough for Linaro userlands or other userlands designed for v6
76554+ and newer ARM CPUs. It's recommended that you try without this option enabled
76555+ first, and only enable it if your userland does not boot (it will likely fail
76556+ at init time).
76557+
76558+endmenu
76559+menu "Role Based Access Control Options"
76560+depends on GRKERNSEC
76561+
76562+config GRKERNSEC_RBAC_DEBUG
76563+ bool
76564+
76565+config GRKERNSEC_NO_RBAC
76566+ bool "Disable RBAC system"
76567+ help
76568+ If you say Y here, the /dev/grsec device will be removed from the kernel,
76569+ preventing the RBAC system from being enabled. You should only say Y
76570+ here if you have no intention of using the RBAC system, so as to prevent
76571+ an attacker with root access from misusing the RBAC system to hide files
76572+ and processes when loadable module support and /dev/[k]mem have been
76573+ locked down.
76574+
76575+config GRKERNSEC_ACL_HIDEKERN
76576+ bool "Hide kernel processes"
76577+ help
76578+ If you say Y here, all kernel threads will be hidden to all
76579+ processes but those whose subject has the "view hidden processes"
76580+ flag.
76581+
76582+config GRKERNSEC_ACL_MAXTRIES
76583+ int "Maximum tries before password lockout"
76584+ default 3
76585+ help
76586+ This option enforces the maximum number of times a user can attempt
76587+ to authorize themselves with the grsecurity RBAC system before being
76588+ denied the ability to attempt authorization again for a specified time.
76589+ The lower the number, the harder it will be to brute-force a password.
76590+
76591+config GRKERNSEC_ACL_TIMEOUT
76592+ int "Time to wait after max password tries, in seconds"
76593+ default 30
76594+ help
76595+ This option specifies the time the user must wait after attempting to
76596+ authorize to the RBAC system with the maximum number of invalid
76597+ passwords. The higher the number, the harder it will be to brute-force
76598+ a password.
76599+
76600+endmenu
76601+menu "Filesystem Protections"
76602+depends on GRKERNSEC
76603+
76604+config GRKERNSEC_PROC
76605+ bool "Proc restrictions"
76606+ default y if GRKERNSEC_CONFIG_AUTO
76607+ help
76608+ If you say Y here, the permissions of the /proc filesystem
76609+ will be altered to enhance system security and privacy. You MUST
76610+ choose either a user only restriction or a user and group restriction.
76611+ Depending upon the option you choose, you can either restrict users to
76612+ see only the processes they themselves run, or choose a group that can
76613+ view all processes and files normally restricted to root if you choose
76614+ the "restrict to user only" option. NOTE: If you're running identd or
76615+ ntpd as a non-root user, you will have to run it as the group you
76616+ specify here.
76617+
76618+config GRKERNSEC_PROC_USER
76619+ bool "Restrict /proc to user only"
76620+ depends on GRKERNSEC_PROC
76621+ help
76622+ If you say Y here, non-root users will only be able to view their own
76623+ processes, and restricts them from viewing network-related information,
76624+ and viewing kernel symbol and module information.
76625+
76626+config GRKERNSEC_PROC_USERGROUP
76627+ bool "Allow special group"
76628+ default y if GRKERNSEC_CONFIG_AUTO
76629+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
76630+ help
76631+ If you say Y here, you will be able to select a group that will be
76632+ able to view all processes and network-related information. If you've
76633+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
76634+ remain hidden. This option is useful if you want to run identd as
76635+ a non-root user. The group you select may also be chosen at boot time
76636+ via "grsec_proc_gid=" on the kernel commandline.
76637+
76638+config GRKERNSEC_PROC_GID
76639+ int "GID for special group"
76640+ depends on GRKERNSEC_PROC_USERGROUP
76641+ default 1001
76642+
76643+config GRKERNSEC_PROC_ADD
76644+ bool "Additional restrictions"
76645+ default y if GRKERNSEC_CONFIG_AUTO
76646+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
76647+ help
76648+ If you say Y here, additional restrictions will be placed on
76649+ /proc that keep normal users from viewing device information and
76650+ slabinfo information that could be useful for exploits.
76651+
76652+config GRKERNSEC_LINK
76653+ bool "Linking restrictions"
76654+ default y if GRKERNSEC_CONFIG_AUTO
76655+ help
76656+ If you say Y here, /tmp race exploits will be prevented, since users
76657+ will no longer be able to follow symlinks owned by other users in
76658+ world-writable +t directories (e.g. /tmp), unless the owner of the
76659+ symlink is the owner of the directory. users will also not be
76660+ able to hardlink to files they do not own. If the sysctl option is
76661+ enabled, a sysctl option with name "linking_restrictions" is created.
76662+
76663+config GRKERNSEC_SYMLINKOWN
76664+ bool "Kernel-enforced SymlinksIfOwnerMatch"
76665+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
76666+ help
76667+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
76668+ that prevents it from being used as a security feature. As Apache
76669+ verifies the symlink by performing a stat() against the target of
76670+ the symlink before it is followed, an attacker can setup a symlink
76671+ to point to a same-owned file, then replace the symlink with one
76672+ that targets another user's file just after Apache "validates" the
76673+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
76674+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
76675+ will be in place for the group you specify. If the sysctl option
76676+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
76677+ created.
76678+
76679+config GRKERNSEC_SYMLINKOWN_GID
76680+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
76681+ depends on GRKERNSEC_SYMLINKOWN
76682+ default 1006
76683+ help
76684+ Setting this GID determines what group kernel-enforced
76685+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
76686+ is enabled, a sysctl option with name "symlinkown_gid" is created.
76687+
76688+config GRKERNSEC_FIFO
76689+ bool "FIFO restrictions"
76690+ default y if GRKERNSEC_CONFIG_AUTO
76691+ help
76692+ If you say Y here, users will not be able to write to FIFOs they don't
76693+ own in world-writable +t directories (e.g. /tmp), unless the owner of
76694+ the FIFO is the same owner of the directory it's held in. If the sysctl
76695+ option is enabled, a sysctl option with name "fifo_restrictions" is
76696+ created.
76697+
76698+config GRKERNSEC_SYSFS_RESTRICT
76699+ bool "Sysfs/debugfs restriction"
76700+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76701+ depends on SYSFS
76702+ help
76703+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
76704+ any filesystem normally mounted under it (e.g. debugfs) will be
76705+ mostly accessible only by root. These filesystems generally provide access
76706+ to hardware and debug information that isn't appropriate for unprivileged
76707+ users of the system. Sysfs and debugfs have also become a large source
76708+ of new vulnerabilities, ranging from infoleaks to local compromise.
76709+ There has been very little oversight with an eye toward security involved
76710+ in adding new exporters of information to these filesystems, so their
76711+ use is discouraged.
76712+ For reasons of compatibility, a few directories have been whitelisted
76713+ for access by non-root users:
76714+ /sys/fs/selinux
76715+ /sys/fs/fuse
76716+ /sys/devices/system/cpu
76717+
76718+config GRKERNSEC_ROFS
76719+ bool "Runtime read-only mount protection"
76720+ depends on SYSCTL
76721+ help
76722+ If you say Y here, a sysctl option with name "romount_protect" will
76723+ be created. By setting this option to 1 at runtime, filesystems
76724+ will be protected in the following ways:
76725+ * No new writable mounts will be allowed
76726+ * Existing read-only mounts won't be able to be remounted read/write
76727+ * Write operations will be denied on all block devices
76728+ This option acts independently of grsec_lock: once it is set to 1,
76729+ it cannot be turned off. Therefore, please be mindful of the resulting
76730+ behavior if this option is enabled in an init script on a read-only
76731+ filesystem.
76732+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
76733+ and GRKERNSEC_IO should be enabled and module loading disabled via
76734+ config or at runtime.
76735+ This feature is mainly intended for secure embedded systems.
76736+
76737+
76738+config GRKERNSEC_DEVICE_SIDECHANNEL
76739+ bool "Eliminate stat/notify-based device sidechannels"
76740+ default y if GRKERNSEC_CONFIG_AUTO
76741+ help
76742+ If you say Y here, timing analyses on block or character
76743+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
76744+ will be thwarted for unprivileged users. If a process without
76745+ CAP_MKNOD stats such a device, the last access and last modify times
76746+ will match the device's create time. No access or modify events
76747+ will be triggered through inotify/dnotify/fanotify for such devices.
76748+ This feature will prevent attacks that may at a minimum
76749+ allow an attacker to determine the administrator's password length.
76750+
76751+config GRKERNSEC_CHROOT
76752+ bool "Chroot jail restrictions"
76753+ default y if GRKERNSEC_CONFIG_AUTO
76754+ help
76755+ If you say Y here, you will be able to choose several options that will
76756+ make breaking out of a chrooted jail much more difficult. If you
76757+ encounter no software incompatibilities with the following options, it
76758+ is recommended that you enable each one.
76759+
76760+ Note that the chroot restrictions are not intended to apply to "chroots"
76761+ to directories that are simple bind mounts of the global root filesystem.
76762+ For several other reasons, a user shouldn't expect any significant
76763+ security by performing such a chroot.
76764+
76765+config GRKERNSEC_CHROOT_MOUNT
76766+ bool "Deny mounts"
76767+ default y if GRKERNSEC_CONFIG_AUTO
76768+ depends on GRKERNSEC_CHROOT
76769+ help
76770+ If you say Y here, processes inside a chroot will not be able to
76771+ mount or remount filesystems. If the sysctl option is enabled, a
76772+ sysctl option with name "chroot_deny_mount" is created.
76773+
76774+config GRKERNSEC_CHROOT_DOUBLE
76775+ bool "Deny double-chroots"
76776+ default y if GRKERNSEC_CONFIG_AUTO
76777+ depends on GRKERNSEC_CHROOT
76778+ help
76779+ If you say Y here, processes inside a chroot will not be able to chroot
76780+ again outside the chroot. This is a widely used method of breaking
76781+ out of a chroot jail and should not be allowed. If the sysctl
76782+ option is enabled, a sysctl option with name
76783+ "chroot_deny_chroot" is created.
76784+
76785+config GRKERNSEC_CHROOT_PIVOT
76786+ bool "Deny pivot_root in chroot"
76787+ default y if GRKERNSEC_CONFIG_AUTO
76788+ depends on GRKERNSEC_CHROOT
76789+ help
76790+ If you say Y here, processes inside a chroot will not be able to use
76791+ a function called pivot_root() that was introduced in Linux 2.3.41. It
76792+ works similar to chroot in that it changes the root filesystem. This
76793+ function could be misused in a chrooted process to attempt to break out
76794+ of the chroot, and therefore should not be allowed. If the sysctl
76795+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
76796+ created.
76797+
76798+config GRKERNSEC_CHROOT_CHDIR
76799+ bool "Enforce chdir(\"/\") on all chroots"
76800+ default y if GRKERNSEC_CONFIG_AUTO
76801+ depends on GRKERNSEC_CHROOT
76802+ help
76803+ If you say Y here, the current working directory of all newly-chrooted
76804+ applications will be set to the the root directory of the chroot.
76805+ The man page on chroot(2) states:
76806+ Note that this call does not change the current working
76807+ directory, so that `.' can be outside the tree rooted at
76808+ `/'. In particular, the super-user can escape from a
76809+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
76810+
76811+ It is recommended that you say Y here, since it's not known to break
76812+ any software. If the sysctl option is enabled, a sysctl option with
76813+ name "chroot_enforce_chdir" is created.
76814+
76815+config GRKERNSEC_CHROOT_CHMOD
76816+ bool "Deny (f)chmod +s"
76817+ default y if GRKERNSEC_CONFIG_AUTO
76818+ depends on GRKERNSEC_CHROOT
76819+ help
76820+ If you say Y here, processes inside a chroot will not be able to chmod
76821+ or fchmod files to make them have suid or sgid bits. This protects
76822+ against another published method of breaking a chroot. If the sysctl
76823+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
76824+ created.
76825+
76826+config GRKERNSEC_CHROOT_FCHDIR
76827+ bool "Deny fchdir and fhandle out of chroot"
76828+ default y if GRKERNSEC_CONFIG_AUTO
76829+ depends on GRKERNSEC_CHROOT
76830+ help
76831+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
76832+ to a file descriptor of the chrooting process that points to a directory
76833+ outside the filesystem will be stopped. Additionally, this option prevents
76834+ use of the recently-created syscall for opening files by a guessable "file
76835+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
76836+ with name "chroot_deny_fchdir" is created.
76837+
76838+config GRKERNSEC_CHROOT_MKNOD
76839+ bool "Deny mknod"
76840+ default y if GRKERNSEC_CONFIG_AUTO
76841+ depends on GRKERNSEC_CHROOT
76842+ help
76843+ If you say Y here, processes inside a chroot will not be allowed to
76844+ mknod. The problem with using mknod inside a chroot is that it
76845+ would allow an attacker to create a device entry that is the same
76846+ as one on the physical root of your system, which could range from
76847+ anything from the console device to a device for your harddrive (which
76848+ they could then use to wipe the drive or steal data). It is recommended
76849+ that you say Y here, unless you run into software incompatibilities.
76850+ If the sysctl option is enabled, a sysctl option with name
76851+ "chroot_deny_mknod" is created.
76852+
76853+config GRKERNSEC_CHROOT_SHMAT
76854+ bool "Deny shmat() out of chroot"
76855+ default y if GRKERNSEC_CONFIG_AUTO
76856+ depends on GRKERNSEC_CHROOT
76857+ help
76858+ If you say Y here, processes inside a chroot will not be able to attach
76859+ to shared memory segments that were created outside of the chroot jail.
76860+ It is recommended that you say Y here. If the sysctl option is enabled,
76861+ a sysctl option with name "chroot_deny_shmat" is created.
76862+
76863+config GRKERNSEC_CHROOT_UNIX
76864+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
76865+ default y if GRKERNSEC_CONFIG_AUTO
76866+ depends on GRKERNSEC_CHROOT
76867+ help
76868+ If you say Y here, processes inside a chroot will not be able to
76869+ connect to abstract (meaning not belonging to a filesystem) Unix
76870+ domain sockets that were bound outside of a chroot. It is recommended
76871+ that you say Y here. If the sysctl option is enabled, a sysctl option
76872+ with name "chroot_deny_unix" is created.
76873+
76874+config GRKERNSEC_CHROOT_FINDTASK
76875+ bool "Protect outside processes"
76876+ default y if GRKERNSEC_CONFIG_AUTO
76877+ depends on GRKERNSEC_CHROOT
76878+ help
76879+ If you say Y here, processes inside a chroot will not be able to
76880+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
76881+ getsid, or view any process outside of the chroot. If the sysctl
76882+ option is enabled, a sysctl option with name "chroot_findtask" is
76883+ created.
76884+
76885+config GRKERNSEC_CHROOT_NICE
76886+ bool "Restrict priority changes"
76887+ default y if GRKERNSEC_CONFIG_AUTO
76888+ depends on GRKERNSEC_CHROOT
76889+ help
76890+ If you say Y here, processes inside a chroot will not be able to raise
76891+ the priority of processes in the chroot, or alter the priority of
76892+ processes outside the chroot. This provides more security than simply
76893+ removing CAP_SYS_NICE from the process' capability set. If the
76894+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
76895+ is created.
76896+
76897+config GRKERNSEC_CHROOT_SYSCTL
76898+ bool "Deny sysctl writes"
76899+ default y if GRKERNSEC_CONFIG_AUTO
76900+ depends on GRKERNSEC_CHROOT
76901+ help
76902+ If you say Y here, an attacker in a chroot will not be able to
76903+ write to sysctl entries, either by sysctl(2) or through a /proc
76904+ interface. It is strongly recommended that you say Y here. If the
76905+ sysctl option is enabled, a sysctl option with name
76906+ "chroot_deny_sysctl" is created.
76907+
76908+config GRKERNSEC_CHROOT_RENAME
76909+ bool "Deny bad renames"
76910+ default y if GRKERNSEC_CONFIG_AUTO
76911+ depends on GRKERNSEC_CHROOT
76912+ help
76913+ If you say Y here, an attacker in a chroot will not be able to
76914+ abuse the ability to create double chroots to break out of the
76915+ chroot by exploiting a race condition between a rename of a directory
76916+ within a chroot against an open of a symlink with relative path
76917+ components. This feature will likewise prevent an accomplice outside
76918+ a chroot from enabling a user inside the chroot to break out and make
76919+ use of their credentials on the global filesystem. Enabling this
76920+ feature is essential to prevent root users from breaking out of a
76921+ chroot. If the sysctl option is enabled, a sysctl option with name
76922+ "chroot_deny_bad_rename" is created.
76923+
76924+config GRKERNSEC_CHROOT_CAPS
76925+ bool "Capability restrictions"
76926+ default y if GRKERNSEC_CONFIG_AUTO
76927+ depends on GRKERNSEC_CHROOT
76928+ help
76929+ If you say Y here, the capabilities on all processes within a
76930+ chroot jail will be lowered to stop module insertion, raw i/o,
76931+ system and net admin tasks, rebooting the system, modifying immutable
76932+ files, modifying IPC owned by another, and changing the system time.
76933+ This is left an option because it can break some apps. Disable this
76934+ if your chrooted apps are having problems performing those kinds of
76935+ tasks. If the sysctl option is enabled, a sysctl option with
76936+ name "chroot_caps" is created.
76937+
76938+config GRKERNSEC_CHROOT_INITRD
76939+ bool "Exempt initrd tasks from restrictions"
76940+ default y if GRKERNSEC_CONFIG_AUTO
76941+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
76942+ help
76943+ If you say Y here, tasks started prior to init will be exempted from
76944+ grsecurity's chroot restrictions. This option is mainly meant to
76945+ resolve Plymouth's performing privileged operations unnecessarily
76946+ in a chroot.
76947+
76948+endmenu
76949+menu "Kernel Auditing"
76950+depends on GRKERNSEC
76951+
76952+config GRKERNSEC_AUDIT_GROUP
76953+ bool "Single group for auditing"
76954+ help
76955+ If you say Y here, the exec and chdir logging features will only operate
76956+ on a group you specify. This option is recommended if you only want to
76957+ watch certain users instead of having a large amount of logs from the
76958+ entire system. If the sysctl option is enabled, a sysctl option with
76959+ name "audit_group" is created.
76960+
76961+config GRKERNSEC_AUDIT_GID
76962+ int "GID for auditing"
76963+ depends on GRKERNSEC_AUDIT_GROUP
76964+ default 1007
76965+
76966+config GRKERNSEC_EXECLOG
76967+ bool "Exec logging"
76968+ help
76969+ If you say Y here, all execve() calls will be logged (since the
76970+ other exec*() calls are frontends to execve(), all execution
76971+ will be logged). Useful for shell-servers that like to keep track
76972+ of their users. If the sysctl option is enabled, a sysctl option with
76973+ name "exec_logging" is created.
76974+ WARNING: This option when enabled will produce a LOT of logs, especially
76975+ on an active system.
76976+
76977+config GRKERNSEC_RESLOG
76978+ bool "Resource logging"
76979+ default y if GRKERNSEC_CONFIG_AUTO
76980+ help
76981+ If you say Y here, all attempts to overstep resource limits will
76982+ be logged with the resource name, the requested size, and the current
76983+ limit. It is highly recommended that you say Y here. If the sysctl
76984+ option is enabled, a sysctl option with name "resource_logging" is
76985+ created. If the RBAC system is enabled, the sysctl value is ignored.
76986+
76987+config GRKERNSEC_CHROOT_EXECLOG
76988+ bool "Log execs within chroot"
76989+ help
76990+ If you say Y here, all executions inside a chroot jail will be logged
76991+ to syslog. This can cause a large amount of logs if certain
76992+ applications (eg. djb's daemontools) are installed on the system, and
76993+ is therefore left as an option. If the sysctl option is enabled, a
76994+ sysctl option with name "chroot_execlog" is created.
76995+
76996+config GRKERNSEC_AUDIT_PTRACE
76997+ bool "Ptrace logging"
76998+ help
76999+ If you say Y here, all attempts to attach to a process via ptrace
77000+ will be logged. If the sysctl option is enabled, a sysctl option
77001+ with name "audit_ptrace" is created.
77002+
77003+config GRKERNSEC_AUDIT_CHDIR
77004+ bool "Chdir logging"
77005+ help
77006+ If you say Y here, all chdir() calls will be logged. If the sysctl
77007+ option is enabled, a sysctl option with name "audit_chdir" is created.
77008+
77009+config GRKERNSEC_AUDIT_MOUNT
77010+ bool "(Un)Mount logging"
77011+ help
77012+ If you say Y here, all mounts and unmounts will be logged. If the
77013+ sysctl option is enabled, a sysctl option with name "audit_mount" is
77014+ created.
77015+
77016+config GRKERNSEC_SIGNAL
77017+ bool "Signal logging"
77018+ default y if GRKERNSEC_CONFIG_AUTO
77019+ help
77020+ If you say Y here, certain important signals will be logged, such as
77021+ SIGSEGV, which will as a result inform you of when a error in a program
77022+ occurred, which in some cases could mean a possible exploit attempt.
77023+ If the sysctl option is enabled, a sysctl option with name
77024+ "signal_logging" is created.
77025+
77026+config GRKERNSEC_FORKFAIL
77027+ bool "Fork failure logging"
77028+ help
77029+ If you say Y here, all failed fork() attempts will be logged.
77030+ This could suggest a fork bomb, or someone attempting to overstep
77031+ their process limit. If the sysctl option is enabled, a sysctl option
77032+ with name "forkfail_logging" is created.
77033+
77034+config GRKERNSEC_TIME
77035+ bool "Time change logging"
77036+ default y if GRKERNSEC_CONFIG_AUTO
77037+ help
77038+ If you say Y here, any changes of the system clock will be logged.
77039+ If the sysctl option is enabled, a sysctl option with name
77040+ "timechange_logging" is created.
77041+
77042+config GRKERNSEC_PROC_IPADDR
77043+ bool "/proc/<pid>/ipaddr support"
77044+ default y if GRKERNSEC_CONFIG_AUTO
77045+ help
77046+ If you say Y here, a new entry will be added to each /proc/<pid>
77047+ directory that contains the IP address of the person using the task.
77048+ The IP is carried across local TCP and AF_UNIX stream sockets.
77049+ This information can be useful for IDS/IPSes to perform remote response
77050+ to a local attack. The entry is readable by only the owner of the
77051+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
77052+ the RBAC system), and thus does not create privacy concerns.
77053+
77054+config GRKERNSEC_RWXMAP_LOG
77055+ bool 'Denied RWX mmap/mprotect logging'
77056+ default y if GRKERNSEC_CONFIG_AUTO
77057+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
77058+ help
77059+ If you say Y here, calls to mmap() and mprotect() with explicit
77060+ usage of PROT_WRITE and PROT_EXEC together will be logged when
77061+ denied by the PAX_MPROTECT feature. This feature will also
77062+ log other problematic scenarios that can occur when PAX_MPROTECT
77063+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
77064+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
77065+ is created.
77066+
77067+endmenu
77068+
77069+menu "Executable Protections"
77070+depends on GRKERNSEC
77071+
77072+config GRKERNSEC_DMESG
77073+ bool "Dmesg(8) restriction"
77074+ default y if GRKERNSEC_CONFIG_AUTO
77075+ help
77076+ If you say Y here, non-root users will not be able to use dmesg(8)
77077+ to view the contents of the kernel's circular log buffer.
77078+ The kernel's log buffer often contains kernel addresses and other
77079+ identifying information useful to an attacker in fingerprinting a
77080+ system for a targeted exploit.
77081+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
77082+ created.
77083+
77084+config GRKERNSEC_HARDEN_PTRACE
77085+ bool "Deter ptrace-based process snooping"
77086+ default y if GRKERNSEC_CONFIG_AUTO
77087+ help
77088+ If you say Y here, TTY sniffers and other malicious monitoring
77089+ programs implemented through ptrace will be defeated. If you
77090+ have been using the RBAC system, this option has already been
77091+ enabled for several years for all users, with the ability to make
77092+ fine-grained exceptions.
77093+
77094+ This option only affects the ability of non-root users to ptrace
77095+ processes that are not a descendent of the ptracing process.
77096+ This means that strace ./binary and gdb ./binary will still work,
77097+ but attaching to arbitrary processes will not. If the sysctl
77098+ option is enabled, a sysctl option with name "harden_ptrace" is
77099+ created.
77100+
77101+config GRKERNSEC_PTRACE_READEXEC
77102+ bool "Require read access to ptrace sensitive binaries"
77103+ default y if GRKERNSEC_CONFIG_AUTO
77104+ help
77105+ If you say Y here, unprivileged users will not be able to ptrace unreadable
77106+ binaries. This option is useful in environments that
77107+ remove the read bits (e.g. file mode 4711) from suid binaries to
77108+ prevent infoleaking of their contents. This option adds
77109+ consistency to the use of that file mode, as the binary could normally
77110+ be read out when run without privileges while ptracing.
77111+
77112+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
77113+ is created.
77114+
77115+config GRKERNSEC_SETXID
77116+ bool "Enforce consistent multithreaded privileges"
77117+ default y if GRKERNSEC_CONFIG_AUTO
77118+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
77119+ help
77120+ If you say Y here, a change from a root uid to a non-root uid
77121+ in a multithreaded application will cause the resulting uids,
77122+ gids, supplementary groups, and capabilities in that thread
77123+ to be propagated to the other threads of the process. In most
77124+ cases this is unnecessary, as glibc will emulate this behavior
77125+ on behalf of the application. Other libcs do not act in the
77126+ same way, allowing the other threads of the process to continue
77127+ running with root privileges. If the sysctl option is enabled,
77128+ a sysctl option with name "consistent_setxid" is created.
77129+
77130+config GRKERNSEC_HARDEN_IPC
77131+ bool "Disallow access to overly-permissive IPC objects"
77132+ default y if GRKERNSEC_CONFIG_AUTO
77133+ depends on SYSVIPC
77134+ help
77135+ If you say Y here, access to overly-permissive IPC objects (shared
77136+ memory, message queues, and semaphores) will be denied for processes
77137+ given the following criteria beyond normal permission checks:
77138+ 1) If the IPC object is world-accessible and the euid doesn't match
77139+ that of the creator or current uid for the IPC object
77140+ 2) If the IPC object is group-accessible and the egid doesn't
77141+ match that of the creator or current gid for the IPC object
77142+ It's a common error to grant too much permission to these objects,
77143+ with impact ranging from denial of service and information leaking to
77144+ privilege escalation. This feature was developed in response to
77145+ research by Tim Brown:
77146+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
77147+ who found hundreds of such insecure usages. Processes with
77148+ CAP_IPC_OWNER are still permitted to access these IPC objects.
77149+ If the sysctl option is enabled, a sysctl option with name
77150+ "harden_ipc" is created.
77151+
77152+config GRKERNSEC_TPE
77153+ bool "Trusted Path Execution (TPE)"
77154+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
77155+ help
77156+ If you say Y here, you will be able to choose a gid to add to the
77157+ supplementary groups of users you want to mark as "untrusted."
77158+ These users will not be able to execute any files that are not in
77159+ root-owned directories writable only by root. If the sysctl option
77160+ is enabled, a sysctl option with name "tpe" is created.
77161+
77162+config GRKERNSEC_TPE_ALL
77163+ bool "Partially restrict all non-root users"
77164+ depends on GRKERNSEC_TPE
77165+ help
77166+ If you say Y here, all non-root users will be covered under
77167+ a weaker TPE restriction. This is separate from, and in addition to,
77168+ the main TPE options that you have selected elsewhere. Thus, if a
77169+ "trusted" GID is chosen, this restriction applies to even that GID.
77170+ Under this restriction, all non-root users will only be allowed to
77171+ execute files in directories they own that are not group or
77172+ world-writable, or in directories owned by root and writable only by
77173+ root. If the sysctl option is enabled, a sysctl option with name
77174+ "tpe_restrict_all" is created.
77175+
77176+config GRKERNSEC_TPE_INVERT
77177+ bool "Invert GID option"
77178+ depends on GRKERNSEC_TPE
77179+ help
77180+ If you say Y here, the group you specify in the TPE configuration will
77181+ decide what group TPE restrictions will be *disabled* for. This
77182+ option is useful if you want TPE restrictions to be applied to most
77183+ users on the system. If the sysctl option is enabled, a sysctl option
77184+ with name "tpe_invert" is created. Unlike other sysctl options, this
77185+ entry will default to on for backward-compatibility.
77186+
77187+config GRKERNSEC_TPE_GID
77188+ int
77189+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
77190+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
77191+
77192+config GRKERNSEC_TPE_UNTRUSTED_GID
77193+ int "GID for TPE-untrusted users"
77194+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
77195+ default 1005
77196+ help
77197+ Setting this GID determines what group TPE restrictions will be
77198+ *enabled* for. If the sysctl option is enabled, a sysctl option
77199+ with name "tpe_gid" is created.
77200+
77201+config GRKERNSEC_TPE_TRUSTED_GID
77202+ int "GID for TPE-trusted users"
77203+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
77204+ default 1005
77205+ help
77206+ Setting this GID determines what group TPE restrictions will be
77207+ *disabled* for. If the sysctl option is enabled, a sysctl option
77208+ with name "tpe_gid" is created.
77209+
77210+endmenu
77211+menu "Network Protections"
77212+depends on GRKERNSEC
77213+
77214+config GRKERNSEC_BLACKHOLE
77215+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
77216+ default y if GRKERNSEC_CONFIG_AUTO
77217+ depends on NET
77218+ help
77219+ If you say Y here, neither TCP resets nor ICMP
77220+ destination-unreachable packets will be sent in response to packets
77221+ sent to ports for which no associated listening process exists.
77222+ It will also prevent the sending of ICMP protocol unreachable packets
77223+ in response to packets with unknown protocols.
77224+ This feature supports both IPV4 and IPV6 and exempts the
77225+ loopback interface from blackholing. Enabling this feature
77226+ makes a host more resilient to DoS attacks and reduces network
77227+ visibility against scanners.
77228+
77229+ The blackhole feature as-implemented is equivalent to the FreeBSD
77230+ blackhole feature, as it prevents RST responses to all packets, not
77231+ just SYNs. Under most application behavior this causes no
77232+ problems, but applications (like haproxy) may not close certain
77233+ connections in a way that cleanly terminates them on the remote
77234+ end, leaving the remote host in LAST_ACK state. Because of this
77235+ side-effect and to prevent intentional LAST_ACK DoSes, this
77236+ feature also adds automatic mitigation against such attacks.
77237+ The mitigation drastically reduces the amount of time a socket
77238+ can spend in LAST_ACK state. If you're using haproxy and not
77239+ all servers it connects to have this option enabled, consider
77240+ disabling this feature on the haproxy host.
77241+
77242+ If the sysctl option is enabled, two sysctl options with names
77243+ "ip_blackhole" and "lastack_retries" will be created.
77244+ While "ip_blackhole" takes the standard zero/non-zero on/off
77245+ toggle, "lastack_retries" uses the same kinds of values as
77246+ "tcp_retries1" and "tcp_retries2". The default value of 4
77247+ prevents a socket from lasting more than 45 seconds in LAST_ACK
77248+ state.
77249+
77250+config GRKERNSEC_NO_SIMULT_CONNECT
77251+ bool "Disable TCP Simultaneous Connect"
77252+ default y if GRKERNSEC_CONFIG_AUTO
77253+ depends on NET
77254+ help
77255+ If you say Y here, a feature by Willy Tarreau will be enabled that
77256+ removes a weakness in Linux's strict implementation of TCP that
77257+ allows two clients to connect to each other without either entering
77258+ a listening state. The weakness allows an attacker to easily prevent
77259+ a client from connecting to a known server provided the source port
77260+ for the connection is guessed correctly.
77261+
77262+ As the weakness could be used to prevent an antivirus or IPS from
77263+ fetching updates, or prevent an SSL gateway from fetching a CRL,
77264+ it should be eliminated by enabling this option. Though Linux is
77265+ one of few operating systems supporting simultaneous connect, it
77266+ has no legitimate use in practice and is rarely supported by firewalls.
77267+
77268+config GRKERNSEC_SOCKET
77269+ bool "Socket restrictions"
77270+ depends on NET
77271+ help
77272+ If you say Y here, you will be able to choose from several options.
77273+ If you assign a GID on your system and add it to the supplementary
77274+ groups of users you want to restrict socket access to, this patch
77275+ will perform up to three things, based on the option(s) you choose.
77276+
77277+config GRKERNSEC_SOCKET_ALL
77278+ bool "Deny any sockets to group"
77279+ depends on GRKERNSEC_SOCKET
77280+ help
77281+ If you say Y here, you will be able to choose a GID of whose users will
77282+ be unable to connect to other hosts from your machine or run server
77283+ applications from your machine. If the sysctl option is enabled, a
77284+ sysctl option with name "socket_all" is created.
77285+
77286+config GRKERNSEC_SOCKET_ALL_GID
77287+ int "GID to deny all sockets for"
77288+ depends on GRKERNSEC_SOCKET_ALL
77289+ default 1004
77290+ help
77291+ Here you can choose the GID to disable socket access for. Remember to
77292+ add the users you want socket access disabled for to the GID
77293+ specified here. If the sysctl option is enabled, a sysctl option
77294+ with name "socket_all_gid" is created.
77295+
77296+config GRKERNSEC_SOCKET_CLIENT
77297+ bool "Deny client sockets to group"
77298+ depends on GRKERNSEC_SOCKET
77299+ help
77300+ If you say Y here, you will be able to choose a GID of whose users will
77301+ be unable to connect to other hosts from your machine, but will be
77302+ able to run servers. If this option is enabled, all users in the group
77303+ you specify will have to use passive mode when initiating ftp transfers
77304+ from the shell on your machine. If the sysctl option is enabled, a
77305+ sysctl option with name "socket_client" is created.
77306+
77307+config GRKERNSEC_SOCKET_CLIENT_GID
77308+ int "GID to deny client sockets for"
77309+ depends on GRKERNSEC_SOCKET_CLIENT
77310+ default 1003
77311+ help
77312+ Here you can choose the GID to disable client socket access for.
77313+ Remember to add the users you want client socket access disabled for to
77314+ the GID specified here. If the sysctl option is enabled, a sysctl
77315+ option with name "socket_client_gid" is created.
77316+
77317+config GRKERNSEC_SOCKET_SERVER
77318+ bool "Deny server sockets to group"
77319+ depends on GRKERNSEC_SOCKET
77320+ help
77321+ If you say Y here, you will be able to choose a GID of whose users will
77322+ be unable to run server applications from your machine. If the sysctl
77323+ option is enabled, a sysctl option with name "socket_server" is created.
77324+
77325+config GRKERNSEC_SOCKET_SERVER_GID
77326+ int "GID to deny server sockets for"
77327+ depends on GRKERNSEC_SOCKET_SERVER
77328+ default 1002
77329+ help
77330+ Here you can choose the GID to disable server socket access for.
77331+ Remember to add the users you want server socket access disabled for to
77332+ the GID specified here. If the sysctl option is enabled, a sysctl
77333+ option with name "socket_server_gid" is created.
77334+
77335+endmenu
77336+
77337+menu "Physical Protections"
77338+depends on GRKERNSEC
77339+
77340+config GRKERNSEC_DENYUSB
77341+ bool "Deny new USB connections after toggle"
77342+ default y if GRKERNSEC_CONFIG_AUTO
77343+ depends on SYSCTL && USB_SUPPORT
77344+ help
77345+ If you say Y here, a new sysctl option with name "deny_new_usb"
77346+ will be created. Setting its value to 1 will prevent any new
77347+ USB devices from being recognized by the OS. Any attempted USB
77348+ device insertion will be logged. This option is intended to be
77349+ used against custom USB devices designed to exploit vulnerabilities
77350+ in various USB device drivers.
77351+
77352+ For greatest effectiveness, this sysctl should be set after any
77353+ relevant init scripts. This option is safe to enable in distros
77354+ as each user can choose whether or not to toggle the sysctl.
77355+
77356+config GRKERNSEC_DENYUSB_FORCE
77357+ bool "Reject all USB devices not connected at boot"
77358+ select USB
77359+ depends on GRKERNSEC_DENYUSB
77360+ help
77361+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
77362+ that doesn't involve a sysctl entry. This option should only be
77363+ enabled if you're sure you want to deny all new USB connections
77364+ at runtime and don't want to modify init scripts. This should not
77365+ be enabled by distros. It forces the core USB code to be built
77366+ into the kernel image so that all devices connected at boot time
77367+ can be recognized and new USB device connections can be prevented
77368+ prior to init running.
77369+
77370+endmenu
77371+
77372+menu "Sysctl Support"
77373+depends on GRKERNSEC && SYSCTL
77374+
77375+config GRKERNSEC_SYSCTL
77376+ bool "Sysctl support"
77377+ default y if GRKERNSEC_CONFIG_AUTO
77378+ help
77379+ If you say Y here, you will be able to change the options that
77380+ grsecurity runs with at bootup, without having to recompile your
77381+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
77382+ to enable (1) or disable (0) various features. All the sysctl entries
77383+ are mutable until the "grsec_lock" entry is set to a non-zero value.
77384+ All features enabled in the kernel configuration are disabled at boot
77385+ if you do not say Y to the "Turn on features by default" option.
77386+ All options should be set at startup, and the grsec_lock entry should
77387+ be set to a non-zero value after all the options are set.
77388+ *THIS IS EXTREMELY IMPORTANT*
77389+
77390+config GRKERNSEC_SYSCTL_DISTRO
77391+ bool "Extra sysctl support for distro makers (READ HELP)"
77392+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
77393+ help
77394+ If you say Y here, additional sysctl options will be created
77395+ for features that affect processes running as root. Therefore,
77396+ it is critical when using this option that the grsec_lock entry be
77397+ enabled after boot. Only distros with prebuilt kernel packages
77398+ with this option enabled that can ensure grsec_lock is enabled
77399+ after boot should use this option.
77400+ *Failure to set grsec_lock after boot makes all grsec features
77401+ this option covers useless*
77402+
77403+ Currently this option creates the following sysctl entries:
77404+ "Disable Privileged I/O": "disable_priv_io"
77405+
77406+config GRKERNSEC_SYSCTL_ON
77407+ bool "Turn on features by default"
77408+ default y if GRKERNSEC_CONFIG_AUTO
77409+ depends on GRKERNSEC_SYSCTL
77410+ help
77411+ If you say Y here, instead of having all features enabled in the
77412+ kernel configuration disabled at boot time, the features will be
77413+ enabled at boot time. It is recommended you say Y here unless
77414+ there is some reason you would want all sysctl-tunable features to
77415+ be disabled by default. As mentioned elsewhere, it is important
77416+ to enable the grsec_lock entry once you have finished modifying
77417+ the sysctl entries.
77418+
77419+endmenu
77420+menu "Logging Options"
77421+depends on GRKERNSEC
77422+
77423+config GRKERNSEC_FLOODTIME
77424+ int "Seconds in between log messages (minimum)"
77425+ default 10
77426+ help
77427+ This option allows you to enforce the number of seconds between
77428+ grsecurity log messages. The default should be suitable for most
77429+ people, however, if you choose to change it, choose a value small enough
77430+ to allow informative logs to be produced, but large enough to
77431+ prevent flooding.
77432+
77433+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
77434+ any rate limiting on grsecurity log messages.
77435+
77436+config GRKERNSEC_FLOODBURST
77437+ int "Number of messages in a burst (maximum)"
77438+ default 6
77439+ help
77440+ This option allows you to choose the maximum number of messages allowed
77441+ within the flood time interval you chose in a separate option. The
77442+ default should be suitable for most people, however if you find that
77443+ many of your logs are being interpreted as flooding, you may want to
77444+ raise this value.
77445+
77446+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
77447+ any rate limiting on grsecurity log messages.
77448+
77449+endmenu
77450diff --git a/grsecurity/Makefile b/grsecurity/Makefile
77451new file mode 100644
77452index 0000000..30ababb
77453--- /dev/null
77454+++ b/grsecurity/Makefile
77455@@ -0,0 +1,54 @@
77456+# grsecurity – access control and security hardening for Linux
77457+# All code in this directory and various hooks located throughout the Linux kernel are
77458+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
77459+# http://www.grsecurity.net spender@grsecurity.net
77460+#
77461+# This program is free software; you can redistribute it and/or
77462+# modify it under the terms of the GNU General Public License version 2
77463+# as published by the Free Software Foundation.
77464+#
77465+# This program is distributed in the hope that it will be useful,
77466+# but WITHOUT ANY WARRANTY; without even the implied warranty of
77467+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77468+# GNU General Public License for more details.
77469+#
77470+# You should have received a copy of the GNU General Public License
77471+# along with this program; if not, write to the Free Software
77472+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
77473+
77474+KBUILD_CFLAGS += -Werror
77475+
77476+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
77477+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
77478+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
77479+ grsec_usb.o grsec_ipc.o grsec_proc.o
77480+
77481+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
77482+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
77483+ gracl_learn.o grsec_log.o gracl_policy.o
77484+ifdef CONFIG_COMPAT
77485+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
77486+endif
77487+
77488+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
77489+
77490+ifdef CONFIG_NET
77491+obj-y += grsec_sock.o
77492+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
77493+endif
77494+
77495+ifndef CONFIG_GRKERNSEC
77496+obj-y += grsec_disabled.o
77497+endif
77498+
77499+ifdef CONFIG_GRKERNSEC_HIDESYM
77500+extra-y := grsec_hidesym.o
77501+$(obj)/grsec_hidesym.o:
77502+ @-chmod -f 500 /boot
77503+ @-chmod -f 500 /lib/modules
77504+ @-chmod -f 500 /lib64/modules
77505+ @-chmod -f 500 /lib32/modules
77506+ @-chmod -f 700 .
77507+ @-chmod -f 700 $(objtree)
77508+ @echo ' grsec: protected kernel image paths'
77509+endif
77510diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
77511new file mode 100644
77512index 0000000..811af1f
77513--- /dev/null
77514+++ b/grsecurity/gracl.c
77515@@ -0,0 +1,2749 @@
77516+#include <linux/kernel.h>
77517+#include <linux/module.h>
77518+#include <linux/sched.h>
77519+#include <linux/mm.h>
77520+#include <linux/file.h>
77521+#include <linux/fs.h>
77522+#include <linux/namei.h>
77523+#include <linux/mount.h>
77524+#include <linux/tty.h>
77525+#include <linux/proc_fs.h>
77526+#include <linux/lglock.h>
77527+#include <linux/slab.h>
77528+#include <linux/vmalloc.h>
77529+#include <linux/types.h>
77530+#include <linux/sysctl.h>
77531+#include <linux/netdevice.h>
77532+#include <linux/ptrace.h>
77533+#include <linux/gracl.h>
77534+#include <linux/gralloc.h>
77535+#include <linux/security.h>
77536+#include <linux/grinternal.h>
77537+#include <linux/pid_namespace.h>
77538+#include <linux/stop_machine.h>
77539+#include <linux/fdtable.h>
77540+#include <linux/percpu.h>
77541+#include <linux/lglock.h>
77542+#include <linux/hugetlb.h>
77543+#include <linux/posix-timers.h>
77544+#include <linux/prefetch.h>
77545+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77546+#include <linux/magic.h>
77547+#include <linux/pagemap.h>
77548+#include "../fs/btrfs/async-thread.h"
77549+#include "../fs/btrfs/ctree.h"
77550+#include "../fs/btrfs/btrfs_inode.h"
77551+#endif
77552+#include "../fs/mount.h"
77553+
77554+#include <asm/uaccess.h>
77555+#include <asm/errno.h>
77556+#include <asm/mman.h>
77557+
77558+#define FOR_EACH_ROLE_START(role) \
77559+ role = running_polstate.role_list; \
77560+ while (role) {
77561+
77562+#define FOR_EACH_ROLE_END(role) \
77563+ role = role->prev; \
77564+ }
77565+
77566+extern struct path gr_real_root;
77567+
77568+static struct gr_policy_state running_polstate;
77569+struct gr_policy_state *polstate = &running_polstate;
77570+extern struct gr_alloc_state *current_alloc_state;
77571+
77572+extern char *gr_shared_page[4];
77573+DEFINE_RWLOCK(gr_inode_lock);
77574+
77575+static unsigned int gr_status __read_only = GR_STATUS_INIT;
77576+
77577+#ifdef CONFIG_NET
77578+extern struct vfsmount *sock_mnt;
77579+#endif
77580+
77581+extern struct vfsmount *pipe_mnt;
77582+extern struct vfsmount *shm_mnt;
77583+
77584+#ifdef CONFIG_HUGETLBFS
77585+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77586+#endif
77587+
77588+extern u16 acl_sp_role_value;
77589+extern struct acl_object_label *fakefs_obj_rw;
77590+extern struct acl_object_label *fakefs_obj_rwx;
77591+
77592+int gr_acl_is_enabled(void)
77593+{
77594+ return (gr_status & GR_READY);
77595+}
77596+
77597+void gr_enable_rbac_system(void)
77598+{
77599+ pax_open_kernel();
77600+ gr_status |= GR_READY;
77601+ pax_close_kernel();
77602+}
77603+
77604+int gr_rbac_disable(void *unused)
77605+{
77606+ pax_open_kernel();
77607+ gr_status &= ~GR_READY;
77608+ pax_close_kernel();
77609+
77610+ return 0;
77611+}
77612+
77613+static inline dev_t __get_dev(const struct dentry *dentry)
77614+{
77615+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77616+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77617+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
77618+ else
77619+#endif
77620+ return dentry->d_sb->s_dev;
77621+}
77622+
77623+static inline u64 __get_ino(const struct dentry *dentry)
77624+{
77625+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77626+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77627+ return btrfs_ino(dentry->d_inode);
77628+ else
77629+#endif
77630+ return dentry->d_inode->i_ino;
77631+}
77632+
77633+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77634+{
77635+ return __get_dev(dentry);
77636+}
77637+
77638+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77639+{
77640+ return __get_ino(dentry);
77641+}
77642+
77643+static char gr_task_roletype_to_char(struct task_struct *task)
77644+{
77645+ switch (task->role->roletype &
77646+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
77647+ GR_ROLE_SPECIAL)) {
77648+ case GR_ROLE_DEFAULT:
77649+ return 'D';
77650+ case GR_ROLE_USER:
77651+ return 'U';
77652+ case GR_ROLE_GROUP:
77653+ return 'G';
77654+ case GR_ROLE_SPECIAL:
77655+ return 'S';
77656+ }
77657+
77658+ return 'X';
77659+}
77660+
77661+char gr_roletype_to_char(void)
77662+{
77663+ return gr_task_roletype_to_char(current);
77664+}
77665+
77666+int
77667+gr_acl_tpe_check(void)
77668+{
77669+ if (unlikely(!(gr_status & GR_READY)))
77670+ return 0;
77671+ if (current->role->roletype & GR_ROLE_TPE)
77672+ return 1;
77673+ else
77674+ return 0;
77675+}
77676+
77677+int
77678+gr_handle_rawio(const struct inode *inode)
77679+{
77680+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77681+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
77682+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
77683+ !capable(CAP_SYS_RAWIO))
77684+ return 1;
77685+#endif
77686+ return 0;
77687+}
77688+
77689+int
77690+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
77691+{
77692+ if (likely(lena != lenb))
77693+ return 0;
77694+
77695+ return !memcmp(a, b, lena);
77696+}
77697+
77698+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
77699+{
77700+ *buflen -= namelen;
77701+ if (*buflen < 0)
77702+ return -ENAMETOOLONG;
77703+ *buffer -= namelen;
77704+ memcpy(*buffer, str, namelen);
77705+ return 0;
77706+}
77707+
77708+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
77709+{
77710+ return prepend(buffer, buflen, name->name, name->len);
77711+}
77712+
77713+static int prepend_path(const struct path *path, struct path *root,
77714+ char **buffer, int *buflen)
77715+{
77716+ struct dentry *dentry = path->dentry;
77717+ struct vfsmount *vfsmnt = path->mnt;
77718+ struct mount *mnt = real_mount(vfsmnt);
77719+ bool slash = false;
77720+ int error = 0;
77721+
77722+ while (dentry != root->dentry || vfsmnt != root->mnt) {
77723+ struct dentry * parent;
77724+
77725+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
77726+ /* Global root? */
77727+ if (!mnt_has_parent(mnt)) {
77728+ goto out;
77729+ }
77730+ dentry = mnt->mnt_mountpoint;
77731+ mnt = mnt->mnt_parent;
77732+ vfsmnt = &mnt->mnt;
77733+ continue;
77734+ }
77735+ parent = dentry->d_parent;
77736+ prefetch(parent);
77737+ spin_lock(&dentry->d_lock);
77738+ error = prepend_name(buffer, buflen, &dentry->d_name);
77739+ spin_unlock(&dentry->d_lock);
77740+ if (!error)
77741+ error = prepend(buffer, buflen, "/", 1);
77742+ if (error)
77743+ break;
77744+
77745+ slash = true;
77746+ dentry = parent;
77747+ }
77748+
77749+out:
77750+ if (!error && !slash)
77751+ error = prepend(buffer, buflen, "/", 1);
77752+
77753+ return error;
77754+}
77755+
77756+/* this must be called with mount_lock and rename_lock held */
77757+
77758+static char *__our_d_path(const struct path *path, struct path *root,
77759+ char *buf, int buflen)
77760+{
77761+ char *res = buf + buflen;
77762+ int error;
77763+
77764+ prepend(&res, &buflen, "\0", 1);
77765+ error = prepend_path(path, root, &res, &buflen);
77766+ if (error)
77767+ return ERR_PTR(error);
77768+
77769+ return res;
77770+}
77771+
77772+static char *
77773+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
77774+{
77775+ char *retval;
77776+
77777+ retval = __our_d_path(path, root, buf, buflen);
77778+ if (unlikely(IS_ERR(retval)))
77779+ retval = strcpy(buf, "<path too long>");
77780+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
77781+ retval[1] = '\0';
77782+
77783+ return retval;
77784+}
77785+
77786+static char *
77787+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77788+ char *buf, int buflen)
77789+{
77790+ struct path path;
77791+ char *res;
77792+
77793+ path.dentry = (struct dentry *)dentry;
77794+ path.mnt = (struct vfsmount *)vfsmnt;
77795+
77796+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
77797+ by the RBAC system */
77798+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
77799+
77800+ return res;
77801+}
77802+
77803+static char *
77804+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77805+ char *buf, int buflen)
77806+{
77807+ char *res;
77808+ struct path path;
77809+ struct path root;
77810+ struct task_struct *reaper = init_pid_ns.child_reaper;
77811+
77812+ path.dentry = (struct dentry *)dentry;
77813+ path.mnt = (struct vfsmount *)vfsmnt;
77814+
77815+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
77816+ get_fs_root(reaper->fs, &root);
77817+
77818+ read_seqlock_excl(&mount_lock);
77819+ write_seqlock(&rename_lock);
77820+ res = gen_full_path(&path, &root, buf, buflen);
77821+ write_sequnlock(&rename_lock);
77822+ read_sequnlock_excl(&mount_lock);
77823+
77824+ path_put(&root);
77825+ return res;
77826+}
77827+
77828+char *
77829+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77830+{
77831+ char *ret;
77832+ read_seqlock_excl(&mount_lock);
77833+ write_seqlock(&rename_lock);
77834+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
77835+ PAGE_SIZE);
77836+ write_sequnlock(&rename_lock);
77837+ read_sequnlock_excl(&mount_lock);
77838+ return ret;
77839+}
77840+
77841+static char *
77842+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77843+{
77844+ char *ret;
77845+ char *buf;
77846+ int buflen;
77847+
77848+ read_seqlock_excl(&mount_lock);
77849+ write_seqlock(&rename_lock);
77850+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
77851+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
77852+ buflen = (int)(ret - buf);
77853+ if (buflen >= 5)
77854+ prepend(&ret, &buflen, "/proc", 5);
77855+ else
77856+ ret = strcpy(buf, "<path too long>");
77857+ write_sequnlock(&rename_lock);
77858+ read_sequnlock_excl(&mount_lock);
77859+ return ret;
77860+}
77861+
77862+char *
77863+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
77864+{
77865+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
77866+ PAGE_SIZE);
77867+}
77868+
77869+char *
77870+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
77871+{
77872+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
77873+ PAGE_SIZE);
77874+}
77875+
77876+char *
77877+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
77878+{
77879+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
77880+ PAGE_SIZE);
77881+}
77882+
77883+char *
77884+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
77885+{
77886+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
77887+ PAGE_SIZE);
77888+}
77889+
77890+char *
77891+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
77892+{
77893+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
77894+ PAGE_SIZE);
77895+}
77896+
77897+__u32
77898+to_gr_audit(const __u32 reqmode)
77899+{
77900+ /* masks off auditable permission flags, then shifts them to create
77901+ auditing flags, and adds the special case of append auditing if
77902+ we're requesting write */
77903+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
77904+}
77905+
77906+struct acl_role_label *
77907+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
77908+ const gid_t gid)
77909+{
77910+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
77911+ struct acl_role_label *match;
77912+ struct role_allowed_ip *ipp;
77913+ unsigned int x;
77914+ u32 curr_ip = task->signal->saved_ip;
77915+
77916+ match = state->acl_role_set.r_hash[index];
77917+
77918+ while (match) {
77919+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
77920+ for (x = 0; x < match->domain_child_num; x++) {
77921+ if (match->domain_children[x] == uid)
77922+ goto found;
77923+ }
77924+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
77925+ break;
77926+ match = match->next;
77927+ }
77928+found:
77929+ if (match == NULL) {
77930+ try_group:
77931+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
77932+ match = state->acl_role_set.r_hash[index];
77933+
77934+ while (match) {
77935+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
77936+ for (x = 0; x < match->domain_child_num; x++) {
77937+ if (match->domain_children[x] == gid)
77938+ goto found2;
77939+ }
77940+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
77941+ break;
77942+ match = match->next;
77943+ }
77944+found2:
77945+ if (match == NULL)
77946+ match = state->default_role;
77947+ if (match->allowed_ips == NULL)
77948+ return match;
77949+ else {
77950+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
77951+ if (likely
77952+ ((ntohl(curr_ip) & ipp->netmask) ==
77953+ (ntohl(ipp->addr) & ipp->netmask)))
77954+ return match;
77955+ }
77956+ match = state->default_role;
77957+ }
77958+ } else if (match->allowed_ips == NULL) {
77959+ return match;
77960+ } else {
77961+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
77962+ if (likely
77963+ ((ntohl(curr_ip) & ipp->netmask) ==
77964+ (ntohl(ipp->addr) & ipp->netmask)))
77965+ return match;
77966+ }
77967+ goto try_group;
77968+ }
77969+
77970+ return match;
77971+}
77972+
77973+static struct acl_role_label *
77974+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
77975+ const gid_t gid)
77976+{
77977+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
77978+}
77979+
77980+struct acl_subject_label *
77981+lookup_acl_subj_label(const u64 ino, const dev_t dev,
77982+ const struct acl_role_label *role)
77983+{
77984+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
77985+ struct acl_subject_label *match;
77986+
77987+ match = role->subj_hash[index];
77988+
77989+ while (match && (match->inode != ino || match->device != dev ||
77990+ (match->mode & GR_DELETED))) {
77991+ match = match->next;
77992+ }
77993+
77994+ if (match && !(match->mode & GR_DELETED))
77995+ return match;
77996+ else
77997+ return NULL;
77998+}
77999+
78000+struct acl_subject_label *
78001+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
78002+ const struct acl_role_label *role)
78003+{
78004+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78005+ struct acl_subject_label *match;
78006+
78007+ match = role->subj_hash[index];
78008+
78009+ while (match && (match->inode != ino || match->device != dev ||
78010+ !(match->mode & GR_DELETED))) {
78011+ match = match->next;
78012+ }
78013+
78014+ if (match && (match->mode & GR_DELETED))
78015+ return match;
78016+ else
78017+ return NULL;
78018+}
78019+
78020+static struct acl_object_label *
78021+lookup_acl_obj_label(const u64 ino, const dev_t dev,
78022+ const struct acl_subject_label *subj)
78023+{
78024+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78025+ struct acl_object_label *match;
78026+
78027+ match = subj->obj_hash[index];
78028+
78029+ while (match && (match->inode != ino || match->device != dev ||
78030+ (match->mode & GR_DELETED))) {
78031+ match = match->next;
78032+ }
78033+
78034+ if (match && !(match->mode & GR_DELETED))
78035+ return match;
78036+ else
78037+ return NULL;
78038+}
78039+
78040+static struct acl_object_label *
78041+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
78042+ const struct acl_subject_label *subj)
78043+{
78044+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78045+ struct acl_object_label *match;
78046+
78047+ match = subj->obj_hash[index];
78048+
78049+ while (match && (match->inode != ino || match->device != dev ||
78050+ !(match->mode & GR_DELETED))) {
78051+ match = match->next;
78052+ }
78053+
78054+ if (match && (match->mode & GR_DELETED))
78055+ return match;
78056+
78057+ match = subj->obj_hash[index];
78058+
78059+ while (match && (match->inode != ino || match->device != dev ||
78060+ (match->mode & GR_DELETED))) {
78061+ match = match->next;
78062+ }
78063+
78064+ if (match && !(match->mode & GR_DELETED))
78065+ return match;
78066+ else
78067+ return NULL;
78068+}
78069+
78070+struct name_entry *
78071+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
78072+{
78073+ unsigned int len = strlen(name);
78074+ unsigned int key = full_name_hash(name, len);
78075+ unsigned int index = key % state->name_set.n_size;
78076+ struct name_entry *match;
78077+
78078+ match = state->name_set.n_hash[index];
78079+
78080+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
78081+ match = match->next;
78082+
78083+ return match;
78084+}
78085+
78086+static struct name_entry *
78087+lookup_name_entry(const char *name)
78088+{
78089+ return __lookup_name_entry(&running_polstate, name);
78090+}
78091+
78092+static struct name_entry *
78093+lookup_name_entry_create(const char *name)
78094+{
78095+ unsigned int len = strlen(name);
78096+ unsigned int key = full_name_hash(name, len);
78097+ unsigned int index = key % running_polstate.name_set.n_size;
78098+ struct name_entry *match;
78099+
78100+ match = running_polstate.name_set.n_hash[index];
78101+
78102+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78103+ !match->deleted))
78104+ match = match->next;
78105+
78106+ if (match && match->deleted)
78107+ return match;
78108+
78109+ match = running_polstate.name_set.n_hash[index];
78110+
78111+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78112+ match->deleted))
78113+ match = match->next;
78114+
78115+ if (match && !match->deleted)
78116+ return match;
78117+ else
78118+ return NULL;
78119+}
78120+
78121+static struct inodev_entry *
78122+lookup_inodev_entry(const u64 ino, const dev_t dev)
78123+{
78124+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
78125+ struct inodev_entry *match;
78126+
78127+ match = running_polstate.inodev_set.i_hash[index];
78128+
78129+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
78130+ match = match->next;
78131+
78132+ return match;
78133+}
78134+
78135+void
78136+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
78137+{
78138+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
78139+ state->inodev_set.i_size);
78140+ struct inodev_entry **curr;
78141+
78142+ entry->prev = NULL;
78143+
78144+ curr = &state->inodev_set.i_hash[index];
78145+ if (*curr != NULL)
78146+ (*curr)->prev = entry;
78147+
78148+ entry->next = *curr;
78149+ *curr = entry;
78150+
78151+ return;
78152+}
78153+
78154+static void
78155+insert_inodev_entry(struct inodev_entry *entry)
78156+{
78157+ __insert_inodev_entry(&running_polstate, entry);
78158+}
78159+
78160+void
78161+insert_acl_obj_label(struct acl_object_label *obj,
78162+ struct acl_subject_label *subj)
78163+{
78164+ unsigned int index =
78165+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
78166+ struct acl_object_label **curr;
78167+
78168+ obj->prev = NULL;
78169+
78170+ curr = &subj->obj_hash[index];
78171+ if (*curr != NULL)
78172+ (*curr)->prev = obj;
78173+
78174+ obj->next = *curr;
78175+ *curr = obj;
78176+
78177+ return;
78178+}
78179+
78180+void
78181+insert_acl_subj_label(struct acl_subject_label *obj,
78182+ struct acl_role_label *role)
78183+{
78184+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
78185+ struct acl_subject_label **curr;
78186+
78187+ obj->prev = NULL;
78188+
78189+ curr = &role->subj_hash[index];
78190+ if (*curr != NULL)
78191+ (*curr)->prev = obj;
78192+
78193+ obj->next = *curr;
78194+ *curr = obj;
78195+
78196+ return;
78197+}
78198+
78199+/* derived from glibc fnmatch() 0: match, 1: no match*/
78200+
78201+static int
78202+glob_match(const char *p, const char *n)
78203+{
78204+ char c;
78205+
78206+ while ((c = *p++) != '\0') {
78207+ switch (c) {
78208+ case '?':
78209+ if (*n == '\0')
78210+ return 1;
78211+ else if (*n == '/')
78212+ return 1;
78213+ break;
78214+ case '\\':
78215+ if (*n != c)
78216+ return 1;
78217+ break;
78218+ case '*':
78219+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
78220+ if (*n == '/')
78221+ return 1;
78222+ else if (c == '?') {
78223+ if (*n == '\0')
78224+ return 1;
78225+ else
78226+ ++n;
78227+ }
78228+ }
78229+ if (c == '\0') {
78230+ return 0;
78231+ } else {
78232+ const char *endp;
78233+
78234+ if ((endp = strchr(n, '/')) == NULL)
78235+ endp = n + strlen(n);
78236+
78237+ if (c == '[') {
78238+ for (--p; n < endp; ++n)
78239+ if (!glob_match(p, n))
78240+ return 0;
78241+ } else if (c == '/') {
78242+ while (*n != '\0' && *n != '/')
78243+ ++n;
78244+ if (*n == '/' && !glob_match(p, n + 1))
78245+ return 0;
78246+ } else {
78247+ for (--p; n < endp; ++n)
78248+ if (*n == c && !glob_match(p, n))
78249+ return 0;
78250+ }
78251+
78252+ return 1;
78253+ }
78254+ case '[':
78255+ {
78256+ int not;
78257+ char cold;
78258+
78259+ if (*n == '\0' || *n == '/')
78260+ return 1;
78261+
78262+ not = (*p == '!' || *p == '^');
78263+ if (not)
78264+ ++p;
78265+
78266+ c = *p++;
78267+ for (;;) {
78268+ unsigned char fn = (unsigned char)*n;
78269+
78270+ if (c == '\0')
78271+ return 1;
78272+ else {
78273+ if (c == fn)
78274+ goto matched;
78275+ cold = c;
78276+ c = *p++;
78277+
78278+ if (c == '-' && *p != ']') {
78279+ unsigned char cend = *p++;
78280+
78281+ if (cend == '\0')
78282+ return 1;
78283+
78284+ if (cold <= fn && fn <= cend)
78285+ goto matched;
78286+
78287+ c = *p++;
78288+ }
78289+ }
78290+
78291+ if (c == ']')
78292+ break;
78293+ }
78294+ if (!not)
78295+ return 1;
78296+ break;
78297+ matched:
78298+ while (c != ']') {
78299+ if (c == '\0')
78300+ return 1;
78301+
78302+ c = *p++;
78303+ }
78304+ if (not)
78305+ return 1;
78306+ }
78307+ break;
78308+ default:
78309+ if (c != *n)
78310+ return 1;
78311+ }
78312+
78313+ ++n;
78314+ }
78315+
78316+ if (*n == '\0')
78317+ return 0;
78318+
78319+ if (*n == '/')
78320+ return 0;
78321+
78322+ return 1;
78323+}
78324+
78325+static struct acl_object_label *
78326+chk_glob_label(struct acl_object_label *globbed,
78327+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
78328+{
78329+ struct acl_object_label *tmp;
78330+
78331+ if (*path == NULL)
78332+ *path = gr_to_filename_nolock(dentry, mnt);
78333+
78334+ tmp = globbed;
78335+
78336+ while (tmp) {
78337+ if (!glob_match(tmp->filename, *path))
78338+ return tmp;
78339+ tmp = tmp->next;
78340+ }
78341+
78342+ return NULL;
78343+}
78344+
78345+static struct acl_object_label *
78346+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78347+ const u64 curr_ino, const dev_t curr_dev,
78348+ const struct acl_subject_label *subj, char **path, const int checkglob)
78349+{
78350+ struct acl_subject_label *tmpsubj;
78351+ struct acl_object_label *retval;
78352+ struct acl_object_label *retval2;
78353+
78354+ tmpsubj = (struct acl_subject_label *) subj;
78355+ read_lock(&gr_inode_lock);
78356+ do {
78357+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
78358+ if (retval) {
78359+ if (checkglob && retval->globbed) {
78360+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
78361+ if (retval2)
78362+ retval = retval2;
78363+ }
78364+ break;
78365+ }
78366+ } while ((tmpsubj = tmpsubj->parent_subject));
78367+ read_unlock(&gr_inode_lock);
78368+
78369+ return retval;
78370+}
78371+
78372+static struct acl_object_label *
78373+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78374+ struct dentry *curr_dentry,
78375+ const struct acl_subject_label *subj, char **path, const int checkglob)
78376+{
78377+ int newglob = checkglob;
78378+ u64 inode;
78379+ dev_t device;
78380+
78381+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
78382+ as we don't want a / * rule to match instead of the / object
78383+ don't do this for create lookups that call this function though, since they're looking up
78384+ on the parent and thus need globbing checks on all paths
78385+ */
78386+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
78387+ newglob = GR_NO_GLOB;
78388+
78389+ spin_lock(&curr_dentry->d_lock);
78390+ inode = __get_ino(curr_dentry);
78391+ device = __get_dev(curr_dentry);
78392+ spin_unlock(&curr_dentry->d_lock);
78393+
78394+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
78395+}
78396+
78397+#ifdef CONFIG_HUGETLBFS
78398+static inline bool
78399+is_hugetlbfs_mnt(const struct vfsmount *mnt)
78400+{
78401+ int i;
78402+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
78403+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
78404+ return true;
78405+ }
78406+
78407+ return false;
78408+}
78409+#endif
78410+
78411+static struct acl_object_label *
78412+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78413+ const struct acl_subject_label *subj, char *path, const int checkglob)
78414+{
78415+ struct dentry *dentry = (struct dentry *) l_dentry;
78416+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78417+ struct mount *real_mnt = real_mount(mnt);
78418+ struct acl_object_label *retval;
78419+ struct dentry *parent;
78420+
78421+ read_seqlock_excl(&mount_lock);
78422+ write_seqlock(&rename_lock);
78423+
78424+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
78425+#ifdef CONFIG_NET
78426+ mnt == sock_mnt ||
78427+#endif
78428+#ifdef CONFIG_HUGETLBFS
78429+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
78430+#endif
78431+ /* ignore Eric Biederman */
78432+ IS_PRIVATE(l_dentry->d_inode))) {
78433+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
78434+ goto out;
78435+ }
78436+
78437+ for (;;) {
78438+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78439+ break;
78440+
78441+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78442+ if (!mnt_has_parent(real_mnt))
78443+ break;
78444+
78445+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78446+ if (retval != NULL)
78447+ goto out;
78448+
78449+ dentry = real_mnt->mnt_mountpoint;
78450+ real_mnt = real_mnt->mnt_parent;
78451+ mnt = &real_mnt->mnt;
78452+ continue;
78453+ }
78454+
78455+ parent = dentry->d_parent;
78456+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78457+ if (retval != NULL)
78458+ goto out;
78459+
78460+ dentry = parent;
78461+ }
78462+
78463+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78464+
78465+ /* gr_real_root is pinned so we don't have to hold a reference */
78466+ if (retval == NULL)
78467+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
78468+out:
78469+ write_sequnlock(&rename_lock);
78470+ read_sequnlock_excl(&mount_lock);
78471+
78472+ BUG_ON(retval == NULL);
78473+
78474+ return retval;
78475+}
78476+
78477+static struct acl_object_label *
78478+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78479+ const struct acl_subject_label *subj)
78480+{
78481+ char *path = NULL;
78482+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
78483+}
78484+
78485+static struct acl_object_label *
78486+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78487+ const struct acl_subject_label *subj)
78488+{
78489+ char *path = NULL;
78490+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
78491+}
78492+
78493+static struct acl_object_label *
78494+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78495+ const struct acl_subject_label *subj, char *path)
78496+{
78497+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
78498+}
78499+
78500+struct acl_subject_label *
78501+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78502+ const struct acl_role_label *role)
78503+{
78504+ struct dentry *dentry = (struct dentry *) l_dentry;
78505+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78506+ struct mount *real_mnt = real_mount(mnt);
78507+ struct acl_subject_label *retval;
78508+ struct dentry *parent;
78509+
78510+ read_seqlock_excl(&mount_lock);
78511+ write_seqlock(&rename_lock);
78512+
78513+ for (;;) {
78514+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78515+ break;
78516+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78517+ if (!mnt_has_parent(real_mnt))
78518+ break;
78519+
78520+ spin_lock(&dentry->d_lock);
78521+ read_lock(&gr_inode_lock);
78522+ retval =
78523+ lookup_acl_subj_label(__get_ino(dentry),
78524+ __get_dev(dentry), role);
78525+ read_unlock(&gr_inode_lock);
78526+ spin_unlock(&dentry->d_lock);
78527+ if (retval != NULL)
78528+ goto out;
78529+
78530+ dentry = real_mnt->mnt_mountpoint;
78531+ real_mnt = real_mnt->mnt_parent;
78532+ mnt = &real_mnt->mnt;
78533+ continue;
78534+ }
78535+
78536+ spin_lock(&dentry->d_lock);
78537+ read_lock(&gr_inode_lock);
78538+ retval = lookup_acl_subj_label(__get_ino(dentry),
78539+ __get_dev(dentry), role);
78540+ read_unlock(&gr_inode_lock);
78541+ parent = dentry->d_parent;
78542+ spin_unlock(&dentry->d_lock);
78543+
78544+ if (retval != NULL)
78545+ goto out;
78546+
78547+ dentry = parent;
78548+ }
78549+
78550+ spin_lock(&dentry->d_lock);
78551+ read_lock(&gr_inode_lock);
78552+ retval = lookup_acl_subj_label(__get_ino(dentry),
78553+ __get_dev(dentry), role);
78554+ read_unlock(&gr_inode_lock);
78555+ spin_unlock(&dentry->d_lock);
78556+
78557+ if (unlikely(retval == NULL)) {
78558+ /* gr_real_root is pinned, we don't need to hold a reference */
78559+ read_lock(&gr_inode_lock);
78560+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
78561+ __get_dev(gr_real_root.dentry), role);
78562+ read_unlock(&gr_inode_lock);
78563+ }
78564+out:
78565+ write_sequnlock(&rename_lock);
78566+ read_sequnlock_excl(&mount_lock);
78567+
78568+ BUG_ON(retval == NULL);
78569+
78570+ return retval;
78571+}
78572+
78573+void
78574+assign_special_role(const char *rolename)
78575+{
78576+ struct acl_object_label *obj;
78577+ struct acl_role_label *r;
78578+ struct acl_role_label *assigned = NULL;
78579+ struct task_struct *tsk;
78580+ struct file *filp;
78581+
78582+ FOR_EACH_ROLE_START(r)
78583+ if (!strcmp(rolename, r->rolename) &&
78584+ (r->roletype & GR_ROLE_SPECIAL)) {
78585+ assigned = r;
78586+ break;
78587+ }
78588+ FOR_EACH_ROLE_END(r)
78589+
78590+ if (!assigned)
78591+ return;
78592+
78593+ read_lock(&tasklist_lock);
78594+ read_lock(&grsec_exec_file_lock);
78595+
78596+ tsk = current->real_parent;
78597+ if (tsk == NULL)
78598+ goto out_unlock;
78599+
78600+ filp = tsk->exec_file;
78601+ if (filp == NULL)
78602+ goto out_unlock;
78603+
78604+ tsk->is_writable = 0;
78605+ tsk->inherited = 0;
78606+
78607+ tsk->acl_sp_role = 1;
78608+ tsk->acl_role_id = ++acl_sp_role_value;
78609+ tsk->role = assigned;
78610+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
78611+
78612+ /* ignore additional mmap checks for processes that are writable
78613+ by the default ACL */
78614+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
78615+ if (unlikely(obj->mode & GR_WRITE))
78616+ tsk->is_writable = 1;
78617+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
78618+ if (unlikely(obj->mode & GR_WRITE))
78619+ tsk->is_writable = 1;
78620+
78621+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78622+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
78623+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
78624+#endif
78625+
78626+out_unlock:
78627+ read_unlock(&grsec_exec_file_lock);
78628+ read_unlock(&tasklist_lock);
78629+ return;
78630+}
78631+
78632+
78633+static void
78634+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
78635+{
78636+ struct task_struct *task = current;
78637+ const struct cred *cred = current_cred();
78638+
78639+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
78640+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78641+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78642+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
78643+
78644+ return;
78645+}
78646+
78647+static void
78648+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
78649+{
78650+ struct task_struct *task = current;
78651+ const struct cred *cred = current_cred();
78652+
78653+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78654+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78655+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78656+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
78657+
78658+ return;
78659+}
78660+
78661+static void
78662+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
78663+{
78664+ struct task_struct *task = current;
78665+ const struct cred *cred = current_cred();
78666+
78667+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78668+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78669+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78670+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
78671+
78672+ return;
78673+}
78674+
78675+static void
78676+gr_set_proc_res(struct task_struct *task)
78677+{
78678+ struct acl_subject_label *proc;
78679+ unsigned short i;
78680+
78681+ proc = task->acl;
78682+
78683+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
78684+ return;
78685+
78686+ for (i = 0; i < RLIM_NLIMITS; i++) {
78687+ unsigned long rlim_cur, rlim_max;
78688+
78689+ if (!(proc->resmask & (1U << i)))
78690+ continue;
78691+
78692+ rlim_cur = proc->res[i].rlim_cur;
78693+ rlim_max = proc->res[i].rlim_max;
78694+
78695+ if (i == RLIMIT_NOFILE) {
78696+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
78697+ if (rlim_cur > saved_sysctl_nr_open)
78698+ rlim_cur = saved_sysctl_nr_open;
78699+ if (rlim_max > saved_sysctl_nr_open)
78700+ rlim_max = saved_sysctl_nr_open;
78701+ }
78702+
78703+ task->signal->rlim[i].rlim_cur = rlim_cur;
78704+ task->signal->rlim[i].rlim_max = rlim_max;
78705+
78706+ if (i == RLIMIT_CPU)
78707+ update_rlimit_cpu(task, rlim_cur);
78708+ }
78709+
78710+ return;
78711+}
78712+
78713+/* both of the below must be called with
78714+ rcu_read_lock();
78715+ read_lock(&tasklist_lock);
78716+ read_lock(&grsec_exec_file_lock);
78717+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
78718+*/
78719+
78720+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
78721+{
78722+ char *tmpname;
78723+ struct acl_subject_label *tmpsubj;
78724+ struct file *filp;
78725+ struct name_entry *nmatch;
78726+
78727+ filp = task->exec_file;
78728+ if (filp == NULL)
78729+ return NULL;
78730+
78731+ /* the following is to apply the correct subject
78732+ on binaries running when the RBAC system
78733+ is enabled, when the binaries have been
78734+ replaced or deleted since their execution
78735+ -----
78736+ when the RBAC system starts, the inode/dev
78737+ from exec_file will be one the RBAC system
78738+ is unaware of. It only knows the inode/dev
78739+ of the present file on disk, or the absence
78740+ of it.
78741+ */
78742+
78743+ if (filename)
78744+ nmatch = __lookup_name_entry(state, filename);
78745+ else {
78746+ preempt_disable();
78747+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
78748+
78749+ nmatch = __lookup_name_entry(state, tmpname);
78750+ preempt_enable();
78751+ }
78752+ tmpsubj = NULL;
78753+ if (nmatch) {
78754+ if (nmatch->deleted)
78755+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
78756+ else
78757+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
78758+ }
78759+ /* this also works for the reload case -- if we don't match a potentially inherited subject
78760+ then we fall back to a normal lookup based on the binary's ino/dev
78761+ */
78762+ if (tmpsubj == NULL && fallback)
78763+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
78764+
78765+ return tmpsubj;
78766+}
78767+
78768+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
78769+{
78770+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
78771+}
78772+
78773+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
78774+{
78775+ struct acl_object_label *obj;
78776+ struct file *filp;
78777+
78778+ filp = task->exec_file;
78779+
78780+ task->acl = subj;
78781+ task->is_writable = 0;
78782+ /* ignore additional mmap checks for processes that are writable
78783+ by the default ACL */
78784+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
78785+ if (unlikely(obj->mode & GR_WRITE))
78786+ task->is_writable = 1;
78787+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
78788+ if (unlikely(obj->mode & GR_WRITE))
78789+ task->is_writable = 1;
78790+
78791+ gr_set_proc_res(task);
78792+
78793+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78794+ 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);
78795+#endif
78796+}
78797+
78798+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
78799+{
78800+ __gr_apply_subject_to_task(&running_polstate, task, subj);
78801+}
78802+
78803+__u32
78804+gr_search_file(const struct dentry * dentry, const __u32 mode,
78805+ const struct vfsmount * mnt)
78806+{
78807+ __u32 retval = mode;
78808+ struct acl_subject_label *curracl;
78809+ struct acl_object_label *currobj;
78810+
78811+ if (unlikely(!(gr_status & GR_READY)))
78812+ return (mode & ~GR_AUDITS);
78813+
78814+ curracl = current->acl;
78815+
78816+ currobj = chk_obj_label(dentry, mnt, curracl);
78817+ retval = currobj->mode & mode;
78818+
78819+ /* if we're opening a specified transfer file for writing
78820+ (e.g. /dev/initctl), then transfer our role to init
78821+ */
78822+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
78823+ current->role->roletype & GR_ROLE_PERSIST)) {
78824+ struct task_struct *task = init_pid_ns.child_reaper;
78825+
78826+ if (task->role != current->role) {
78827+ struct acl_subject_label *subj;
78828+
78829+ task->acl_sp_role = 0;
78830+ task->acl_role_id = current->acl_role_id;
78831+ task->role = current->role;
78832+ rcu_read_lock();
78833+ read_lock(&grsec_exec_file_lock);
78834+ subj = gr_get_subject_for_task(task, NULL, 1);
78835+ gr_apply_subject_to_task(task, subj);
78836+ read_unlock(&grsec_exec_file_lock);
78837+ rcu_read_unlock();
78838+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
78839+ }
78840+ }
78841+
78842+ if (unlikely
78843+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
78844+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
78845+ __u32 new_mode = mode;
78846+
78847+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
78848+
78849+ retval = new_mode;
78850+
78851+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
78852+ new_mode |= GR_INHERIT;
78853+
78854+ if (!(mode & GR_NOLEARN))
78855+ gr_log_learn(dentry, mnt, new_mode);
78856+ }
78857+
78858+ return retval;
78859+}
78860+
78861+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
78862+ const struct dentry *parent,
78863+ const struct vfsmount *mnt)
78864+{
78865+ struct name_entry *match;
78866+ struct acl_object_label *matchpo;
78867+ struct acl_subject_label *curracl;
78868+ char *path;
78869+
78870+ if (unlikely(!(gr_status & GR_READY)))
78871+ return NULL;
78872+
78873+ preempt_disable();
78874+ path = gr_to_filename_rbac(new_dentry, mnt);
78875+ match = lookup_name_entry_create(path);
78876+
78877+ curracl = current->acl;
78878+
78879+ if (match) {
78880+ read_lock(&gr_inode_lock);
78881+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
78882+ read_unlock(&gr_inode_lock);
78883+
78884+ if (matchpo) {
78885+ preempt_enable();
78886+ return matchpo;
78887+ }
78888+ }
78889+
78890+ // lookup parent
78891+
78892+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
78893+
78894+ preempt_enable();
78895+ return matchpo;
78896+}
78897+
78898+__u32
78899+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
78900+ const struct vfsmount * mnt, const __u32 mode)
78901+{
78902+ struct acl_object_label *matchpo;
78903+ __u32 retval;
78904+
78905+ if (unlikely(!(gr_status & GR_READY)))
78906+ return (mode & ~GR_AUDITS);
78907+
78908+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
78909+
78910+ retval = matchpo->mode & mode;
78911+
78912+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
78913+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
78914+ __u32 new_mode = mode;
78915+
78916+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
78917+
78918+ gr_log_learn(new_dentry, mnt, new_mode);
78919+ return new_mode;
78920+ }
78921+
78922+ return retval;
78923+}
78924+
78925+__u32
78926+gr_check_link(const struct dentry * new_dentry,
78927+ const struct dentry * parent_dentry,
78928+ const struct vfsmount * parent_mnt,
78929+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
78930+{
78931+ struct acl_object_label *obj;
78932+ __u32 oldmode, newmode;
78933+ __u32 needmode;
78934+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
78935+ GR_DELETE | GR_INHERIT;
78936+
78937+ if (unlikely(!(gr_status & GR_READY)))
78938+ return (GR_CREATE | GR_LINK);
78939+
78940+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
78941+ oldmode = obj->mode;
78942+
78943+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
78944+ newmode = obj->mode;
78945+
78946+ needmode = newmode & checkmodes;
78947+
78948+ // old name for hardlink must have at least the permissions of the new name
78949+ if ((oldmode & needmode) != needmode)
78950+ goto bad;
78951+
78952+ // if old name had restrictions/auditing, make sure the new name does as well
78953+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
78954+
78955+ // don't allow hardlinking of suid/sgid/fcapped files without permission
78956+ if (is_privileged_binary(old_dentry))
78957+ needmode |= GR_SETID;
78958+
78959+ if ((newmode & needmode) != needmode)
78960+ goto bad;
78961+
78962+ // enforce minimum permissions
78963+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
78964+ return newmode;
78965+bad:
78966+ needmode = oldmode;
78967+ if (is_privileged_binary(old_dentry))
78968+ needmode |= GR_SETID;
78969+
78970+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
78971+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
78972+ return (GR_CREATE | GR_LINK);
78973+ } else if (newmode & GR_SUPPRESS)
78974+ return GR_SUPPRESS;
78975+ else
78976+ return 0;
78977+}
78978+
78979+int
78980+gr_check_hidden_task(const struct task_struct *task)
78981+{
78982+ if (unlikely(!(gr_status & GR_READY)))
78983+ return 0;
78984+
78985+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
78986+ return 1;
78987+
78988+ return 0;
78989+}
78990+
78991+int
78992+gr_check_protected_task(const struct task_struct *task)
78993+{
78994+ if (unlikely(!(gr_status & GR_READY) || !task))
78995+ return 0;
78996+
78997+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
78998+ task->acl != current->acl)
78999+ return 1;
79000+
79001+ return 0;
79002+}
79003+
79004+int
79005+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
79006+{
79007+ struct task_struct *p;
79008+ int ret = 0;
79009+
79010+ if (unlikely(!(gr_status & GR_READY) || !pid))
79011+ return ret;
79012+
79013+ read_lock(&tasklist_lock);
79014+ do_each_pid_task(pid, type, p) {
79015+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79016+ p->acl != current->acl) {
79017+ ret = 1;
79018+ goto out;
79019+ }
79020+ } while_each_pid_task(pid, type, p);
79021+out:
79022+ read_unlock(&tasklist_lock);
79023+
79024+ return ret;
79025+}
79026+
79027+void
79028+gr_copy_label(struct task_struct *tsk)
79029+{
79030+ struct task_struct *p = current;
79031+
79032+ tsk->inherited = p->inherited;
79033+ tsk->acl_sp_role = 0;
79034+ tsk->acl_role_id = p->acl_role_id;
79035+ tsk->acl = p->acl;
79036+ tsk->role = p->role;
79037+ tsk->signal->used_accept = 0;
79038+ tsk->signal->curr_ip = p->signal->curr_ip;
79039+ tsk->signal->saved_ip = p->signal->saved_ip;
79040+ if (p->exec_file)
79041+ get_file(p->exec_file);
79042+ tsk->exec_file = p->exec_file;
79043+ tsk->is_writable = p->is_writable;
79044+ if (unlikely(p->signal->used_accept)) {
79045+ p->signal->curr_ip = 0;
79046+ p->signal->saved_ip = 0;
79047+ }
79048+
79049+ return;
79050+}
79051+
79052+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
79053+
79054+int
79055+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
79056+{
79057+ unsigned int i;
79058+ __u16 num;
79059+ uid_t *uidlist;
79060+ uid_t curuid;
79061+ int realok = 0;
79062+ int effectiveok = 0;
79063+ int fsok = 0;
79064+ uid_t globalreal, globaleffective, globalfs;
79065+
79066+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
79067+ struct user_struct *user;
79068+
79069+ if (!uid_valid(real))
79070+ goto skipit;
79071+
79072+ /* find user based on global namespace */
79073+
79074+ globalreal = GR_GLOBAL_UID(real);
79075+
79076+ user = find_user(make_kuid(&init_user_ns, globalreal));
79077+ if (user == NULL)
79078+ goto skipit;
79079+
79080+ if (gr_process_kernel_setuid_ban(user)) {
79081+ /* for find_user */
79082+ free_uid(user);
79083+ return 1;
79084+ }
79085+
79086+ /* for find_user */
79087+ free_uid(user);
79088+
79089+skipit:
79090+#endif
79091+
79092+ if (unlikely(!(gr_status & GR_READY)))
79093+ return 0;
79094+
79095+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79096+ gr_log_learn_uid_change(real, effective, fs);
79097+
79098+ num = current->acl->user_trans_num;
79099+ uidlist = current->acl->user_transitions;
79100+
79101+ if (uidlist == NULL)
79102+ return 0;
79103+
79104+ if (!uid_valid(real)) {
79105+ realok = 1;
79106+ globalreal = (uid_t)-1;
79107+ } else {
79108+ globalreal = GR_GLOBAL_UID(real);
79109+ }
79110+ if (!uid_valid(effective)) {
79111+ effectiveok = 1;
79112+ globaleffective = (uid_t)-1;
79113+ } else {
79114+ globaleffective = GR_GLOBAL_UID(effective);
79115+ }
79116+ if (!uid_valid(fs)) {
79117+ fsok = 1;
79118+ globalfs = (uid_t)-1;
79119+ } else {
79120+ globalfs = GR_GLOBAL_UID(fs);
79121+ }
79122+
79123+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
79124+ for (i = 0; i < num; i++) {
79125+ curuid = uidlist[i];
79126+ if (globalreal == curuid)
79127+ realok = 1;
79128+ if (globaleffective == curuid)
79129+ effectiveok = 1;
79130+ if (globalfs == curuid)
79131+ fsok = 1;
79132+ }
79133+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
79134+ for (i = 0; i < num; i++) {
79135+ curuid = uidlist[i];
79136+ if (globalreal == curuid)
79137+ break;
79138+ if (globaleffective == curuid)
79139+ break;
79140+ if (globalfs == curuid)
79141+ break;
79142+ }
79143+ /* not in deny list */
79144+ if (i == num) {
79145+ realok = 1;
79146+ effectiveok = 1;
79147+ fsok = 1;
79148+ }
79149+ }
79150+
79151+ if (realok && effectiveok && fsok)
79152+ return 0;
79153+ else {
79154+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79155+ return 1;
79156+ }
79157+}
79158+
79159+int
79160+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
79161+{
79162+ unsigned int i;
79163+ __u16 num;
79164+ gid_t *gidlist;
79165+ gid_t curgid;
79166+ int realok = 0;
79167+ int effectiveok = 0;
79168+ int fsok = 0;
79169+ gid_t globalreal, globaleffective, globalfs;
79170+
79171+ if (unlikely(!(gr_status & GR_READY)))
79172+ return 0;
79173+
79174+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79175+ gr_log_learn_gid_change(real, effective, fs);
79176+
79177+ num = current->acl->group_trans_num;
79178+ gidlist = current->acl->group_transitions;
79179+
79180+ if (gidlist == NULL)
79181+ return 0;
79182+
79183+ if (!gid_valid(real)) {
79184+ realok = 1;
79185+ globalreal = (gid_t)-1;
79186+ } else {
79187+ globalreal = GR_GLOBAL_GID(real);
79188+ }
79189+ if (!gid_valid(effective)) {
79190+ effectiveok = 1;
79191+ globaleffective = (gid_t)-1;
79192+ } else {
79193+ globaleffective = GR_GLOBAL_GID(effective);
79194+ }
79195+ if (!gid_valid(fs)) {
79196+ fsok = 1;
79197+ globalfs = (gid_t)-1;
79198+ } else {
79199+ globalfs = GR_GLOBAL_GID(fs);
79200+ }
79201+
79202+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
79203+ for (i = 0; i < num; i++) {
79204+ curgid = gidlist[i];
79205+ if (globalreal == curgid)
79206+ realok = 1;
79207+ if (globaleffective == curgid)
79208+ effectiveok = 1;
79209+ if (globalfs == curgid)
79210+ fsok = 1;
79211+ }
79212+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
79213+ for (i = 0; i < num; i++) {
79214+ curgid = gidlist[i];
79215+ if (globalreal == curgid)
79216+ break;
79217+ if (globaleffective == curgid)
79218+ break;
79219+ if (globalfs == curgid)
79220+ break;
79221+ }
79222+ /* not in deny list */
79223+ if (i == num) {
79224+ realok = 1;
79225+ effectiveok = 1;
79226+ fsok = 1;
79227+ }
79228+ }
79229+
79230+ if (realok && effectiveok && fsok)
79231+ return 0;
79232+ else {
79233+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79234+ return 1;
79235+ }
79236+}
79237+
79238+extern int gr_acl_is_capable(const int cap);
79239+
79240+void
79241+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
79242+{
79243+ struct acl_role_label *role = task->role;
79244+ struct acl_role_label *origrole = role;
79245+ struct acl_subject_label *subj = NULL;
79246+ struct acl_object_label *obj;
79247+ struct file *filp;
79248+ uid_t uid;
79249+ gid_t gid;
79250+
79251+ if (unlikely(!(gr_status & GR_READY)))
79252+ return;
79253+
79254+ uid = GR_GLOBAL_UID(kuid);
79255+ gid = GR_GLOBAL_GID(kgid);
79256+
79257+ filp = task->exec_file;
79258+
79259+ /* kernel process, we'll give them the kernel role */
79260+ if (unlikely(!filp)) {
79261+ task->role = running_polstate.kernel_role;
79262+ task->acl = running_polstate.kernel_role->root_label;
79263+ return;
79264+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
79265+ /* save the current ip at time of role lookup so that the proper
79266+ IP will be learned for role_allowed_ip */
79267+ task->signal->saved_ip = task->signal->curr_ip;
79268+ role = lookup_acl_role_label(task, uid, gid);
79269+ }
79270+
79271+ /* don't change the role if we're not a privileged process */
79272+ if (role && task->role != role &&
79273+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
79274+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
79275+ return;
79276+
79277+ task->role = role;
79278+
79279+ if (task->inherited) {
79280+ /* if we reached our subject through inheritance, then first see
79281+ if there's a subject of the same name in the new role that has
79282+ an object that would result in the same inherited subject
79283+ */
79284+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
79285+ if (subj) {
79286+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
79287+ if (!(obj->mode & GR_INHERIT))
79288+ subj = NULL;
79289+ }
79290+
79291+ }
79292+ if (subj == NULL) {
79293+ /* otherwise:
79294+ perform subject lookup in possibly new role
79295+ we can use this result below in the case where role == task->role
79296+ */
79297+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
79298+ }
79299+
79300+ /* if we changed uid/gid, but result in the same role
79301+ and are using inheritance, don't lose the inherited subject
79302+ if current subject is other than what normal lookup
79303+ would result in, we arrived via inheritance, don't
79304+ lose subject
79305+ */
79306+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
79307+ (subj == task->acl)))
79308+ task->acl = subj;
79309+
79310+ /* leave task->inherited unaffected */
79311+
79312+ task->is_writable = 0;
79313+
79314+ /* ignore additional mmap checks for processes that are writable
79315+ by the default ACL */
79316+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
79317+ if (unlikely(obj->mode & GR_WRITE))
79318+ task->is_writable = 1;
79319+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
79320+ if (unlikely(obj->mode & GR_WRITE))
79321+ task->is_writable = 1;
79322+
79323+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79324+ 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);
79325+#endif
79326+
79327+ gr_set_proc_res(task);
79328+
79329+ return;
79330+}
79331+
79332+int
79333+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
79334+ const int unsafe_flags)
79335+{
79336+ struct task_struct *task = current;
79337+ struct acl_subject_label *newacl;
79338+ struct acl_object_label *obj;
79339+ __u32 retmode;
79340+
79341+ if (unlikely(!(gr_status & GR_READY)))
79342+ return 0;
79343+
79344+ newacl = chk_subj_label(dentry, mnt, task->role);
79345+
79346+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
79347+ did an exec
79348+ */
79349+ rcu_read_lock();
79350+ read_lock(&tasklist_lock);
79351+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
79352+ (task->parent->acl->mode & GR_POVERRIDE))) {
79353+ read_unlock(&tasklist_lock);
79354+ rcu_read_unlock();
79355+ goto skip_check;
79356+ }
79357+ read_unlock(&tasklist_lock);
79358+ rcu_read_unlock();
79359+
79360+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
79361+ !(task->role->roletype & GR_ROLE_GOD) &&
79362+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
79363+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79364+ if (unsafe_flags & LSM_UNSAFE_SHARE)
79365+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
79366+ else
79367+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
79368+ return -EACCES;
79369+ }
79370+
79371+skip_check:
79372+
79373+ obj = chk_obj_label(dentry, mnt, task->acl);
79374+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
79375+
79376+ if (!(task->acl->mode & GR_INHERITLEARN) &&
79377+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
79378+ if (obj->nested)
79379+ task->acl = obj->nested;
79380+ else
79381+ task->acl = newacl;
79382+ task->inherited = 0;
79383+ } else {
79384+ task->inherited = 1;
79385+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
79386+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
79387+ }
79388+
79389+ task->is_writable = 0;
79390+
79391+ /* ignore additional mmap checks for processes that are writable
79392+ by the default ACL */
79393+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
79394+ if (unlikely(obj->mode & GR_WRITE))
79395+ task->is_writable = 1;
79396+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
79397+ if (unlikely(obj->mode & GR_WRITE))
79398+ task->is_writable = 1;
79399+
79400+ gr_set_proc_res(task);
79401+
79402+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79403+ 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);
79404+#endif
79405+ return 0;
79406+}
79407+
79408+/* always called with valid inodev ptr */
79409+static void
79410+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
79411+{
79412+ struct acl_object_label *matchpo;
79413+ struct acl_subject_label *matchps;
79414+ struct acl_subject_label *subj;
79415+ struct acl_role_label *role;
79416+ unsigned int x;
79417+
79418+ FOR_EACH_ROLE_START(role)
79419+ FOR_EACH_SUBJECT_START(role, subj, x)
79420+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79421+ matchpo->mode |= GR_DELETED;
79422+ FOR_EACH_SUBJECT_END(subj,x)
79423+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79424+ /* nested subjects aren't in the role's subj_hash table */
79425+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79426+ matchpo->mode |= GR_DELETED;
79427+ FOR_EACH_NESTED_SUBJECT_END(subj)
79428+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
79429+ matchps->mode |= GR_DELETED;
79430+ FOR_EACH_ROLE_END(role)
79431+
79432+ inodev->nentry->deleted = 1;
79433+
79434+ return;
79435+}
79436+
79437+void
79438+gr_handle_delete(const u64 ino, const dev_t dev)
79439+{
79440+ struct inodev_entry *inodev;
79441+
79442+ if (unlikely(!(gr_status & GR_READY)))
79443+ return;
79444+
79445+ write_lock(&gr_inode_lock);
79446+ inodev = lookup_inodev_entry(ino, dev);
79447+ if (inodev != NULL)
79448+ do_handle_delete(inodev, ino, dev);
79449+ write_unlock(&gr_inode_lock);
79450+
79451+ return;
79452+}
79453+
79454+static void
79455+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
79456+ const u64 newinode, const dev_t newdevice,
79457+ struct acl_subject_label *subj)
79458+{
79459+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
79460+ struct acl_object_label *match;
79461+
79462+ match = subj->obj_hash[index];
79463+
79464+ while (match && (match->inode != oldinode ||
79465+ match->device != olddevice ||
79466+ !(match->mode & GR_DELETED)))
79467+ match = match->next;
79468+
79469+ if (match && (match->inode == oldinode)
79470+ && (match->device == olddevice)
79471+ && (match->mode & GR_DELETED)) {
79472+ if (match->prev == NULL) {
79473+ subj->obj_hash[index] = match->next;
79474+ if (match->next != NULL)
79475+ match->next->prev = NULL;
79476+ } else {
79477+ match->prev->next = match->next;
79478+ if (match->next != NULL)
79479+ match->next->prev = match->prev;
79480+ }
79481+ match->prev = NULL;
79482+ match->next = NULL;
79483+ match->inode = newinode;
79484+ match->device = newdevice;
79485+ match->mode &= ~GR_DELETED;
79486+
79487+ insert_acl_obj_label(match, subj);
79488+ }
79489+
79490+ return;
79491+}
79492+
79493+static void
79494+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
79495+ const u64 newinode, const dev_t newdevice,
79496+ struct acl_role_label *role)
79497+{
79498+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
79499+ struct acl_subject_label *match;
79500+
79501+ match = role->subj_hash[index];
79502+
79503+ while (match && (match->inode != oldinode ||
79504+ match->device != olddevice ||
79505+ !(match->mode & GR_DELETED)))
79506+ match = match->next;
79507+
79508+ if (match && (match->inode == oldinode)
79509+ && (match->device == olddevice)
79510+ && (match->mode & GR_DELETED)) {
79511+ if (match->prev == NULL) {
79512+ role->subj_hash[index] = match->next;
79513+ if (match->next != NULL)
79514+ match->next->prev = NULL;
79515+ } else {
79516+ match->prev->next = match->next;
79517+ if (match->next != NULL)
79518+ match->next->prev = match->prev;
79519+ }
79520+ match->prev = NULL;
79521+ match->next = NULL;
79522+ match->inode = newinode;
79523+ match->device = newdevice;
79524+ match->mode &= ~GR_DELETED;
79525+
79526+ insert_acl_subj_label(match, role);
79527+ }
79528+
79529+ return;
79530+}
79531+
79532+static void
79533+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
79534+ const u64 newinode, const dev_t newdevice)
79535+{
79536+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
79537+ struct inodev_entry *match;
79538+
79539+ match = running_polstate.inodev_set.i_hash[index];
79540+
79541+ while (match && (match->nentry->inode != oldinode ||
79542+ match->nentry->device != olddevice || !match->nentry->deleted))
79543+ match = match->next;
79544+
79545+ if (match && (match->nentry->inode == oldinode)
79546+ && (match->nentry->device == olddevice) &&
79547+ match->nentry->deleted) {
79548+ if (match->prev == NULL) {
79549+ running_polstate.inodev_set.i_hash[index] = match->next;
79550+ if (match->next != NULL)
79551+ match->next->prev = NULL;
79552+ } else {
79553+ match->prev->next = match->next;
79554+ if (match->next != NULL)
79555+ match->next->prev = match->prev;
79556+ }
79557+ match->prev = NULL;
79558+ match->next = NULL;
79559+ match->nentry->inode = newinode;
79560+ match->nentry->device = newdevice;
79561+ match->nentry->deleted = 0;
79562+
79563+ insert_inodev_entry(match);
79564+ }
79565+
79566+ return;
79567+}
79568+
79569+static void
79570+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
79571+{
79572+ struct acl_subject_label *subj;
79573+ struct acl_role_label *role;
79574+ unsigned int x;
79575+
79576+ FOR_EACH_ROLE_START(role)
79577+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
79578+
79579+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79580+ if ((subj->inode == ino) && (subj->device == dev)) {
79581+ subj->inode = ino;
79582+ subj->device = dev;
79583+ }
79584+ /* nested subjects aren't in the role's subj_hash table */
79585+ update_acl_obj_label(matchn->inode, matchn->device,
79586+ ino, dev, subj);
79587+ FOR_EACH_NESTED_SUBJECT_END(subj)
79588+ FOR_EACH_SUBJECT_START(role, subj, x)
79589+ update_acl_obj_label(matchn->inode, matchn->device,
79590+ ino, dev, subj);
79591+ FOR_EACH_SUBJECT_END(subj,x)
79592+ FOR_EACH_ROLE_END(role)
79593+
79594+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
79595+
79596+ return;
79597+}
79598+
79599+static void
79600+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
79601+ const struct vfsmount *mnt)
79602+{
79603+ u64 ino = __get_ino(dentry);
79604+ dev_t dev = __get_dev(dentry);
79605+
79606+ __do_handle_create(matchn, ino, dev);
79607+
79608+ return;
79609+}
79610+
79611+void
79612+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
79613+{
79614+ struct name_entry *matchn;
79615+
79616+ if (unlikely(!(gr_status & GR_READY)))
79617+ return;
79618+
79619+ preempt_disable();
79620+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
79621+
79622+ if (unlikely((unsigned long)matchn)) {
79623+ write_lock(&gr_inode_lock);
79624+ do_handle_create(matchn, dentry, mnt);
79625+ write_unlock(&gr_inode_lock);
79626+ }
79627+ preempt_enable();
79628+
79629+ return;
79630+}
79631+
79632+void
79633+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
79634+{
79635+ struct name_entry *matchn;
79636+
79637+ if (unlikely(!(gr_status & GR_READY)))
79638+ return;
79639+
79640+ preempt_disable();
79641+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
79642+
79643+ if (unlikely((unsigned long)matchn)) {
79644+ write_lock(&gr_inode_lock);
79645+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
79646+ write_unlock(&gr_inode_lock);
79647+ }
79648+ preempt_enable();
79649+
79650+ return;
79651+}
79652+
79653+void
79654+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79655+ struct dentry *old_dentry,
79656+ struct dentry *new_dentry,
79657+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
79658+{
79659+ struct name_entry *matchn;
79660+ struct name_entry *matchn2 = NULL;
79661+ struct inodev_entry *inodev;
79662+ struct inode *inode = new_dentry->d_inode;
79663+ u64 old_ino = __get_ino(old_dentry);
79664+ dev_t old_dev = __get_dev(old_dentry);
79665+ unsigned int exchange = flags & RENAME_EXCHANGE;
79666+
79667+ /* vfs_rename swaps the name and parent link for old_dentry and
79668+ new_dentry
79669+ at this point, old_dentry has the new name, parent link, and inode
79670+ for the renamed file
79671+ if a file is being replaced by a rename, new_dentry has the inode
79672+ and name for the replaced file
79673+ */
79674+
79675+ if (unlikely(!(gr_status & GR_READY)))
79676+ return;
79677+
79678+ preempt_disable();
79679+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
79680+
79681+ /* exchange cases:
79682+ a filename exists for the source, but not dest
79683+ do a recreate on source
79684+ a filename exists for the dest, but not source
79685+ do a recreate on dest
79686+ a filename exists for both source and dest
79687+ delete source and dest, then create source and dest
79688+ a filename exists for neither source nor dest
79689+ no updates needed
79690+
79691+ the name entry lookups get us the old inode/dev associated with
79692+ each name, so do the deletes first (if possible) so that when
79693+ we do the create, we pick up on the right entries
79694+ */
79695+
79696+ if (exchange)
79697+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
79698+
79699+ /* we wouldn't have to check d_inode if it weren't for
79700+ NFS silly-renaming
79701+ */
79702+
79703+ write_lock(&gr_inode_lock);
79704+ if (unlikely((replace || exchange) && inode)) {
79705+ u64 new_ino = __get_ino(new_dentry);
79706+ dev_t new_dev = __get_dev(new_dentry);
79707+
79708+ inodev = lookup_inodev_entry(new_ino, new_dev);
79709+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
79710+ do_handle_delete(inodev, new_ino, new_dev);
79711+ }
79712+
79713+ inodev = lookup_inodev_entry(old_ino, old_dev);
79714+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
79715+ do_handle_delete(inodev, old_ino, old_dev);
79716+
79717+ if (unlikely(matchn != NULL))
79718+ do_handle_create(matchn, old_dentry, mnt);
79719+
79720+ if (unlikely(matchn2 != NULL))
79721+ do_handle_create(matchn2, new_dentry, mnt);
79722+
79723+ write_unlock(&gr_inode_lock);
79724+ preempt_enable();
79725+
79726+ return;
79727+}
79728+
79729+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
79730+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
79731+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
79732+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
79733+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
79734+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
79735+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
79736+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
79737+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
79738+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
79739+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
79740+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
79741+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
79742+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
79743+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
79744+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
79745+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
79746+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
79747+};
79748+
79749+void
79750+gr_learn_resource(const struct task_struct *task,
79751+ const int res, const unsigned long wanted, const int gt)
79752+{
79753+ struct acl_subject_label *acl;
79754+ const struct cred *cred;
79755+
79756+ if (unlikely((gr_status & GR_READY) &&
79757+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
79758+ goto skip_reslog;
79759+
79760+ gr_log_resource(task, res, wanted, gt);
79761+skip_reslog:
79762+
79763+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
79764+ return;
79765+
79766+ acl = task->acl;
79767+
79768+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
79769+ !(acl->resmask & (1U << (unsigned short) res))))
79770+ return;
79771+
79772+ if (wanted >= acl->res[res].rlim_cur) {
79773+ unsigned long res_add;
79774+
79775+ res_add = wanted + res_learn_bumps[res];
79776+
79777+ acl->res[res].rlim_cur = res_add;
79778+
79779+ if (wanted > acl->res[res].rlim_max)
79780+ acl->res[res].rlim_max = res_add;
79781+
79782+ /* only log the subject filename, since resource logging is supported for
79783+ single-subject learning only */
79784+ rcu_read_lock();
79785+ cred = __task_cred(task);
79786+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
79787+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
79788+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
79789+ "", (unsigned long) res, &task->signal->saved_ip);
79790+ rcu_read_unlock();
79791+ }
79792+
79793+ return;
79794+}
79795+EXPORT_SYMBOL_GPL(gr_learn_resource);
79796+#endif
79797+
79798+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
79799+void
79800+pax_set_initial_flags(struct linux_binprm *bprm)
79801+{
79802+ struct task_struct *task = current;
79803+ struct acl_subject_label *proc;
79804+ unsigned long flags;
79805+
79806+ if (unlikely(!(gr_status & GR_READY)))
79807+ return;
79808+
79809+ flags = pax_get_flags(task);
79810+
79811+ proc = task->acl;
79812+
79813+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
79814+ flags &= ~MF_PAX_PAGEEXEC;
79815+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
79816+ flags &= ~MF_PAX_SEGMEXEC;
79817+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
79818+ flags &= ~MF_PAX_RANDMMAP;
79819+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
79820+ flags &= ~MF_PAX_EMUTRAMP;
79821+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
79822+ flags &= ~MF_PAX_MPROTECT;
79823+
79824+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
79825+ flags |= MF_PAX_PAGEEXEC;
79826+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
79827+ flags |= MF_PAX_SEGMEXEC;
79828+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
79829+ flags |= MF_PAX_RANDMMAP;
79830+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
79831+ flags |= MF_PAX_EMUTRAMP;
79832+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
79833+ flags |= MF_PAX_MPROTECT;
79834+
79835+ pax_set_flags(task, flags);
79836+
79837+ return;
79838+}
79839+#endif
79840+
79841+int
79842+gr_handle_proc_ptrace(struct task_struct *task)
79843+{
79844+ struct file *filp;
79845+ struct task_struct *tmp = task;
79846+ struct task_struct *curtemp = current;
79847+ __u32 retmode;
79848+
79849+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
79850+ if (unlikely(!(gr_status & GR_READY)))
79851+ return 0;
79852+#endif
79853+
79854+ read_lock(&tasklist_lock);
79855+ read_lock(&grsec_exec_file_lock);
79856+ filp = task->exec_file;
79857+
79858+ while (task_pid_nr(tmp) > 0) {
79859+ if (tmp == curtemp)
79860+ break;
79861+ tmp = tmp->real_parent;
79862+ }
79863+
79864+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
79865+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
79866+ read_unlock(&grsec_exec_file_lock);
79867+ read_unlock(&tasklist_lock);
79868+ return 1;
79869+ }
79870+
79871+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79872+ if (!(gr_status & GR_READY)) {
79873+ read_unlock(&grsec_exec_file_lock);
79874+ read_unlock(&tasklist_lock);
79875+ return 0;
79876+ }
79877+#endif
79878+
79879+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
79880+ read_unlock(&grsec_exec_file_lock);
79881+ read_unlock(&tasklist_lock);
79882+
79883+ if (retmode & GR_NOPTRACE)
79884+ return 1;
79885+
79886+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
79887+ && (current->acl != task->acl || (current->acl != current->role->root_label
79888+ && task_pid_nr(current) != task_pid_nr(task))))
79889+ return 1;
79890+
79891+ return 0;
79892+}
79893+
79894+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
79895+{
79896+ if (unlikely(!(gr_status & GR_READY)))
79897+ return;
79898+
79899+ if (!(current->role->roletype & GR_ROLE_GOD))
79900+ return;
79901+
79902+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
79903+ p->role->rolename, gr_task_roletype_to_char(p),
79904+ p->acl->filename);
79905+}
79906+
79907+int
79908+gr_handle_ptrace(struct task_struct *task, const long request)
79909+{
79910+ struct task_struct *tmp = task;
79911+ struct task_struct *curtemp = current;
79912+ __u32 retmode;
79913+
79914+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
79915+ if (unlikely(!(gr_status & GR_READY)))
79916+ return 0;
79917+#endif
79918+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
79919+ read_lock(&tasklist_lock);
79920+ while (task_pid_nr(tmp) > 0) {
79921+ if (tmp == curtemp)
79922+ break;
79923+ tmp = tmp->real_parent;
79924+ }
79925+
79926+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
79927+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
79928+ read_unlock(&tasklist_lock);
79929+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
79930+ return 1;
79931+ }
79932+ read_unlock(&tasklist_lock);
79933+ }
79934+
79935+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79936+ if (!(gr_status & GR_READY))
79937+ return 0;
79938+#endif
79939+
79940+ read_lock(&grsec_exec_file_lock);
79941+ if (unlikely(!task->exec_file)) {
79942+ read_unlock(&grsec_exec_file_lock);
79943+ return 0;
79944+ }
79945+
79946+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
79947+ read_unlock(&grsec_exec_file_lock);
79948+
79949+ if (retmode & GR_NOPTRACE) {
79950+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
79951+ return 1;
79952+ }
79953+
79954+ if (retmode & GR_PTRACERD) {
79955+ switch (request) {
79956+ case PTRACE_SEIZE:
79957+ case PTRACE_POKETEXT:
79958+ case PTRACE_POKEDATA:
79959+ case PTRACE_POKEUSR:
79960+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
79961+ case PTRACE_SETREGS:
79962+ case PTRACE_SETFPREGS:
79963+#endif
79964+#ifdef CONFIG_X86
79965+ case PTRACE_SETFPXREGS:
79966+#endif
79967+#ifdef CONFIG_ALTIVEC
79968+ case PTRACE_SETVRREGS:
79969+#endif
79970+ return 1;
79971+ default:
79972+ return 0;
79973+ }
79974+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
79975+ !(current->role->roletype & GR_ROLE_GOD) &&
79976+ (current->acl != task->acl)) {
79977+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
79978+ return 1;
79979+ }
79980+
79981+ return 0;
79982+}
79983+
79984+static int is_writable_mmap(const struct file *filp)
79985+{
79986+ struct task_struct *task = current;
79987+ struct acl_object_label *obj, *obj2;
79988+
79989+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
79990+ !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))) {
79991+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
79992+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
79993+ task->role->root_label);
79994+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
79995+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
79996+ return 1;
79997+ }
79998+ }
79999+ return 0;
80000+}
80001+
80002+int
80003+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
80004+{
80005+ __u32 mode;
80006+
80007+ if (unlikely(!file || !(prot & PROT_EXEC)))
80008+ return 1;
80009+
80010+ if (is_writable_mmap(file))
80011+ return 0;
80012+
80013+ mode =
80014+ gr_search_file(file->f_path.dentry,
80015+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80016+ file->f_path.mnt);
80017+
80018+ if (!gr_tpe_allow(file))
80019+ return 0;
80020+
80021+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80022+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80023+ return 0;
80024+ } else if (unlikely(!(mode & GR_EXEC))) {
80025+ return 0;
80026+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80027+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80028+ return 1;
80029+ }
80030+
80031+ return 1;
80032+}
80033+
80034+int
80035+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
80036+{
80037+ __u32 mode;
80038+
80039+ if (unlikely(!file || !(prot & PROT_EXEC)))
80040+ return 1;
80041+
80042+ if (is_writable_mmap(file))
80043+ return 0;
80044+
80045+ mode =
80046+ gr_search_file(file->f_path.dentry,
80047+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80048+ file->f_path.mnt);
80049+
80050+ if (!gr_tpe_allow(file))
80051+ return 0;
80052+
80053+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80054+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80055+ return 0;
80056+ } else if (unlikely(!(mode & GR_EXEC))) {
80057+ return 0;
80058+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80059+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80060+ return 1;
80061+ }
80062+
80063+ return 1;
80064+}
80065+
80066+void
80067+gr_acl_handle_psacct(struct task_struct *task, const long code)
80068+{
80069+ unsigned long runtime, cputime;
80070+ cputime_t utime, stime;
80071+ unsigned int wday, cday;
80072+ __u8 whr, chr;
80073+ __u8 wmin, cmin;
80074+ __u8 wsec, csec;
80075+ struct timespec curtime, starttime;
80076+
80077+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
80078+ !(task->acl->mode & GR_PROCACCT)))
80079+ return;
80080+
80081+ curtime = ns_to_timespec(ktime_get_ns());
80082+ starttime = ns_to_timespec(task->start_time);
80083+ runtime = curtime.tv_sec - starttime.tv_sec;
80084+ wday = runtime / (60 * 60 * 24);
80085+ runtime -= wday * (60 * 60 * 24);
80086+ whr = runtime / (60 * 60);
80087+ runtime -= whr * (60 * 60);
80088+ wmin = runtime / 60;
80089+ runtime -= wmin * 60;
80090+ wsec = runtime;
80091+
80092+ task_cputime(task, &utime, &stime);
80093+ cputime = cputime_to_secs(utime + stime);
80094+ cday = cputime / (60 * 60 * 24);
80095+ cputime -= cday * (60 * 60 * 24);
80096+ chr = cputime / (60 * 60);
80097+ cputime -= chr * (60 * 60);
80098+ cmin = cputime / 60;
80099+ cputime -= cmin * 60;
80100+ csec = cputime;
80101+
80102+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
80103+
80104+ return;
80105+}
80106+
80107+#ifdef CONFIG_TASKSTATS
80108+int gr_is_taskstats_denied(int pid)
80109+{
80110+ struct task_struct *task;
80111+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80112+ const struct cred *cred;
80113+#endif
80114+ int ret = 0;
80115+
80116+ /* restrict taskstats viewing to un-chrooted root users
80117+ who have the 'view' subject flag if the RBAC system is enabled
80118+ */
80119+
80120+ rcu_read_lock();
80121+ read_lock(&tasklist_lock);
80122+ task = find_task_by_vpid(pid);
80123+ if (task) {
80124+#ifdef CONFIG_GRKERNSEC_CHROOT
80125+ if (proc_is_chrooted(task))
80126+ ret = -EACCES;
80127+#endif
80128+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80129+ cred = __task_cred(task);
80130+#ifdef CONFIG_GRKERNSEC_PROC_USER
80131+ if (gr_is_global_nonroot(cred->uid))
80132+ ret = -EACCES;
80133+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80134+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
80135+ ret = -EACCES;
80136+#endif
80137+#endif
80138+ if (gr_status & GR_READY) {
80139+ if (!(task->acl->mode & GR_VIEW))
80140+ ret = -EACCES;
80141+ }
80142+ } else
80143+ ret = -ENOENT;
80144+
80145+ read_unlock(&tasklist_lock);
80146+ rcu_read_unlock();
80147+
80148+ return ret;
80149+}
80150+#endif
80151+
80152+/* AUXV entries are filled via a descendant of search_binary_handler
80153+ after we've already applied the subject for the target
80154+*/
80155+int gr_acl_enable_at_secure(void)
80156+{
80157+ if (unlikely(!(gr_status & GR_READY)))
80158+ return 0;
80159+
80160+ if (current->acl->mode & GR_ATSECURE)
80161+ return 1;
80162+
80163+ return 0;
80164+}
80165+
80166+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
80167+{
80168+ struct task_struct *task = current;
80169+ struct dentry *dentry = file->f_path.dentry;
80170+ struct vfsmount *mnt = file->f_path.mnt;
80171+ struct acl_object_label *obj, *tmp;
80172+ struct acl_subject_label *subj;
80173+ unsigned int bufsize;
80174+ int is_not_root;
80175+ char *path;
80176+ dev_t dev = __get_dev(dentry);
80177+
80178+ if (unlikely(!(gr_status & GR_READY)))
80179+ return 1;
80180+
80181+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
80182+ return 1;
80183+
80184+ /* ignore Eric Biederman */
80185+ if (IS_PRIVATE(dentry->d_inode))
80186+ return 1;
80187+
80188+ subj = task->acl;
80189+ read_lock(&gr_inode_lock);
80190+ do {
80191+ obj = lookup_acl_obj_label(ino, dev, subj);
80192+ if (obj != NULL) {
80193+ read_unlock(&gr_inode_lock);
80194+ return (obj->mode & GR_FIND) ? 1 : 0;
80195+ }
80196+ } while ((subj = subj->parent_subject));
80197+ read_unlock(&gr_inode_lock);
80198+
80199+ /* this is purely an optimization since we're looking for an object
80200+ for the directory we're doing a readdir on
80201+ if it's possible for any globbed object to match the entry we're
80202+ filling into the directory, then the object we find here will be
80203+ an anchor point with attached globbed objects
80204+ */
80205+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
80206+ if (obj->globbed == NULL)
80207+ return (obj->mode & GR_FIND) ? 1 : 0;
80208+
80209+ is_not_root = ((obj->filename[0] == '/') &&
80210+ (obj->filename[1] == '\0')) ? 0 : 1;
80211+ bufsize = PAGE_SIZE - namelen - is_not_root;
80212+
80213+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
80214+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
80215+ return 1;
80216+
80217+ preempt_disable();
80218+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
80219+ bufsize);
80220+
80221+ bufsize = strlen(path);
80222+
80223+ /* if base is "/", don't append an additional slash */
80224+ if (is_not_root)
80225+ *(path + bufsize) = '/';
80226+ memcpy(path + bufsize + is_not_root, name, namelen);
80227+ *(path + bufsize + namelen + is_not_root) = '\0';
80228+
80229+ tmp = obj->globbed;
80230+ while (tmp) {
80231+ if (!glob_match(tmp->filename, path)) {
80232+ preempt_enable();
80233+ return (tmp->mode & GR_FIND) ? 1 : 0;
80234+ }
80235+ tmp = tmp->next;
80236+ }
80237+ preempt_enable();
80238+ return (obj->mode & GR_FIND) ? 1 : 0;
80239+}
80240+
80241+void gr_put_exec_file(struct task_struct *task)
80242+{
80243+ struct file *filp;
80244+
80245+ write_lock(&grsec_exec_file_lock);
80246+ filp = task->exec_file;
80247+ task->exec_file = NULL;
80248+ write_unlock(&grsec_exec_file_lock);
80249+
80250+ if (filp)
80251+ fput(filp);
80252+
80253+ return;
80254+}
80255+
80256+
80257+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
80258+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
80259+#endif
80260+#ifdef CONFIG_SECURITY
80261+EXPORT_SYMBOL_GPL(gr_check_user_change);
80262+EXPORT_SYMBOL_GPL(gr_check_group_change);
80263+#endif
80264+
80265diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
80266new file mode 100644
80267index 0000000..9adc75c
80268--- /dev/null
80269+++ b/grsecurity/gracl_alloc.c
80270@@ -0,0 +1,105 @@
80271+#include <linux/kernel.h>
80272+#include <linux/mm.h>
80273+#include <linux/slab.h>
80274+#include <linux/vmalloc.h>
80275+#include <linux/gracl.h>
80276+#include <linux/grsecurity.h>
80277+
80278+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
80279+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
80280+
80281+static int
80282+alloc_pop(void)
80283+{
80284+ if (current_alloc_state->alloc_stack_next == 1)
80285+ return 0;
80286+
80287+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
80288+
80289+ current_alloc_state->alloc_stack_next--;
80290+
80291+ return 1;
80292+}
80293+
80294+static int
80295+alloc_push(void *buf)
80296+{
80297+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
80298+ return 1;
80299+
80300+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
80301+
80302+ current_alloc_state->alloc_stack_next++;
80303+
80304+ return 0;
80305+}
80306+
80307+void *
80308+acl_alloc(unsigned long len)
80309+{
80310+ void *ret = NULL;
80311+
80312+ if (!len || len > PAGE_SIZE)
80313+ goto out;
80314+
80315+ ret = kmalloc(len, GFP_KERNEL);
80316+
80317+ if (ret) {
80318+ if (alloc_push(ret)) {
80319+ kfree(ret);
80320+ ret = NULL;
80321+ }
80322+ }
80323+
80324+out:
80325+ return ret;
80326+}
80327+
80328+void *
80329+acl_alloc_num(unsigned long num, unsigned long len)
80330+{
80331+ if (!len || (num > (PAGE_SIZE / len)))
80332+ return NULL;
80333+
80334+ return acl_alloc(num * len);
80335+}
80336+
80337+void
80338+acl_free_all(void)
80339+{
80340+ if (!current_alloc_state->alloc_stack)
80341+ return;
80342+
80343+ while (alloc_pop()) ;
80344+
80345+ if (current_alloc_state->alloc_stack) {
80346+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
80347+ kfree(current_alloc_state->alloc_stack);
80348+ else
80349+ vfree(current_alloc_state->alloc_stack);
80350+ }
80351+
80352+ current_alloc_state->alloc_stack = NULL;
80353+ current_alloc_state->alloc_stack_size = 1;
80354+ current_alloc_state->alloc_stack_next = 1;
80355+
80356+ return;
80357+}
80358+
80359+int
80360+acl_alloc_stack_init(unsigned long size)
80361+{
80362+ if ((size * sizeof (void *)) <= PAGE_SIZE)
80363+ current_alloc_state->alloc_stack =
80364+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
80365+ else
80366+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
80367+
80368+ current_alloc_state->alloc_stack_size = size;
80369+ current_alloc_state->alloc_stack_next = 1;
80370+
80371+ if (!current_alloc_state->alloc_stack)
80372+ return 0;
80373+ else
80374+ return 1;
80375+}
80376diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
80377new file mode 100644
80378index 0000000..1a94c11
80379--- /dev/null
80380+++ b/grsecurity/gracl_cap.c
80381@@ -0,0 +1,127 @@
80382+#include <linux/kernel.h>
80383+#include <linux/module.h>
80384+#include <linux/sched.h>
80385+#include <linux/gracl.h>
80386+#include <linux/grsecurity.h>
80387+#include <linux/grinternal.h>
80388+
80389+extern const char *captab_log[];
80390+extern int captab_log_entries;
80391+
80392+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
80393+{
80394+ struct acl_subject_label *curracl;
80395+
80396+ if (!gr_acl_is_enabled())
80397+ return 1;
80398+
80399+ curracl = task->acl;
80400+
80401+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
80402+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
80403+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
80404+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
80405+ gr_to_filename(task->exec_file->f_path.dentry,
80406+ task->exec_file->f_path.mnt) : curracl->filename,
80407+ curracl->filename, 0UL,
80408+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
80409+ return 1;
80410+ }
80411+
80412+ return 0;
80413+}
80414+
80415+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
80416+{
80417+ struct acl_subject_label *curracl;
80418+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80419+ kernel_cap_t cap_audit = __cap_empty_set;
80420+
80421+ if (!gr_acl_is_enabled())
80422+ return 1;
80423+
80424+ curracl = task->acl;
80425+
80426+ cap_drop = curracl->cap_lower;
80427+ cap_mask = curracl->cap_mask;
80428+ cap_audit = curracl->cap_invert_audit;
80429+
80430+ while ((curracl = curracl->parent_subject)) {
80431+ /* if the cap isn't specified in the current computed mask but is specified in the
80432+ current level subject, and is lowered in the current level subject, then add
80433+ it to the set of dropped capabilities
80434+ otherwise, add the current level subject's mask to the current computed mask
80435+ */
80436+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80437+ cap_raise(cap_mask, cap);
80438+ if (cap_raised(curracl->cap_lower, cap))
80439+ cap_raise(cap_drop, cap);
80440+ if (cap_raised(curracl->cap_invert_audit, cap))
80441+ cap_raise(cap_audit, cap);
80442+ }
80443+ }
80444+
80445+ if (!cap_raised(cap_drop, cap)) {
80446+ if (cap_raised(cap_audit, cap))
80447+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
80448+ return 1;
80449+ }
80450+
80451+ /* only learn the capability use if the process has the capability in the
80452+ general case, the two uses in sys.c of gr_learn_cap are an exception
80453+ to this rule to ensure any role transition involves what the full-learned
80454+ policy believes in a privileged process
80455+ */
80456+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
80457+ return 1;
80458+
80459+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
80460+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
80461+
80462+ return 0;
80463+}
80464+
80465+int
80466+gr_acl_is_capable(const int cap)
80467+{
80468+ return gr_task_acl_is_capable(current, current_cred(), cap);
80469+}
80470+
80471+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
80472+{
80473+ struct acl_subject_label *curracl;
80474+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80475+
80476+ if (!gr_acl_is_enabled())
80477+ return 1;
80478+
80479+ curracl = task->acl;
80480+
80481+ cap_drop = curracl->cap_lower;
80482+ cap_mask = curracl->cap_mask;
80483+
80484+ while ((curracl = curracl->parent_subject)) {
80485+ /* if the cap isn't specified in the current computed mask but is specified in the
80486+ current level subject, and is lowered in the current level subject, then add
80487+ it to the set of dropped capabilities
80488+ otherwise, add the current level subject's mask to the current computed mask
80489+ */
80490+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80491+ cap_raise(cap_mask, cap);
80492+ if (cap_raised(curracl->cap_lower, cap))
80493+ cap_raise(cap_drop, cap);
80494+ }
80495+ }
80496+
80497+ if (!cap_raised(cap_drop, cap))
80498+ return 1;
80499+
80500+ return 0;
80501+}
80502+
80503+int
80504+gr_acl_is_capable_nolog(const int cap)
80505+{
80506+ return gr_task_acl_is_capable_nolog(current, cap);
80507+}
80508+
80509diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
80510new file mode 100644
80511index 0000000..a43dd06
80512--- /dev/null
80513+++ b/grsecurity/gracl_compat.c
80514@@ -0,0 +1,269 @@
80515+#include <linux/kernel.h>
80516+#include <linux/gracl.h>
80517+#include <linux/compat.h>
80518+#include <linux/gracl_compat.h>
80519+
80520+#include <asm/uaccess.h>
80521+
80522+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
80523+{
80524+ struct gr_arg_wrapper_compat uwrapcompat;
80525+
80526+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
80527+ return -EFAULT;
80528+
80529+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
80530+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
80531+ return -EINVAL;
80532+
80533+ uwrap->arg = compat_ptr(uwrapcompat.arg);
80534+ uwrap->version = uwrapcompat.version;
80535+ uwrap->size = sizeof(struct gr_arg);
80536+
80537+ return 0;
80538+}
80539+
80540+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
80541+{
80542+ struct gr_arg_compat argcompat;
80543+
80544+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
80545+ return -EFAULT;
80546+
80547+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
80548+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
80549+ arg->role_db.num_roles = argcompat.role_db.num_roles;
80550+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
80551+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
80552+ arg->role_db.num_objects = argcompat.role_db.num_objects;
80553+
80554+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
80555+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
80556+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
80557+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
80558+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
80559+ arg->segv_device = argcompat.segv_device;
80560+ arg->segv_inode = argcompat.segv_inode;
80561+ arg->segv_uid = argcompat.segv_uid;
80562+ arg->num_sprole_pws = argcompat.num_sprole_pws;
80563+ arg->mode = argcompat.mode;
80564+
80565+ return 0;
80566+}
80567+
80568+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
80569+{
80570+ struct acl_object_label_compat objcompat;
80571+
80572+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
80573+ return -EFAULT;
80574+
80575+ obj->filename = compat_ptr(objcompat.filename);
80576+ obj->inode = objcompat.inode;
80577+ obj->device = objcompat.device;
80578+ obj->mode = objcompat.mode;
80579+
80580+ obj->nested = compat_ptr(objcompat.nested);
80581+ obj->globbed = compat_ptr(objcompat.globbed);
80582+
80583+ obj->prev = compat_ptr(objcompat.prev);
80584+ obj->next = compat_ptr(objcompat.next);
80585+
80586+ return 0;
80587+}
80588+
80589+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
80590+{
80591+ unsigned int i;
80592+ struct acl_subject_label_compat subjcompat;
80593+
80594+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
80595+ return -EFAULT;
80596+
80597+ subj->filename = compat_ptr(subjcompat.filename);
80598+ subj->inode = subjcompat.inode;
80599+ subj->device = subjcompat.device;
80600+ subj->mode = subjcompat.mode;
80601+ subj->cap_mask = subjcompat.cap_mask;
80602+ subj->cap_lower = subjcompat.cap_lower;
80603+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
80604+
80605+ for (i = 0; i < GR_NLIMITS; i++) {
80606+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
80607+ subj->res[i].rlim_cur = RLIM_INFINITY;
80608+ else
80609+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
80610+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
80611+ subj->res[i].rlim_max = RLIM_INFINITY;
80612+ else
80613+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
80614+ }
80615+ subj->resmask = subjcompat.resmask;
80616+
80617+ subj->user_trans_type = subjcompat.user_trans_type;
80618+ subj->group_trans_type = subjcompat.group_trans_type;
80619+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
80620+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
80621+ subj->user_trans_num = subjcompat.user_trans_num;
80622+ subj->group_trans_num = subjcompat.group_trans_num;
80623+
80624+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
80625+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
80626+ subj->ip_type = subjcompat.ip_type;
80627+ subj->ips = compat_ptr(subjcompat.ips);
80628+ subj->ip_num = subjcompat.ip_num;
80629+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
80630+
80631+ subj->crashes = subjcompat.crashes;
80632+ subj->expires = subjcompat.expires;
80633+
80634+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
80635+ subj->hash = compat_ptr(subjcompat.hash);
80636+ subj->prev = compat_ptr(subjcompat.prev);
80637+ subj->next = compat_ptr(subjcompat.next);
80638+
80639+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
80640+ subj->obj_hash_size = subjcompat.obj_hash_size;
80641+ subj->pax_flags = subjcompat.pax_flags;
80642+
80643+ return 0;
80644+}
80645+
80646+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
80647+{
80648+ struct acl_role_label_compat rolecompat;
80649+
80650+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
80651+ return -EFAULT;
80652+
80653+ role->rolename = compat_ptr(rolecompat.rolename);
80654+ role->uidgid = rolecompat.uidgid;
80655+ role->roletype = rolecompat.roletype;
80656+
80657+ role->auth_attempts = rolecompat.auth_attempts;
80658+ role->expires = rolecompat.expires;
80659+
80660+ role->root_label = compat_ptr(rolecompat.root_label);
80661+ role->hash = compat_ptr(rolecompat.hash);
80662+
80663+ role->prev = compat_ptr(rolecompat.prev);
80664+ role->next = compat_ptr(rolecompat.next);
80665+
80666+ role->transitions = compat_ptr(rolecompat.transitions);
80667+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
80668+ role->domain_children = compat_ptr(rolecompat.domain_children);
80669+ role->domain_child_num = rolecompat.domain_child_num;
80670+
80671+ role->umask = rolecompat.umask;
80672+
80673+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
80674+ role->subj_hash_size = rolecompat.subj_hash_size;
80675+
80676+ return 0;
80677+}
80678+
80679+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
80680+{
80681+ struct role_allowed_ip_compat roleip_compat;
80682+
80683+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
80684+ return -EFAULT;
80685+
80686+ roleip->addr = roleip_compat.addr;
80687+ roleip->netmask = roleip_compat.netmask;
80688+
80689+ roleip->prev = compat_ptr(roleip_compat.prev);
80690+ roleip->next = compat_ptr(roleip_compat.next);
80691+
80692+ return 0;
80693+}
80694+
80695+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
80696+{
80697+ struct role_transition_compat trans_compat;
80698+
80699+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
80700+ return -EFAULT;
80701+
80702+ trans->rolename = compat_ptr(trans_compat.rolename);
80703+
80704+ trans->prev = compat_ptr(trans_compat.prev);
80705+ trans->next = compat_ptr(trans_compat.next);
80706+
80707+ return 0;
80708+
80709+}
80710+
80711+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
80712+{
80713+ struct gr_hash_struct_compat hash_compat;
80714+
80715+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
80716+ return -EFAULT;
80717+
80718+ hash->table = compat_ptr(hash_compat.table);
80719+ hash->nametable = compat_ptr(hash_compat.nametable);
80720+ hash->first = compat_ptr(hash_compat.first);
80721+
80722+ hash->table_size = hash_compat.table_size;
80723+ hash->used_size = hash_compat.used_size;
80724+
80725+ hash->type = hash_compat.type;
80726+
80727+ return 0;
80728+}
80729+
80730+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
80731+{
80732+ compat_uptr_t ptrcompat;
80733+
80734+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
80735+ return -EFAULT;
80736+
80737+ *(void **)ptr = compat_ptr(ptrcompat);
80738+
80739+ return 0;
80740+}
80741+
80742+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
80743+{
80744+ struct acl_ip_label_compat ip_compat;
80745+
80746+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
80747+ return -EFAULT;
80748+
80749+ ip->iface = compat_ptr(ip_compat.iface);
80750+ ip->addr = ip_compat.addr;
80751+ ip->netmask = ip_compat.netmask;
80752+ ip->low = ip_compat.low;
80753+ ip->high = ip_compat.high;
80754+ ip->mode = ip_compat.mode;
80755+ ip->type = ip_compat.type;
80756+
80757+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
80758+
80759+ ip->prev = compat_ptr(ip_compat.prev);
80760+ ip->next = compat_ptr(ip_compat.next);
80761+
80762+ return 0;
80763+}
80764+
80765+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
80766+{
80767+ struct sprole_pw_compat pw_compat;
80768+
80769+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
80770+ return -EFAULT;
80771+
80772+ pw->rolename = compat_ptr(pw_compat.rolename);
80773+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
80774+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
80775+
80776+ return 0;
80777+}
80778+
80779+size_t get_gr_arg_wrapper_size_compat(void)
80780+{
80781+ return sizeof(struct gr_arg_wrapper_compat);
80782+}
80783+
80784diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
80785new file mode 100644
80786index 0000000..8ee8e4f
80787--- /dev/null
80788+++ b/grsecurity/gracl_fs.c
80789@@ -0,0 +1,447 @@
80790+#include <linux/kernel.h>
80791+#include <linux/sched.h>
80792+#include <linux/types.h>
80793+#include <linux/fs.h>
80794+#include <linux/file.h>
80795+#include <linux/stat.h>
80796+#include <linux/grsecurity.h>
80797+#include <linux/grinternal.h>
80798+#include <linux/gracl.h>
80799+
80800+umode_t
80801+gr_acl_umask(void)
80802+{
80803+ if (unlikely(!gr_acl_is_enabled()))
80804+ return 0;
80805+
80806+ return current->role->umask;
80807+}
80808+
80809+__u32
80810+gr_acl_handle_hidden_file(const struct dentry * dentry,
80811+ const struct vfsmount * mnt)
80812+{
80813+ __u32 mode;
80814+
80815+ if (unlikely(d_is_negative(dentry)))
80816+ return GR_FIND;
80817+
80818+ mode =
80819+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
80820+
80821+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
80822+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80823+ return mode;
80824+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
80825+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80826+ return 0;
80827+ } else if (unlikely(!(mode & GR_FIND)))
80828+ return 0;
80829+
80830+ return GR_FIND;
80831+}
80832+
80833+__u32
80834+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
80835+ int acc_mode)
80836+{
80837+ __u32 reqmode = GR_FIND;
80838+ __u32 mode;
80839+
80840+ if (unlikely(d_is_negative(dentry)))
80841+ return reqmode;
80842+
80843+ if (acc_mode & MAY_APPEND)
80844+ reqmode |= GR_APPEND;
80845+ else if (acc_mode & MAY_WRITE)
80846+ reqmode |= GR_WRITE;
80847+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
80848+ reqmode |= GR_READ;
80849+
80850+ mode =
80851+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
80852+ mnt);
80853+
80854+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80855+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
80856+ reqmode & GR_READ ? " reading" : "",
80857+ reqmode & GR_WRITE ? " writing" : reqmode &
80858+ GR_APPEND ? " appending" : "");
80859+ return reqmode;
80860+ } else
80861+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80862+ {
80863+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
80864+ reqmode & GR_READ ? " reading" : "",
80865+ reqmode & GR_WRITE ? " writing" : reqmode &
80866+ GR_APPEND ? " appending" : "");
80867+ return 0;
80868+ } else if (unlikely((mode & reqmode) != reqmode))
80869+ return 0;
80870+
80871+ return reqmode;
80872+}
80873+
80874+__u32
80875+gr_acl_handle_creat(const struct dentry * dentry,
80876+ const struct dentry * p_dentry,
80877+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
80878+ const int imode)
80879+{
80880+ __u32 reqmode = GR_WRITE | GR_CREATE;
80881+ __u32 mode;
80882+
80883+ if (acc_mode & MAY_APPEND)
80884+ reqmode |= GR_APPEND;
80885+ // if a directory was required or the directory already exists, then
80886+ // don't count this open as a read
80887+ if ((acc_mode & MAY_READ) &&
80888+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
80889+ reqmode |= GR_READ;
80890+ if ((open_flags & O_CREAT) &&
80891+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
80892+ reqmode |= GR_SETID;
80893+
80894+ mode =
80895+ gr_check_create(dentry, p_dentry, p_mnt,
80896+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
80897+
80898+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80899+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
80900+ reqmode & GR_READ ? " reading" : "",
80901+ reqmode & GR_WRITE ? " writing" : reqmode &
80902+ GR_APPEND ? " appending" : "");
80903+ return reqmode;
80904+ } else
80905+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80906+ {
80907+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
80908+ reqmode & GR_READ ? " reading" : "",
80909+ reqmode & GR_WRITE ? " writing" : reqmode &
80910+ GR_APPEND ? " appending" : "");
80911+ return 0;
80912+ } else if (unlikely((mode & reqmode) != reqmode))
80913+ return 0;
80914+
80915+ return reqmode;
80916+}
80917+
80918+__u32
80919+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
80920+ const int fmode)
80921+{
80922+ __u32 mode, reqmode = GR_FIND;
80923+
80924+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
80925+ reqmode |= GR_EXEC;
80926+ if (fmode & S_IWOTH)
80927+ reqmode |= GR_WRITE;
80928+ if (fmode & S_IROTH)
80929+ reqmode |= GR_READ;
80930+
80931+ mode =
80932+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
80933+ mnt);
80934+
80935+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80936+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
80937+ reqmode & GR_READ ? " reading" : "",
80938+ reqmode & GR_WRITE ? " writing" : "",
80939+ reqmode & GR_EXEC ? " executing" : "");
80940+ return reqmode;
80941+ } else
80942+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80943+ {
80944+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
80945+ reqmode & GR_READ ? " reading" : "",
80946+ reqmode & GR_WRITE ? " writing" : "",
80947+ reqmode & GR_EXEC ? " executing" : "");
80948+ return 0;
80949+ } else if (unlikely((mode & reqmode) != reqmode))
80950+ return 0;
80951+
80952+ return reqmode;
80953+}
80954+
80955+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
80956+{
80957+ __u32 mode;
80958+
80959+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
80960+
80961+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
80962+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
80963+ return mode;
80964+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
80965+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
80966+ return 0;
80967+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
80968+ return 0;
80969+
80970+ return (reqmode);
80971+}
80972+
80973+__u32
80974+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
80975+{
80976+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
80977+}
80978+
80979+__u32
80980+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
80981+{
80982+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
80983+}
80984+
80985+__u32
80986+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
80987+{
80988+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
80989+}
80990+
80991+__u32
80992+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
80993+{
80994+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
80995+}
80996+
80997+__u32
80998+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
80999+ umode_t *modeptr)
81000+{
81001+ umode_t mode;
81002+
81003+ *modeptr &= ~gr_acl_umask();
81004+ mode = *modeptr;
81005+
81006+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
81007+ return 1;
81008+
81009+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
81010+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
81011+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
81012+ GR_CHMOD_ACL_MSG);
81013+ } else {
81014+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
81015+ }
81016+}
81017+
81018+__u32
81019+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
81020+{
81021+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
81022+}
81023+
81024+__u32
81025+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
81026+{
81027+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
81028+}
81029+
81030+__u32
81031+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
81032+{
81033+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
81034+}
81035+
81036+__u32
81037+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
81038+{
81039+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
81040+}
81041+
81042+__u32
81043+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
81044+{
81045+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
81046+ GR_UNIXCONNECT_ACL_MSG);
81047+}
81048+
81049+/* hardlinks require at minimum create and link permission,
81050+ any additional privilege required is based on the
81051+ privilege of the file being linked to
81052+*/
81053+__u32
81054+gr_acl_handle_link(const struct dentry * new_dentry,
81055+ const struct dentry * parent_dentry,
81056+ const struct vfsmount * parent_mnt,
81057+ const struct dentry * old_dentry,
81058+ const struct vfsmount * old_mnt, const struct filename *to)
81059+{
81060+ __u32 mode;
81061+ __u32 needmode = GR_CREATE | GR_LINK;
81062+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
81063+
81064+ mode =
81065+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
81066+ old_mnt);
81067+
81068+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
81069+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81070+ return mode;
81071+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81072+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81073+ return 0;
81074+ } else if (unlikely((mode & needmode) != needmode))
81075+ return 0;
81076+
81077+ return 1;
81078+}
81079+
81080+__u32
81081+gr_acl_handle_symlink(const struct dentry * new_dentry,
81082+ const struct dentry * parent_dentry,
81083+ const struct vfsmount * parent_mnt, const struct filename *from)
81084+{
81085+ __u32 needmode = GR_WRITE | GR_CREATE;
81086+ __u32 mode;
81087+
81088+ mode =
81089+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
81090+ GR_CREATE | GR_AUDIT_CREATE |
81091+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
81092+
81093+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
81094+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81095+ return mode;
81096+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81097+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81098+ return 0;
81099+ } else if (unlikely((mode & needmode) != needmode))
81100+ return 0;
81101+
81102+ return (GR_WRITE | GR_CREATE);
81103+}
81104+
81105+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)
81106+{
81107+ __u32 mode;
81108+
81109+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81110+
81111+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81112+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
81113+ return mode;
81114+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81115+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
81116+ return 0;
81117+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81118+ return 0;
81119+
81120+ return (reqmode);
81121+}
81122+
81123+__u32
81124+gr_acl_handle_mknod(const struct dentry * new_dentry,
81125+ const struct dentry * parent_dentry,
81126+ const struct vfsmount * parent_mnt,
81127+ const int mode)
81128+{
81129+ __u32 reqmode = GR_WRITE | GR_CREATE;
81130+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81131+ reqmode |= GR_SETID;
81132+
81133+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81134+ reqmode, GR_MKNOD_ACL_MSG);
81135+}
81136+
81137+__u32
81138+gr_acl_handle_mkdir(const struct dentry *new_dentry,
81139+ const struct dentry *parent_dentry,
81140+ const struct vfsmount *parent_mnt)
81141+{
81142+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81143+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
81144+}
81145+
81146+#define RENAME_CHECK_SUCCESS(old, new) \
81147+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
81148+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
81149+
81150+int
81151+gr_acl_handle_rename(struct dentry *new_dentry,
81152+ struct dentry *parent_dentry,
81153+ const struct vfsmount *parent_mnt,
81154+ struct dentry *old_dentry,
81155+ struct inode *old_parent_inode,
81156+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
81157+{
81158+ __u32 comp1, comp2;
81159+ int error = 0;
81160+
81161+ if (unlikely(!gr_acl_is_enabled()))
81162+ return 0;
81163+
81164+ if (flags & RENAME_EXCHANGE) {
81165+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81166+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81167+ GR_SUPPRESS, parent_mnt);
81168+ comp2 =
81169+ gr_search_file(old_dentry,
81170+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81171+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81172+ } else if (d_is_negative(new_dentry)) {
81173+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
81174+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
81175+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
81176+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
81177+ GR_DELETE | GR_AUDIT_DELETE |
81178+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81179+ GR_SUPPRESS, old_mnt);
81180+ } else {
81181+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81182+ GR_CREATE | GR_DELETE |
81183+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
81184+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81185+ GR_SUPPRESS, parent_mnt);
81186+ comp2 =
81187+ gr_search_file(old_dentry,
81188+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81189+ GR_DELETE | GR_AUDIT_DELETE |
81190+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81191+ }
81192+
81193+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
81194+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
81195+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81196+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
81197+ && !(comp2 & GR_SUPPRESS)) {
81198+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81199+ error = -EACCES;
81200+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
81201+ error = -EACCES;
81202+
81203+ return error;
81204+}
81205+
81206+void
81207+gr_acl_handle_exit(void)
81208+{
81209+ u16 id;
81210+ char *rolename;
81211+
81212+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
81213+ !(current->role->roletype & GR_ROLE_PERSIST))) {
81214+ id = current->acl_role_id;
81215+ rolename = current->role->rolename;
81216+ gr_set_acls(1);
81217+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
81218+ }
81219+
81220+ gr_put_exec_file(current);
81221+ return;
81222+}
81223+
81224+int
81225+gr_acl_handle_procpidmem(const struct task_struct *task)
81226+{
81227+ if (unlikely(!gr_acl_is_enabled()))
81228+ return 0;
81229+
81230+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
81231+ !(current->acl->mode & GR_POVERRIDE) &&
81232+ !(current->role->roletype & GR_ROLE_GOD))
81233+ return -EACCES;
81234+
81235+ return 0;
81236+}
81237diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
81238new file mode 100644
81239index 0000000..f056b81
81240--- /dev/null
81241+++ b/grsecurity/gracl_ip.c
81242@@ -0,0 +1,386 @@
81243+#include <linux/kernel.h>
81244+#include <asm/uaccess.h>
81245+#include <asm/errno.h>
81246+#include <net/sock.h>
81247+#include <linux/file.h>
81248+#include <linux/fs.h>
81249+#include <linux/net.h>
81250+#include <linux/in.h>
81251+#include <linux/skbuff.h>
81252+#include <linux/ip.h>
81253+#include <linux/udp.h>
81254+#include <linux/types.h>
81255+#include <linux/sched.h>
81256+#include <linux/netdevice.h>
81257+#include <linux/inetdevice.h>
81258+#include <linux/gracl.h>
81259+#include <linux/grsecurity.h>
81260+#include <linux/grinternal.h>
81261+
81262+#define GR_BIND 0x01
81263+#define GR_CONNECT 0x02
81264+#define GR_INVERT 0x04
81265+#define GR_BINDOVERRIDE 0x08
81266+#define GR_CONNECTOVERRIDE 0x10
81267+#define GR_SOCK_FAMILY 0x20
81268+
81269+static const char * gr_protocols[IPPROTO_MAX] = {
81270+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
81271+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
81272+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
81273+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
81274+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
81275+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
81276+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
81277+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
81278+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
81279+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
81280+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
81281+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
81282+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
81283+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
81284+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
81285+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
81286+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
81287+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
81288+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
81289+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
81290+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
81291+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
81292+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
81293+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
81294+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
81295+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
81296+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
81297+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
81298+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
81299+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
81300+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
81301+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
81302+ };
81303+
81304+static const char * gr_socktypes[SOCK_MAX] = {
81305+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
81306+ "unknown:7", "unknown:8", "unknown:9", "packet"
81307+ };
81308+
81309+static const char * gr_sockfamilies[AF_MAX+1] = {
81310+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
81311+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
81312+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
81313+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
81314+ };
81315+
81316+const char *
81317+gr_proto_to_name(unsigned char proto)
81318+{
81319+ return gr_protocols[proto];
81320+}
81321+
81322+const char *
81323+gr_socktype_to_name(unsigned char type)
81324+{
81325+ return gr_socktypes[type];
81326+}
81327+
81328+const char *
81329+gr_sockfamily_to_name(unsigned char family)
81330+{
81331+ return gr_sockfamilies[family];
81332+}
81333+
81334+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
81335+
81336+int
81337+gr_search_socket(const int domain, const int type, const int protocol)
81338+{
81339+ struct acl_subject_label *curr;
81340+ const struct cred *cred = current_cred();
81341+
81342+ if (unlikely(!gr_acl_is_enabled()))
81343+ goto exit;
81344+
81345+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
81346+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
81347+ goto exit; // let the kernel handle it
81348+
81349+ curr = current->acl;
81350+
81351+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
81352+ /* the family is allowed, if this is PF_INET allow it only if
81353+ the extra sock type/protocol checks pass */
81354+ if (domain == PF_INET)
81355+ goto inet_check;
81356+ goto exit;
81357+ } else {
81358+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81359+ __u32 fakeip = 0;
81360+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81361+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81362+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81363+ gr_to_filename(current->exec_file->f_path.dentry,
81364+ current->exec_file->f_path.mnt) :
81365+ curr->filename, curr->filename,
81366+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
81367+ &current->signal->saved_ip);
81368+ goto exit;
81369+ }
81370+ goto exit_fail;
81371+ }
81372+
81373+inet_check:
81374+ /* the rest of this checking is for IPv4 only */
81375+ if (!curr->ips)
81376+ goto exit;
81377+
81378+ if ((curr->ip_type & (1U << type)) &&
81379+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
81380+ goto exit;
81381+
81382+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81383+ /* we don't place acls on raw sockets , and sometimes
81384+ dgram/ip sockets are opened for ioctl and not
81385+ bind/connect, so we'll fake a bind learn log */
81386+ if (type == SOCK_RAW || type == SOCK_PACKET) {
81387+ __u32 fakeip = 0;
81388+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81389+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81390+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81391+ gr_to_filename(current->exec_file->f_path.dentry,
81392+ current->exec_file->f_path.mnt) :
81393+ curr->filename, curr->filename,
81394+ &fakeip, 0, type,
81395+ protocol, GR_CONNECT, &current->signal->saved_ip);
81396+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
81397+ __u32 fakeip = 0;
81398+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81399+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81400+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81401+ gr_to_filename(current->exec_file->f_path.dentry,
81402+ current->exec_file->f_path.mnt) :
81403+ curr->filename, curr->filename,
81404+ &fakeip, 0, type,
81405+ protocol, GR_BIND, &current->signal->saved_ip);
81406+ }
81407+ /* we'll log when they use connect or bind */
81408+ goto exit;
81409+ }
81410+
81411+exit_fail:
81412+ if (domain == PF_INET)
81413+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
81414+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
81415+ else if (rcu_access_pointer(net_families[domain]) != NULL)
81416+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
81417+ gr_socktype_to_name(type), protocol);
81418+
81419+ return 0;
81420+exit:
81421+ return 1;
81422+}
81423+
81424+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)
81425+{
81426+ if ((ip->mode & mode) &&
81427+ (ip_port >= ip->low) &&
81428+ (ip_port <= ip->high) &&
81429+ ((ntohl(ip_addr) & our_netmask) ==
81430+ (ntohl(our_addr) & our_netmask))
81431+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
81432+ && (ip->type & (1U << type))) {
81433+ if (ip->mode & GR_INVERT)
81434+ return 2; // specifically denied
81435+ else
81436+ return 1; // allowed
81437+ }
81438+
81439+ return 0; // not specifically allowed, may continue parsing
81440+}
81441+
81442+static int
81443+gr_search_connectbind(const int full_mode, struct sock *sk,
81444+ struct sockaddr_in *addr, const int type)
81445+{
81446+ char iface[IFNAMSIZ] = {0};
81447+ struct acl_subject_label *curr;
81448+ struct acl_ip_label *ip;
81449+ struct inet_sock *isk;
81450+ struct net_device *dev;
81451+ struct in_device *idev;
81452+ unsigned long i;
81453+ int ret;
81454+ int mode = full_mode & (GR_BIND | GR_CONNECT);
81455+ __u32 ip_addr = 0;
81456+ __u32 our_addr;
81457+ __u32 our_netmask;
81458+ char *p;
81459+ __u16 ip_port = 0;
81460+ const struct cred *cred = current_cred();
81461+
81462+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
81463+ return 0;
81464+
81465+ curr = current->acl;
81466+ isk = inet_sk(sk);
81467+
81468+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
81469+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
81470+ addr->sin_addr.s_addr = curr->inaddr_any_override;
81471+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
81472+ struct sockaddr_in saddr;
81473+ int err;
81474+
81475+ saddr.sin_family = AF_INET;
81476+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
81477+ saddr.sin_port = isk->inet_sport;
81478+
81479+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81480+ if (err)
81481+ return err;
81482+
81483+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81484+ if (err)
81485+ return err;
81486+ }
81487+
81488+ if (!curr->ips)
81489+ return 0;
81490+
81491+ ip_addr = addr->sin_addr.s_addr;
81492+ ip_port = ntohs(addr->sin_port);
81493+
81494+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81495+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81496+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81497+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81498+ gr_to_filename(current->exec_file->f_path.dentry,
81499+ current->exec_file->f_path.mnt) :
81500+ curr->filename, curr->filename,
81501+ &ip_addr, ip_port, type,
81502+ sk->sk_protocol, mode, &current->signal->saved_ip);
81503+ return 0;
81504+ }
81505+
81506+ for (i = 0; i < curr->ip_num; i++) {
81507+ ip = *(curr->ips + i);
81508+ if (ip->iface != NULL) {
81509+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
81510+ p = strchr(iface, ':');
81511+ if (p != NULL)
81512+ *p = '\0';
81513+ dev = dev_get_by_name(sock_net(sk), iface);
81514+ if (dev == NULL)
81515+ continue;
81516+ idev = in_dev_get(dev);
81517+ if (idev == NULL) {
81518+ dev_put(dev);
81519+ continue;
81520+ }
81521+ rcu_read_lock();
81522+ for_ifa(idev) {
81523+ if (!strcmp(ip->iface, ifa->ifa_label)) {
81524+ our_addr = ifa->ifa_address;
81525+ our_netmask = 0xffffffff;
81526+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81527+ if (ret == 1) {
81528+ rcu_read_unlock();
81529+ in_dev_put(idev);
81530+ dev_put(dev);
81531+ return 0;
81532+ } else if (ret == 2) {
81533+ rcu_read_unlock();
81534+ in_dev_put(idev);
81535+ dev_put(dev);
81536+ goto denied;
81537+ }
81538+ }
81539+ } endfor_ifa(idev);
81540+ rcu_read_unlock();
81541+ in_dev_put(idev);
81542+ dev_put(dev);
81543+ } else {
81544+ our_addr = ip->addr;
81545+ our_netmask = ip->netmask;
81546+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81547+ if (ret == 1)
81548+ return 0;
81549+ else if (ret == 2)
81550+ goto denied;
81551+ }
81552+ }
81553+
81554+denied:
81555+ if (mode == GR_BIND)
81556+ 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));
81557+ else if (mode == GR_CONNECT)
81558+ 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));
81559+
81560+ return -EACCES;
81561+}
81562+
81563+int
81564+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
81565+{
81566+ /* always allow disconnection of dgram sockets with connect */
81567+ if (addr->sin_family == AF_UNSPEC)
81568+ return 0;
81569+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
81570+}
81571+
81572+int
81573+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
81574+{
81575+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
81576+}
81577+
81578+int gr_search_listen(struct socket *sock)
81579+{
81580+ struct sock *sk = sock->sk;
81581+ struct sockaddr_in addr;
81582+
81583+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81584+ addr.sin_port = inet_sk(sk)->inet_sport;
81585+
81586+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81587+}
81588+
81589+int gr_search_accept(struct socket *sock)
81590+{
81591+ struct sock *sk = sock->sk;
81592+ struct sockaddr_in addr;
81593+
81594+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81595+ addr.sin_port = inet_sk(sk)->inet_sport;
81596+
81597+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81598+}
81599+
81600+int
81601+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
81602+{
81603+ if (addr)
81604+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
81605+ else {
81606+ struct sockaddr_in sin;
81607+ const struct inet_sock *inet = inet_sk(sk);
81608+
81609+ sin.sin_addr.s_addr = inet->inet_daddr;
81610+ sin.sin_port = inet->inet_dport;
81611+
81612+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81613+ }
81614+}
81615+
81616+int
81617+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
81618+{
81619+ struct sockaddr_in sin;
81620+
81621+ if (unlikely(skb->len < sizeof (struct udphdr)))
81622+ return 0; // skip this packet
81623+
81624+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
81625+ sin.sin_port = udp_hdr(skb)->source;
81626+
81627+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81628+}
81629diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
81630new file mode 100644
81631index 0000000..25f54ef
81632--- /dev/null
81633+++ b/grsecurity/gracl_learn.c
81634@@ -0,0 +1,207 @@
81635+#include <linux/kernel.h>
81636+#include <linux/mm.h>
81637+#include <linux/sched.h>
81638+#include <linux/poll.h>
81639+#include <linux/string.h>
81640+#include <linux/file.h>
81641+#include <linux/types.h>
81642+#include <linux/vmalloc.h>
81643+#include <linux/grinternal.h>
81644+
81645+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
81646+ size_t count, loff_t *ppos);
81647+extern int gr_acl_is_enabled(void);
81648+
81649+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
81650+static int gr_learn_attached;
81651+
81652+/* use a 512k buffer */
81653+#define LEARN_BUFFER_SIZE (512 * 1024)
81654+
81655+static DEFINE_SPINLOCK(gr_learn_lock);
81656+static DEFINE_MUTEX(gr_learn_user_mutex);
81657+
81658+/* we need to maintain two buffers, so that the kernel context of grlearn
81659+ uses a semaphore around the userspace copying, and the other kernel contexts
81660+ use a spinlock when copying into the buffer, since they cannot sleep
81661+*/
81662+static char *learn_buffer;
81663+static char *learn_buffer_user;
81664+static int learn_buffer_len;
81665+static int learn_buffer_user_len;
81666+
81667+static ssize_t
81668+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
81669+{
81670+ DECLARE_WAITQUEUE(wait, current);
81671+ ssize_t retval = 0;
81672+
81673+ add_wait_queue(&learn_wait, &wait);
81674+ set_current_state(TASK_INTERRUPTIBLE);
81675+ do {
81676+ mutex_lock(&gr_learn_user_mutex);
81677+ spin_lock(&gr_learn_lock);
81678+ if (learn_buffer_len)
81679+ break;
81680+ spin_unlock(&gr_learn_lock);
81681+ mutex_unlock(&gr_learn_user_mutex);
81682+ if (file->f_flags & O_NONBLOCK) {
81683+ retval = -EAGAIN;
81684+ goto out;
81685+ }
81686+ if (signal_pending(current)) {
81687+ retval = -ERESTARTSYS;
81688+ goto out;
81689+ }
81690+
81691+ schedule();
81692+ } while (1);
81693+
81694+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
81695+ learn_buffer_user_len = learn_buffer_len;
81696+ retval = learn_buffer_len;
81697+ learn_buffer_len = 0;
81698+
81699+ spin_unlock(&gr_learn_lock);
81700+
81701+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
81702+ retval = -EFAULT;
81703+
81704+ mutex_unlock(&gr_learn_user_mutex);
81705+out:
81706+ set_current_state(TASK_RUNNING);
81707+ remove_wait_queue(&learn_wait, &wait);
81708+ return retval;
81709+}
81710+
81711+static unsigned int
81712+poll_learn(struct file * file, poll_table * wait)
81713+{
81714+ poll_wait(file, &learn_wait, wait);
81715+
81716+ if (learn_buffer_len)
81717+ return (POLLIN | POLLRDNORM);
81718+
81719+ return 0;
81720+}
81721+
81722+void
81723+gr_clear_learn_entries(void)
81724+{
81725+ char *tmp;
81726+
81727+ mutex_lock(&gr_learn_user_mutex);
81728+ spin_lock(&gr_learn_lock);
81729+ tmp = learn_buffer;
81730+ learn_buffer = NULL;
81731+ spin_unlock(&gr_learn_lock);
81732+ if (tmp)
81733+ vfree(tmp);
81734+ if (learn_buffer_user != NULL) {
81735+ vfree(learn_buffer_user);
81736+ learn_buffer_user = NULL;
81737+ }
81738+ learn_buffer_len = 0;
81739+ mutex_unlock(&gr_learn_user_mutex);
81740+
81741+ return;
81742+}
81743+
81744+void
81745+gr_add_learn_entry(const char *fmt, ...)
81746+{
81747+ va_list args;
81748+ unsigned int len;
81749+
81750+ if (!gr_learn_attached)
81751+ return;
81752+
81753+ spin_lock(&gr_learn_lock);
81754+
81755+ /* leave a gap at the end so we know when it's "full" but don't have to
81756+ compute the exact length of the string we're trying to append
81757+ */
81758+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
81759+ spin_unlock(&gr_learn_lock);
81760+ wake_up_interruptible(&learn_wait);
81761+ return;
81762+ }
81763+ if (learn_buffer == NULL) {
81764+ spin_unlock(&gr_learn_lock);
81765+ return;
81766+ }
81767+
81768+ va_start(args, fmt);
81769+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
81770+ va_end(args);
81771+
81772+ learn_buffer_len += len + 1;
81773+
81774+ spin_unlock(&gr_learn_lock);
81775+ wake_up_interruptible(&learn_wait);
81776+
81777+ return;
81778+}
81779+
81780+static int
81781+open_learn(struct inode *inode, struct file *file)
81782+{
81783+ if (file->f_mode & FMODE_READ && gr_learn_attached)
81784+ return -EBUSY;
81785+ if (file->f_mode & FMODE_READ) {
81786+ int retval = 0;
81787+ mutex_lock(&gr_learn_user_mutex);
81788+ if (learn_buffer == NULL)
81789+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
81790+ if (learn_buffer_user == NULL)
81791+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
81792+ if (learn_buffer == NULL) {
81793+ retval = -ENOMEM;
81794+ goto out_error;
81795+ }
81796+ if (learn_buffer_user == NULL) {
81797+ retval = -ENOMEM;
81798+ goto out_error;
81799+ }
81800+ learn_buffer_len = 0;
81801+ learn_buffer_user_len = 0;
81802+ gr_learn_attached = 1;
81803+out_error:
81804+ mutex_unlock(&gr_learn_user_mutex);
81805+ return retval;
81806+ }
81807+ return 0;
81808+}
81809+
81810+static int
81811+close_learn(struct inode *inode, struct file *file)
81812+{
81813+ if (file->f_mode & FMODE_READ) {
81814+ char *tmp = NULL;
81815+ mutex_lock(&gr_learn_user_mutex);
81816+ spin_lock(&gr_learn_lock);
81817+ tmp = learn_buffer;
81818+ learn_buffer = NULL;
81819+ spin_unlock(&gr_learn_lock);
81820+ if (tmp)
81821+ vfree(tmp);
81822+ if (learn_buffer_user != NULL) {
81823+ vfree(learn_buffer_user);
81824+ learn_buffer_user = NULL;
81825+ }
81826+ learn_buffer_len = 0;
81827+ learn_buffer_user_len = 0;
81828+ gr_learn_attached = 0;
81829+ mutex_unlock(&gr_learn_user_mutex);
81830+ }
81831+
81832+ return 0;
81833+}
81834+
81835+const struct file_operations grsec_fops = {
81836+ .read = read_learn,
81837+ .write = write_grsec_handler,
81838+ .open = open_learn,
81839+ .release = close_learn,
81840+ .poll = poll_learn,
81841+};
81842diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
81843new file mode 100644
81844index 0000000..fd26052
81845--- /dev/null
81846+++ b/grsecurity/gracl_policy.c
81847@@ -0,0 +1,1781 @@
81848+#include <linux/kernel.h>
81849+#include <linux/module.h>
81850+#include <linux/sched.h>
81851+#include <linux/mm.h>
81852+#include <linux/file.h>
81853+#include <linux/fs.h>
81854+#include <linux/namei.h>
81855+#include <linux/mount.h>
81856+#include <linux/tty.h>
81857+#include <linux/proc_fs.h>
81858+#include <linux/lglock.h>
81859+#include <linux/slab.h>
81860+#include <linux/vmalloc.h>
81861+#include <linux/types.h>
81862+#include <linux/sysctl.h>
81863+#include <linux/netdevice.h>
81864+#include <linux/ptrace.h>
81865+#include <linux/gracl.h>
81866+#include <linux/gralloc.h>
81867+#include <linux/security.h>
81868+#include <linux/grinternal.h>
81869+#include <linux/pid_namespace.h>
81870+#include <linux/stop_machine.h>
81871+#include <linux/fdtable.h>
81872+#include <linux/percpu.h>
81873+#include <linux/lglock.h>
81874+#include <linux/hugetlb.h>
81875+#include <linux/posix-timers.h>
81876+#include "../fs/mount.h"
81877+
81878+#include <asm/uaccess.h>
81879+#include <asm/errno.h>
81880+#include <asm/mman.h>
81881+
81882+extern struct gr_policy_state *polstate;
81883+
81884+#define FOR_EACH_ROLE_START(role) \
81885+ role = polstate->role_list; \
81886+ while (role) {
81887+
81888+#define FOR_EACH_ROLE_END(role) \
81889+ role = role->prev; \
81890+ }
81891+
81892+struct path gr_real_root;
81893+
81894+extern struct gr_alloc_state *current_alloc_state;
81895+
81896+u16 acl_sp_role_value;
81897+
81898+static DEFINE_MUTEX(gr_dev_mutex);
81899+
81900+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
81901+extern void gr_clear_learn_entries(void);
81902+
81903+struct gr_arg *gr_usermode __read_only;
81904+unsigned char *gr_system_salt __read_only;
81905+unsigned char *gr_system_sum __read_only;
81906+
81907+static unsigned int gr_auth_attempts = 0;
81908+static unsigned long gr_auth_expires = 0UL;
81909+
81910+struct acl_object_label *fakefs_obj_rw;
81911+struct acl_object_label *fakefs_obj_rwx;
81912+
81913+extern int gr_init_uidset(void);
81914+extern void gr_free_uidset(void);
81915+extern void gr_remove_uid(uid_t uid);
81916+extern int gr_find_uid(uid_t uid);
81917+
81918+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);
81919+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
81920+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
81921+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
81922+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);
81923+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
81924+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
81925+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
81926+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
81927+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
81928+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
81929+extern void assign_special_role(const char *rolename);
81930+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
81931+extern int gr_rbac_disable(void *unused);
81932+extern void gr_enable_rbac_system(void);
81933+
81934+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
81935+{
81936+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
81937+ return -EFAULT;
81938+
81939+ return 0;
81940+}
81941+
81942+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
81943+{
81944+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
81945+ return -EFAULT;
81946+
81947+ return 0;
81948+}
81949+
81950+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
81951+{
81952+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
81953+ return -EFAULT;
81954+
81955+ return 0;
81956+}
81957+
81958+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
81959+{
81960+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
81961+ return -EFAULT;
81962+
81963+ return 0;
81964+}
81965+
81966+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
81967+{
81968+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
81969+ return -EFAULT;
81970+
81971+ return 0;
81972+}
81973+
81974+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
81975+{
81976+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
81977+ return -EFAULT;
81978+
81979+ return 0;
81980+}
81981+
81982+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
81983+{
81984+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
81985+ return -EFAULT;
81986+
81987+ return 0;
81988+}
81989+
81990+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
81991+{
81992+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
81993+ return -EFAULT;
81994+
81995+ return 0;
81996+}
81997+
81998+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
81999+{
82000+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
82001+ return -EFAULT;
82002+
82003+ return 0;
82004+}
82005+
82006+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
82007+{
82008+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
82009+ return -EFAULT;
82010+
82011+ if ((uwrap->version != GRSECURITY_VERSION) ||
82012+ (uwrap->size != sizeof(struct gr_arg)))
82013+ return -EINVAL;
82014+
82015+ return 0;
82016+}
82017+
82018+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
82019+{
82020+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
82021+ return -EFAULT;
82022+
82023+ return 0;
82024+}
82025+
82026+static size_t get_gr_arg_wrapper_size_normal(void)
82027+{
82028+ return sizeof(struct gr_arg_wrapper);
82029+}
82030+
82031+#ifdef CONFIG_COMPAT
82032+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
82033+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
82034+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
82035+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
82036+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
82037+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
82038+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
82039+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
82040+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
82041+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
82042+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
82043+extern size_t get_gr_arg_wrapper_size_compat(void);
82044+
82045+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
82046+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
82047+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
82048+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
82049+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
82050+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
82051+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
82052+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
82053+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
82054+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
82055+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
82056+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
82057+
82058+#else
82059+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
82060+#define copy_gr_arg copy_gr_arg_normal
82061+#define copy_gr_hash_struct copy_gr_hash_struct_normal
82062+#define copy_acl_object_label copy_acl_object_label_normal
82063+#define copy_acl_subject_label copy_acl_subject_label_normal
82064+#define copy_acl_role_label copy_acl_role_label_normal
82065+#define copy_acl_ip_label copy_acl_ip_label_normal
82066+#define copy_pointer_from_array copy_pointer_from_array_normal
82067+#define copy_sprole_pw copy_sprole_pw_normal
82068+#define copy_role_transition copy_role_transition_normal
82069+#define copy_role_allowed_ip copy_role_allowed_ip_normal
82070+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
82071+#endif
82072+
82073+static struct acl_subject_label *
82074+lookup_subject_map(const struct acl_subject_label *userp)
82075+{
82076+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
82077+ struct subject_map *match;
82078+
82079+ match = polstate->subj_map_set.s_hash[index];
82080+
82081+ while (match && match->user != userp)
82082+ match = match->next;
82083+
82084+ if (match != NULL)
82085+ return match->kernel;
82086+ else
82087+ return NULL;
82088+}
82089+
82090+static void
82091+insert_subj_map_entry(struct subject_map *subjmap)
82092+{
82093+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
82094+ struct subject_map **curr;
82095+
82096+ subjmap->prev = NULL;
82097+
82098+ curr = &polstate->subj_map_set.s_hash[index];
82099+ if (*curr != NULL)
82100+ (*curr)->prev = subjmap;
82101+
82102+ subjmap->next = *curr;
82103+ *curr = subjmap;
82104+
82105+ return;
82106+}
82107+
82108+static void
82109+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
82110+{
82111+ unsigned int index =
82112+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
82113+ struct acl_role_label **curr;
82114+ struct acl_role_label *tmp, *tmp2;
82115+
82116+ curr = &polstate->acl_role_set.r_hash[index];
82117+
82118+ /* simple case, slot is empty, just set it to our role */
82119+ if (*curr == NULL) {
82120+ *curr = role;
82121+ } else {
82122+ /* example:
82123+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
82124+ 2 -> 3
82125+ */
82126+ /* first check to see if we can already be reached via this slot */
82127+ tmp = *curr;
82128+ while (tmp && tmp != role)
82129+ tmp = tmp->next;
82130+ if (tmp == role) {
82131+ /* we don't need to add ourselves to this slot's chain */
82132+ return;
82133+ }
82134+ /* we need to add ourselves to this chain, two cases */
82135+ if (role->next == NULL) {
82136+ /* simple case, append the current chain to our role */
82137+ role->next = *curr;
82138+ *curr = role;
82139+ } else {
82140+ /* 1 -> 2 -> 3 -> 4
82141+ 2 -> 3 -> 4
82142+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
82143+ */
82144+ /* trickier case: walk our role's chain until we find
82145+ the role for the start of the current slot's chain */
82146+ tmp = role;
82147+ tmp2 = *curr;
82148+ while (tmp->next && tmp->next != tmp2)
82149+ tmp = tmp->next;
82150+ if (tmp->next == tmp2) {
82151+ /* from example above, we found 3, so just
82152+ replace this slot's chain with ours */
82153+ *curr = role;
82154+ } else {
82155+ /* we didn't find a subset of our role's chain
82156+ in the current slot's chain, so append their
82157+ chain to ours, and set us as the first role in
82158+ the slot's chain
82159+
82160+ we could fold this case with the case above,
82161+ but making it explicit for clarity
82162+ */
82163+ tmp->next = tmp2;
82164+ *curr = role;
82165+ }
82166+ }
82167+ }
82168+
82169+ return;
82170+}
82171+
82172+static void
82173+insert_acl_role_label(struct acl_role_label *role)
82174+{
82175+ int i;
82176+
82177+ if (polstate->role_list == NULL) {
82178+ polstate->role_list = role;
82179+ role->prev = NULL;
82180+ } else {
82181+ role->prev = polstate->role_list;
82182+ polstate->role_list = role;
82183+ }
82184+
82185+ /* used for hash chains */
82186+ role->next = NULL;
82187+
82188+ if (role->roletype & GR_ROLE_DOMAIN) {
82189+ for (i = 0; i < role->domain_child_num; i++)
82190+ __insert_acl_role_label(role, role->domain_children[i]);
82191+ } else
82192+ __insert_acl_role_label(role, role->uidgid);
82193+}
82194+
82195+static int
82196+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
82197+{
82198+ struct name_entry **curr, *nentry;
82199+ struct inodev_entry *ientry;
82200+ unsigned int len = strlen(name);
82201+ unsigned int key = full_name_hash(name, len);
82202+ unsigned int index = key % polstate->name_set.n_size;
82203+
82204+ curr = &polstate->name_set.n_hash[index];
82205+
82206+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
82207+ curr = &((*curr)->next);
82208+
82209+ if (*curr != NULL)
82210+ return 1;
82211+
82212+ nentry = acl_alloc(sizeof (struct name_entry));
82213+ if (nentry == NULL)
82214+ return 0;
82215+ ientry = acl_alloc(sizeof (struct inodev_entry));
82216+ if (ientry == NULL)
82217+ return 0;
82218+ ientry->nentry = nentry;
82219+
82220+ nentry->key = key;
82221+ nentry->name = name;
82222+ nentry->inode = inode;
82223+ nentry->device = device;
82224+ nentry->len = len;
82225+ nentry->deleted = deleted;
82226+
82227+ nentry->prev = NULL;
82228+ curr = &polstate->name_set.n_hash[index];
82229+ if (*curr != NULL)
82230+ (*curr)->prev = nentry;
82231+ nentry->next = *curr;
82232+ *curr = nentry;
82233+
82234+ /* insert us into the table searchable by inode/dev */
82235+ __insert_inodev_entry(polstate, ientry);
82236+
82237+ return 1;
82238+}
82239+
82240+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
82241+
82242+static void *
82243+create_table(__u32 * len, int elementsize)
82244+{
82245+ unsigned int table_sizes[] = {
82246+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
82247+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
82248+ 4194301, 8388593, 16777213, 33554393, 67108859
82249+ };
82250+ void *newtable = NULL;
82251+ unsigned int pwr = 0;
82252+
82253+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
82254+ table_sizes[pwr] <= *len)
82255+ pwr++;
82256+
82257+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
82258+ return newtable;
82259+
82260+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
82261+ newtable =
82262+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
82263+ else
82264+ newtable = vmalloc(table_sizes[pwr] * elementsize);
82265+
82266+ *len = table_sizes[pwr];
82267+
82268+ return newtable;
82269+}
82270+
82271+static int
82272+init_variables(const struct gr_arg *arg, bool reload)
82273+{
82274+ struct task_struct *reaper = init_pid_ns.child_reaper;
82275+ unsigned int stacksize;
82276+
82277+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
82278+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
82279+ polstate->name_set.n_size = arg->role_db.num_objects;
82280+ polstate->inodev_set.i_size = arg->role_db.num_objects;
82281+
82282+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
82283+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
82284+ return 1;
82285+
82286+ if (!reload) {
82287+ if (!gr_init_uidset())
82288+ return 1;
82289+ }
82290+
82291+ /* set up the stack that holds allocation info */
82292+
82293+ stacksize = arg->role_db.num_pointers + 5;
82294+
82295+ if (!acl_alloc_stack_init(stacksize))
82296+ return 1;
82297+
82298+ if (!reload) {
82299+ /* grab reference for the real root dentry and vfsmount */
82300+ get_fs_root(reaper->fs, &gr_real_root);
82301+
82302+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82303+ 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);
82304+#endif
82305+
82306+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82307+ if (fakefs_obj_rw == NULL)
82308+ return 1;
82309+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
82310+
82311+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82312+ if (fakefs_obj_rwx == NULL)
82313+ return 1;
82314+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
82315+ }
82316+
82317+ polstate->subj_map_set.s_hash =
82318+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
82319+ polstate->acl_role_set.r_hash =
82320+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
82321+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
82322+ polstate->inodev_set.i_hash =
82323+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
82324+
82325+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
82326+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
82327+ return 1;
82328+
82329+ memset(polstate->subj_map_set.s_hash, 0,
82330+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
82331+ memset(polstate->acl_role_set.r_hash, 0,
82332+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
82333+ memset(polstate->name_set.n_hash, 0,
82334+ sizeof (struct name_entry *) * polstate->name_set.n_size);
82335+ memset(polstate->inodev_set.i_hash, 0,
82336+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
82337+
82338+ return 0;
82339+}
82340+
82341+/* free information not needed after startup
82342+ currently contains user->kernel pointer mappings for subjects
82343+*/
82344+
82345+static void
82346+free_init_variables(void)
82347+{
82348+ __u32 i;
82349+
82350+ if (polstate->subj_map_set.s_hash) {
82351+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
82352+ if (polstate->subj_map_set.s_hash[i]) {
82353+ kfree(polstate->subj_map_set.s_hash[i]);
82354+ polstate->subj_map_set.s_hash[i] = NULL;
82355+ }
82356+ }
82357+
82358+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
82359+ PAGE_SIZE)
82360+ kfree(polstate->subj_map_set.s_hash);
82361+ else
82362+ vfree(polstate->subj_map_set.s_hash);
82363+ }
82364+
82365+ return;
82366+}
82367+
82368+static void
82369+free_variables(bool reload)
82370+{
82371+ struct acl_subject_label *s;
82372+ struct acl_role_label *r;
82373+ struct task_struct *task, *task2;
82374+ unsigned int x;
82375+
82376+ if (!reload) {
82377+ gr_clear_learn_entries();
82378+
82379+ read_lock(&tasklist_lock);
82380+ do_each_thread(task2, task) {
82381+ task->acl_sp_role = 0;
82382+ task->acl_role_id = 0;
82383+ task->inherited = 0;
82384+ task->acl = NULL;
82385+ task->role = NULL;
82386+ } while_each_thread(task2, task);
82387+ read_unlock(&tasklist_lock);
82388+
82389+ kfree(fakefs_obj_rw);
82390+ fakefs_obj_rw = NULL;
82391+ kfree(fakefs_obj_rwx);
82392+ fakefs_obj_rwx = NULL;
82393+
82394+ /* release the reference to the real root dentry and vfsmount */
82395+ path_put(&gr_real_root);
82396+ memset(&gr_real_root, 0, sizeof(gr_real_root));
82397+ }
82398+
82399+ /* free all object hash tables */
82400+
82401+ FOR_EACH_ROLE_START(r)
82402+ if (r->subj_hash == NULL)
82403+ goto next_role;
82404+ FOR_EACH_SUBJECT_START(r, s, x)
82405+ if (s->obj_hash == NULL)
82406+ break;
82407+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82408+ kfree(s->obj_hash);
82409+ else
82410+ vfree(s->obj_hash);
82411+ FOR_EACH_SUBJECT_END(s, x)
82412+ FOR_EACH_NESTED_SUBJECT_START(r, s)
82413+ if (s->obj_hash == NULL)
82414+ break;
82415+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82416+ kfree(s->obj_hash);
82417+ else
82418+ vfree(s->obj_hash);
82419+ FOR_EACH_NESTED_SUBJECT_END(s)
82420+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
82421+ kfree(r->subj_hash);
82422+ else
82423+ vfree(r->subj_hash);
82424+ r->subj_hash = NULL;
82425+next_role:
82426+ FOR_EACH_ROLE_END(r)
82427+
82428+ acl_free_all();
82429+
82430+ if (polstate->acl_role_set.r_hash) {
82431+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
82432+ PAGE_SIZE)
82433+ kfree(polstate->acl_role_set.r_hash);
82434+ else
82435+ vfree(polstate->acl_role_set.r_hash);
82436+ }
82437+ if (polstate->name_set.n_hash) {
82438+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
82439+ PAGE_SIZE)
82440+ kfree(polstate->name_set.n_hash);
82441+ else
82442+ vfree(polstate->name_set.n_hash);
82443+ }
82444+
82445+ if (polstate->inodev_set.i_hash) {
82446+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
82447+ PAGE_SIZE)
82448+ kfree(polstate->inodev_set.i_hash);
82449+ else
82450+ vfree(polstate->inodev_set.i_hash);
82451+ }
82452+
82453+ if (!reload)
82454+ gr_free_uidset();
82455+
82456+ memset(&polstate->name_set, 0, sizeof (struct name_db));
82457+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
82458+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
82459+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
82460+
82461+ polstate->default_role = NULL;
82462+ polstate->kernel_role = NULL;
82463+ polstate->role_list = NULL;
82464+
82465+ return;
82466+}
82467+
82468+static struct acl_subject_label *
82469+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
82470+
82471+static int alloc_and_copy_string(char **name, unsigned int maxlen)
82472+{
82473+ unsigned int len = strnlen_user(*name, maxlen);
82474+ char *tmp;
82475+
82476+ if (!len || len >= maxlen)
82477+ return -EINVAL;
82478+
82479+ if ((tmp = (char *) acl_alloc(len)) == NULL)
82480+ return -ENOMEM;
82481+
82482+ if (copy_from_user(tmp, *name, len))
82483+ return -EFAULT;
82484+
82485+ tmp[len-1] = '\0';
82486+ *name = tmp;
82487+
82488+ return 0;
82489+}
82490+
82491+static int
82492+copy_user_glob(struct acl_object_label *obj)
82493+{
82494+ struct acl_object_label *g_tmp, **guser;
82495+ int error;
82496+
82497+ if (obj->globbed == NULL)
82498+ return 0;
82499+
82500+ guser = &obj->globbed;
82501+ while (*guser) {
82502+ g_tmp = (struct acl_object_label *)
82503+ acl_alloc(sizeof (struct acl_object_label));
82504+ if (g_tmp == NULL)
82505+ return -ENOMEM;
82506+
82507+ if (copy_acl_object_label(g_tmp, *guser))
82508+ return -EFAULT;
82509+
82510+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
82511+ if (error)
82512+ return error;
82513+
82514+ *guser = g_tmp;
82515+ guser = &(g_tmp->next);
82516+ }
82517+
82518+ return 0;
82519+}
82520+
82521+static int
82522+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
82523+ struct acl_role_label *role)
82524+{
82525+ struct acl_object_label *o_tmp;
82526+ int ret;
82527+
82528+ while (userp) {
82529+ if ((o_tmp = (struct acl_object_label *)
82530+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
82531+ return -ENOMEM;
82532+
82533+ if (copy_acl_object_label(o_tmp, userp))
82534+ return -EFAULT;
82535+
82536+ userp = o_tmp->prev;
82537+
82538+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
82539+ if (ret)
82540+ return ret;
82541+
82542+ insert_acl_obj_label(o_tmp, subj);
82543+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
82544+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
82545+ return -ENOMEM;
82546+
82547+ ret = copy_user_glob(o_tmp);
82548+ if (ret)
82549+ return ret;
82550+
82551+ if (o_tmp->nested) {
82552+ int already_copied;
82553+
82554+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
82555+ if (IS_ERR(o_tmp->nested))
82556+ return PTR_ERR(o_tmp->nested);
82557+
82558+ /* insert into nested subject list if we haven't copied this one yet
82559+ to prevent duplicate entries */
82560+ if (!already_copied) {
82561+ o_tmp->nested->next = role->hash->first;
82562+ role->hash->first = o_tmp->nested;
82563+ }
82564+ }
82565+ }
82566+
82567+ return 0;
82568+}
82569+
82570+static __u32
82571+count_user_subjs(struct acl_subject_label *userp)
82572+{
82573+ struct acl_subject_label s_tmp;
82574+ __u32 num = 0;
82575+
82576+ while (userp) {
82577+ if (copy_acl_subject_label(&s_tmp, userp))
82578+ break;
82579+
82580+ userp = s_tmp.prev;
82581+ }
82582+
82583+ return num;
82584+}
82585+
82586+static int
82587+copy_user_allowedips(struct acl_role_label *rolep)
82588+{
82589+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
82590+
82591+ ruserip = rolep->allowed_ips;
82592+
82593+ while (ruserip) {
82594+ rlast = rtmp;
82595+
82596+ if ((rtmp = (struct role_allowed_ip *)
82597+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
82598+ return -ENOMEM;
82599+
82600+ if (copy_role_allowed_ip(rtmp, ruserip))
82601+ return -EFAULT;
82602+
82603+ ruserip = rtmp->prev;
82604+
82605+ if (!rlast) {
82606+ rtmp->prev = NULL;
82607+ rolep->allowed_ips = rtmp;
82608+ } else {
82609+ rlast->next = rtmp;
82610+ rtmp->prev = rlast;
82611+ }
82612+
82613+ if (!ruserip)
82614+ rtmp->next = NULL;
82615+ }
82616+
82617+ return 0;
82618+}
82619+
82620+static int
82621+copy_user_transitions(struct acl_role_label *rolep)
82622+{
82623+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
82624+ int error;
82625+
82626+ rusertp = rolep->transitions;
82627+
82628+ while (rusertp) {
82629+ rlast = rtmp;
82630+
82631+ if ((rtmp = (struct role_transition *)
82632+ acl_alloc(sizeof (struct role_transition))) == NULL)
82633+ return -ENOMEM;
82634+
82635+ if (copy_role_transition(rtmp, rusertp))
82636+ return -EFAULT;
82637+
82638+ rusertp = rtmp->prev;
82639+
82640+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
82641+ if (error)
82642+ return error;
82643+
82644+ if (!rlast) {
82645+ rtmp->prev = NULL;
82646+ rolep->transitions = rtmp;
82647+ } else {
82648+ rlast->next = rtmp;
82649+ rtmp->prev = rlast;
82650+ }
82651+
82652+ if (!rusertp)
82653+ rtmp->next = NULL;
82654+ }
82655+
82656+ return 0;
82657+}
82658+
82659+static __u32 count_user_objs(const struct acl_object_label __user *userp)
82660+{
82661+ struct acl_object_label o_tmp;
82662+ __u32 num = 0;
82663+
82664+ while (userp) {
82665+ if (copy_acl_object_label(&o_tmp, userp))
82666+ break;
82667+
82668+ userp = o_tmp.prev;
82669+ num++;
82670+ }
82671+
82672+ return num;
82673+}
82674+
82675+static struct acl_subject_label *
82676+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
82677+{
82678+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
82679+ __u32 num_objs;
82680+ struct acl_ip_label **i_tmp, *i_utmp2;
82681+ struct gr_hash_struct ghash;
82682+ struct subject_map *subjmap;
82683+ unsigned int i_num;
82684+ int err;
82685+
82686+ if (already_copied != NULL)
82687+ *already_copied = 0;
82688+
82689+ s_tmp = lookup_subject_map(userp);
82690+
82691+ /* we've already copied this subject into the kernel, just return
82692+ the reference to it, and don't copy it over again
82693+ */
82694+ if (s_tmp) {
82695+ if (already_copied != NULL)
82696+ *already_copied = 1;
82697+ return(s_tmp);
82698+ }
82699+
82700+ if ((s_tmp = (struct acl_subject_label *)
82701+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
82702+ return ERR_PTR(-ENOMEM);
82703+
82704+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
82705+ if (subjmap == NULL)
82706+ return ERR_PTR(-ENOMEM);
82707+
82708+ subjmap->user = userp;
82709+ subjmap->kernel = s_tmp;
82710+ insert_subj_map_entry(subjmap);
82711+
82712+ if (copy_acl_subject_label(s_tmp, userp))
82713+ return ERR_PTR(-EFAULT);
82714+
82715+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
82716+ if (err)
82717+ return ERR_PTR(err);
82718+
82719+ if (!strcmp(s_tmp->filename, "/"))
82720+ role->root_label = s_tmp;
82721+
82722+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
82723+ return ERR_PTR(-EFAULT);
82724+
82725+ /* copy user and group transition tables */
82726+
82727+ if (s_tmp->user_trans_num) {
82728+ uid_t *uidlist;
82729+
82730+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
82731+ if (uidlist == NULL)
82732+ return ERR_PTR(-ENOMEM);
82733+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
82734+ return ERR_PTR(-EFAULT);
82735+
82736+ s_tmp->user_transitions = uidlist;
82737+ }
82738+
82739+ if (s_tmp->group_trans_num) {
82740+ gid_t *gidlist;
82741+
82742+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
82743+ if (gidlist == NULL)
82744+ return ERR_PTR(-ENOMEM);
82745+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
82746+ return ERR_PTR(-EFAULT);
82747+
82748+ s_tmp->group_transitions = gidlist;
82749+ }
82750+
82751+ /* set up object hash table */
82752+ num_objs = count_user_objs(ghash.first);
82753+
82754+ s_tmp->obj_hash_size = num_objs;
82755+ s_tmp->obj_hash =
82756+ (struct acl_object_label **)
82757+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
82758+
82759+ if (!s_tmp->obj_hash)
82760+ return ERR_PTR(-ENOMEM);
82761+
82762+ memset(s_tmp->obj_hash, 0,
82763+ s_tmp->obj_hash_size *
82764+ sizeof (struct acl_object_label *));
82765+
82766+ /* add in objects */
82767+ err = copy_user_objs(ghash.first, s_tmp, role);
82768+
82769+ if (err)
82770+ return ERR_PTR(err);
82771+
82772+ /* set pointer for parent subject */
82773+ if (s_tmp->parent_subject) {
82774+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
82775+
82776+ if (IS_ERR(s_tmp2))
82777+ return s_tmp2;
82778+
82779+ s_tmp->parent_subject = s_tmp2;
82780+ }
82781+
82782+ /* add in ip acls */
82783+
82784+ if (!s_tmp->ip_num) {
82785+ s_tmp->ips = NULL;
82786+ goto insert;
82787+ }
82788+
82789+ i_tmp =
82790+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
82791+ sizeof (struct acl_ip_label *));
82792+
82793+ if (!i_tmp)
82794+ return ERR_PTR(-ENOMEM);
82795+
82796+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
82797+ *(i_tmp + i_num) =
82798+ (struct acl_ip_label *)
82799+ acl_alloc(sizeof (struct acl_ip_label));
82800+ if (!*(i_tmp + i_num))
82801+ return ERR_PTR(-ENOMEM);
82802+
82803+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
82804+ return ERR_PTR(-EFAULT);
82805+
82806+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
82807+ return ERR_PTR(-EFAULT);
82808+
82809+ if ((*(i_tmp + i_num))->iface == NULL)
82810+ continue;
82811+
82812+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
82813+ if (err)
82814+ return ERR_PTR(err);
82815+ }
82816+
82817+ s_tmp->ips = i_tmp;
82818+
82819+insert:
82820+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
82821+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
82822+ return ERR_PTR(-ENOMEM);
82823+
82824+ return s_tmp;
82825+}
82826+
82827+static int
82828+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
82829+{
82830+ struct acl_subject_label s_pre;
82831+ struct acl_subject_label * ret;
82832+ int err;
82833+
82834+ while (userp) {
82835+ if (copy_acl_subject_label(&s_pre, userp))
82836+ return -EFAULT;
82837+
82838+ ret = do_copy_user_subj(userp, role, NULL);
82839+
82840+ err = PTR_ERR(ret);
82841+ if (IS_ERR(ret))
82842+ return err;
82843+
82844+ insert_acl_subj_label(ret, role);
82845+
82846+ userp = s_pre.prev;
82847+ }
82848+
82849+ return 0;
82850+}
82851+
82852+static int
82853+copy_user_acl(struct gr_arg *arg)
82854+{
82855+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
82856+ struct acl_subject_label *subj_list;
82857+ struct sprole_pw *sptmp;
82858+ struct gr_hash_struct *ghash;
82859+ uid_t *domainlist;
82860+ unsigned int r_num;
82861+ int err = 0;
82862+ __u16 i;
82863+ __u32 num_subjs;
82864+
82865+ /* we need a default and kernel role */
82866+ if (arg->role_db.num_roles < 2)
82867+ return -EINVAL;
82868+
82869+ /* copy special role authentication info from userspace */
82870+
82871+ polstate->num_sprole_pws = arg->num_sprole_pws;
82872+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
82873+
82874+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
82875+ return -ENOMEM;
82876+
82877+ for (i = 0; i < polstate->num_sprole_pws; i++) {
82878+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
82879+ if (!sptmp)
82880+ return -ENOMEM;
82881+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
82882+ return -EFAULT;
82883+
82884+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
82885+ if (err)
82886+ return err;
82887+
82888+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82889+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
82890+#endif
82891+
82892+ polstate->acl_special_roles[i] = sptmp;
82893+ }
82894+
82895+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
82896+
82897+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
82898+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
82899+
82900+ if (!r_tmp)
82901+ return -ENOMEM;
82902+
82903+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
82904+ return -EFAULT;
82905+
82906+ if (copy_acl_role_label(r_tmp, r_utmp2))
82907+ return -EFAULT;
82908+
82909+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
82910+ if (err)
82911+ return err;
82912+
82913+ if (!strcmp(r_tmp->rolename, "default")
82914+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
82915+ polstate->default_role = r_tmp;
82916+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
82917+ polstate->kernel_role = r_tmp;
82918+ }
82919+
82920+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
82921+ return -ENOMEM;
82922+
82923+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
82924+ return -EFAULT;
82925+
82926+ r_tmp->hash = ghash;
82927+
82928+ num_subjs = count_user_subjs(r_tmp->hash->first);
82929+
82930+ r_tmp->subj_hash_size = num_subjs;
82931+ r_tmp->subj_hash =
82932+ (struct acl_subject_label **)
82933+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
82934+
82935+ if (!r_tmp->subj_hash)
82936+ return -ENOMEM;
82937+
82938+ err = copy_user_allowedips(r_tmp);
82939+ if (err)
82940+ return err;
82941+
82942+ /* copy domain info */
82943+ if (r_tmp->domain_children != NULL) {
82944+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
82945+ if (domainlist == NULL)
82946+ return -ENOMEM;
82947+
82948+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
82949+ return -EFAULT;
82950+
82951+ r_tmp->domain_children = domainlist;
82952+ }
82953+
82954+ err = copy_user_transitions(r_tmp);
82955+ if (err)
82956+ return err;
82957+
82958+ memset(r_tmp->subj_hash, 0,
82959+ r_tmp->subj_hash_size *
82960+ sizeof (struct acl_subject_label *));
82961+
82962+ /* acquire the list of subjects, then NULL out
82963+ the list prior to parsing the subjects for this role,
82964+ as during this parsing the list is replaced with a list
82965+ of *nested* subjects for the role
82966+ */
82967+ subj_list = r_tmp->hash->first;
82968+
82969+ /* set nested subject list to null */
82970+ r_tmp->hash->first = NULL;
82971+
82972+ err = copy_user_subjs(subj_list, r_tmp);
82973+
82974+ if (err)
82975+ return err;
82976+
82977+ insert_acl_role_label(r_tmp);
82978+ }
82979+
82980+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
82981+ return -EINVAL;
82982+
82983+ return err;
82984+}
82985+
82986+static int gracl_reload_apply_policies(void *reload)
82987+{
82988+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
82989+ struct task_struct *task, *task2;
82990+ struct acl_role_label *role, *rtmp;
82991+ struct acl_subject_label *subj;
82992+ const struct cred *cred;
82993+ int role_applied;
82994+ int ret = 0;
82995+
82996+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
82997+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
82998+
82999+ /* first make sure we'll be able to apply the new policy cleanly */
83000+ do_each_thread(task2, task) {
83001+ if (task->exec_file == NULL)
83002+ continue;
83003+ role_applied = 0;
83004+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83005+ /* preserve special roles */
83006+ FOR_EACH_ROLE_START(role)
83007+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83008+ rtmp = task->role;
83009+ task->role = role;
83010+ role_applied = 1;
83011+ break;
83012+ }
83013+ FOR_EACH_ROLE_END(role)
83014+ }
83015+ if (!role_applied) {
83016+ cred = __task_cred(task);
83017+ rtmp = task->role;
83018+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83019+ }
83020+ /* this handles non-nested inherited subjects, nested subjects will still
83021+ be dropped currently */
83022+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83023+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
83024+ /* change the role back so that we've made no modifications to the policy */
83025+ task->role = rtmp;
83026+
83027+ if (subj == NULL || task->tmpacl == NULL) {
83028+ ret = -EINVAL;
83029+ goto out;
83030+ }
83031+ } while_each_thread(task2, task);
83032+
83033+ /* now actually apply the policy */
83034+
83035+ do_each_thread(task2, task) {
83036+ if (task->exec_file) {
83037+ role_applied = 0;
83038+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83039+ /* preserve special roles */
83040+ FOR_EACH_ROLE_START(role)
83041+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83042+ task->role = role;
83043+ role_applied = 1;
83044+ break;
83045+ }
83046+ FOR_EACH_ROLE_END(role)
83047+ }
83048+ if (!role_applied) {
83049+ cred = __task_cred(task);
83050+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83051+ }
83052+ /* this handles non-nested inherited subjects, nested subjects will still
83053+ be dropped currently */
83054+ if (!reload_state->oldmode && task->inherited)
83055+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83056+ else {
83057+ /* looked up and tagged to the task previously */
83058+ subj = task->tmpacl;
83059+ }
83060+ /* subj will be non-null */
83061+ __gr_apply_subject_to_task(polstate, task, subj);
83062+ if (reload_state->oldmode) {
83063+ task->acl_role_id = 0;
83064+ task->acl_sp_role = 0;
83065+ task->inherited = 0;
83066+ }
83067+ } else {
83068+ // it's a kernel process
83069+ task->role = polstate->kernel_role;
83070+ task->acl = polstate->kernel_role->root_label;
83071+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83072+ task->acl->mode &= ~GR_PROCFIND;
83073+#endif
83074+ }
83075+ } while_each_thread(task2, task);
83076+
83077+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
83078+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
83079+
83080+out:
83081+
83082+ return ret;
83083+}
83084+
83085+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
83086+{
83087+ struct gr_reload_state new_reload_state = { };
83088+ int err;
83089+
83090+ new_reload_state.oldpolicy_ptr = polstate;
83091+ new_reload_state.oldalloc_ptr = current_alloc_state;
83092+ new_reload_state.oldmode = oldmode;
83093+
83094+ current_alloc_state = &new_reload_state.newalloc;
83095+ polstate = &new_reload_state.newpolicy;
83096+
83097+ /* everything relevant is now saved off, copy in the new policy */
83098+ if (init_variables(args, true)) {
83099+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83100+ err = -ENOMEM;
83101+ goto error;
83102+ }
83103+
83104+ err = copy_user_acl(args);
83105+ free_init_variables();
83106+ if (err)
83107+ goto error;
83108+ /* the new policy is copied in, with the old policy available via saved_state
83109+ first go through applying roles, making sure to preserve special roles
83110+ then apply new subjects, making sure to preserve inherited and nested subjects,
83111+ though currently only inherited subjects will be preserved
83112+ */
83113+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
83114+ if (err)
83115+ goto error;
83116+
83117+ /* we've now applied the new policy, so restore the old policy state to free it */
83118+ polstate = &new_reload_state.oldpolicy;
83119+ current_alloc_state = &new_reload_state.oldalloc;
83120+ free_variables(true);
83121+
83122+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
83123+ to running_polstate/current_alloc_state inside stop_machine
83124+ */
83125+ err = 0;
83126+ goto out;
83127+error:
83128+ /* on error of loading the new policy, we'll just keep the previous
83129+ policy set around
83130+ */
83131+ free_variables(true);
83132+
83133+ /* doesn't affect runtime, but maintains consistent state */
83134+out:
83135+ polstate = new_reload_state.oldpolicy_ptr;
83136+ current_alloc_state = new_reload_state.oldalloc_ptr;
83137+
83138+ return err;
83139+}
83140+
83141+static int
83142+gracl_init(struct gr_arg *args)
83143+{
83144+ int error = 0;
83145+
83146+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
83147+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
83148+
83149+ if (init_variables(args, false)) {
83150+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83151+ error = -ENOMEM;
83152+ goto out;
83153+ }
83154+
83155+ error = copy_user_acl(args);
83156+ free_init_variables();
83157+ if (error)
83158+ goto out;
83159+
83160+ error = gr_set_acls(0);
83161+ if (error)
83162+ goto out;
83163+
83164+ gr_enable_rbac_system();
83165+
83166+ return 0;
83167+
83168+out:
83169+ free_variables(false);
83170+ return error;
83171+}
83172+
83173+static int
83174+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
83175+ unsigned char **sum)
83176+{
83177+ struct acl_role_label *r;
83178+ struct role_allowed_ip *ipp;
83179+ struct role_transition *trans;
83180+ unsigned int i;
83181+ int found = 0;
83182+ u32 curr_ip = current->signal->curr_ip;
83183+
83184+ current->signal->saved_ip = curr_ip;
83185+
83186+ /* check transition table */
83187+
83188+ for (trans = current->role->transitions; trans; trans = trans->next) {
83189+ if (!strcmp(rolename, trans->rolename)) {
83190+ found = 1;
83191+ break;
83192+ }
83193+ }
83194+
83195+ if (!found)
83196+ return 0;
83197+
83198+ /* handle special roles that do not require authentication
83199+ and check ip */
83200+
83201+ FOR_EACH_ROLE_START(r)
83202+ if (!strcmp(rolename, r->rolename) &&
83203+ (r->roletype & GR_ROLE_SPECIAL)) {
83204+ found = 0;
83205+ if (r->allowed_ips != NULL) {
83206+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
83207+ if ((ntohl(curr_ip) & ipp->netmask) ==
83208+ (ntohl(ipp->addr) & ipp->netmask))
83209+ found = 1;
83210+ }
83211+ } else
83212+ found = 2;
83213+ if (!found)
83214+ return 0;
83215+
83216+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
83217+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
83218+ *salt = NULL;
83219+ *sum = NULL;
83220+ return 1;
83221+ }
83222+ }
83223+ FOR_EACH_ROLE_END(r)
83224+
83225+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83226+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
83227+ *salt = polstate->acl_special_roles[i]->salt;
83228+ *sum = polstate->acl_special_roles[i]->sum;
83229+ return 1;
83230+ }
83231+ }
83232+
83233+ return 0;
83234+}
83235+
83236+int gr_check_secure_terminal(struct task_struct *task)
83237+{
83238+ struct task_struct *p, *p2, *p3;
83239+ struct files_struct *files;
83240+ struct fdtable *fdt;
83241+ struct file *our_file = NULL, *file;
83242+ int i;
83243+
83244+ if (task->signal->tty == NULL)
83245+ return 1;
83246+
83247+ files = get_files_struct(task);
83248+ if (files != NULL) {
83249+ rcu_read_lock();
83250+ fdt = files_fdtable(files);
83251+ for (i=0; i < fdt->max_fds; i++) {
83252+ file = fcheck_files(files, i);
83253+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
83254+ get_file(file);
83255+ our_file = file;
83256+ }
83257+ }
83258+ rcu_read_unlock();
83259+ put_files_struct(files);
83260+ }
83261+
83262+ if (our_file == NULL)
83263+ return 1;
83264+
83265+ read_lock(&tasklist_lock);
83266+ do_each_thread(p2, p) {
83267+ files = get_files_struct(p);
83268+ if (files == NULL ||
83269+ (p->signal && p->signal->tty == task->signal->tty)) {
83270+ if (files != NULL)
83271+ put_files_struct(files);
83272+ continue;
83273+ }
83274+ rcu_read_lock();
83275+ fdt = files_fdtable(files);
83276+ for (i=0; i < fdt->max_fds; i++) {
83277+ file = fcheck_files(files, i);
83278+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
83279+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
83280+ p3 = task;
83281+ while (task_pid_nr(p3) > 0) {
83282+ if (p3 == p)
83283+ break;
83284+ p3 = p3->real_parent;
83285+ }
83286+ if (p3 == p)
83287+ break;
83288+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
83289+ gr_handle_alertkill(p);
83290+ rcu_read_unlock();
83291+ put_files_struct(files);
83292+ read_unlock(&tasklist_lock);
83293+ fput(our_file);
83294+ return 0;
83295+ }
83296+ }
83297+ rcu_read_unlock();
83298+ put_files_struct(files);
83299+ } while_each_thread(p2, p);
83300+ read_unlock(&tasklist_lock);
83301+
83302+ fput(our_file);
83303+ return 1;
83304+}
83305+
83306+ssize_t
83307+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
83308+{
83309+ struct gr_arg_wrapper uwrap;
83310+ unsigned char *sprole_salt = NULL;
83311+ unsigned char *sprole_sum = NULL;
83312+ int error = 0;
83313+ int error2 = 0;
83314+ size_t req_count = 0;
83315+ unsigned char oldmode = 0;
83316+
83317+ mutex_lock(&gr_dev_mutex);
83318+
83319+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
83320+ error = -EPERM;
83321+ goto out;
83322+ }
83323+
83324+#ifdef CONFIG_COMPAT
83325+ pax_open_kernel();
83326+ if (is_compat_task()) {
83327+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
83328+ copy_gr_arg = &copy_gr_arg_compat;
83329+ copy_acl_object_label = &copy_acl_object_label_compat;
83330+ copy_acl_subject_label = &copy_acl_subject_label_compat;
83331+ copy_acl_role_label = &copy_acl_role_label_compat;
83332+ copy_acl_ip_label = &copy_acl_ip_label_compat;
83333+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
83334+ copy_role_transition = &copy_role_transition_compat;
83335+ copy_sprole_pw = &copy_sprole_pw_compat;
83336+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
83337+ copy_pointer_from_array = &copy_pointer_from_array_compat;
83338+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
83339+ } else {
83340+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
83341+ copy_gr_arg = &copy_gr_arg_normal;
83342+ copy_acl_object_label = &copy_acl_object_label_normal;
83343+ copy_acl_subject_label = &copy_acl_subject_label_normal;
83344+ copy_acl_role_label = &copy_acl_role_label_normal;
83345+ copy_acl_ip_label = &copy_acl_ip_label_normal;
83346+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
83347+ copy_role_transition = &copy_role_transition_normal;
83348+ copy_sprole_pw = &copy_sprole_pw_normal;
83349+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
83350+ copy_pointer_from_array = &copy_pointer_from_array_normal;
83351+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
83352+ }
83353+ pax_close_kernel();
83354+#endif
83355+
83356+ req_count = get_gr_arg_wrapper_size();
83357+
83358+ if (count != req_count) {
83359+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
83360+ error = -EINVAL;
83361+ goto out;
83362+ }
83363+
83364+
83365+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
83366+ gr_auth_expires = 0;
83367+ gr_auth_attempts = 0;
83368+ }
83369+
83370+ error = copy_gr_arg_wrapper(buf, &uwrap);
83371+ if (error)
83372+ goto out;
83373+
83374+ error = copy_gr_arg(uwrap.arg, gr_usermode);
83375+ if (error)
83376+ goto out;
83377+
83378+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83379+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83380+ time_after(gr_auth_expires, get_seconds())) {
83381+ error = -EBUSY;
83382+ goto out;
83383+ }
83384+
83385+ /* if non-root trying to do anything other than use a special role,
83386+ do not attempt authentication, do not count towards authentication
83387+ locking
83388+ */
83389+
83390+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
83391+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83392+ gr_is_global_nonroot(current_uid())) {
83393+ error = -EPERM;
83394+ goto out;
83395+ }
83396+
83397+ /* ensure pw and special role name are null terminated */
83398+
83399+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
83400+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
83401+
83402+ /* Okay.
83403+ * We have our enough of the argument structure..(we have yet
83404+ * to copy_from_user the tables themselves) . Copy the tables
83405+ * only if we need them, i.e. for loading operations. */
83406+
83407+ switch (gr_usermode->mode) {
83408+ case GR_STATUS:
83409+ if (gr_acl_is_enabled()) {
83410+ error = 1;
83411+ if (!gr_check_secure_terminal(current))
83412+ error = 3;
83413+ } else
83414+ error = 2;
83415+ goto out;
83416+ case GR_SHUTDOWN:
83417+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83418+ stop_machine(gr_rbac_disable, NULL, NULL);
83419+ free_variables(false);
83420+ memset(gr_usermode, 0, sizeof(struct gr_arg));
83421+ memset(gr_system_salt, 0, GR_SALT_LEN);
83422+ memset(gr_system_sum, 0, GR_SHA_LEN);
83423+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
83424+ } else if (gr_acl_is_enabled()) {
83425+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
83426+ error = -EPERM;
83427+ } else {
83428+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
83429+ error = -EAGAIN;
83430+ }
83431+ break;
83432+ case GR_ENABLE:
83433+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
83434+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
83435+ else {
83436+ if (gr_acl_is_enabled())
83437+ error = -EAGAIN;
83438+ else
83439+ error = error2;
83440+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
83441+ }
83442+ break;
83443+ case GR_OLDRELOAD:
83444+ oldmode = 1;
83445+ case GR_RELOAD:
83446+ if (!gr_acl_is_enabled()) {
83447+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
83448+ error = -EAGAIN;
83449+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83450+ error2 = gracl_reload(gr_usermode, oldmode);
83451+ if (!error2)
83452+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
83453+ else {
83454+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83455+ error = error2;
83456+ }
83457+ } else {
83458+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83459+ error = -EPERM;
83460+ }
83461+ break;
83462+ case GR_SEGVMOD:
83463+ if (unlikely(!gr_acl_is_enabled())) {
83464+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
83465+ error = -EAGAIN;
83466+ break;
83467+ }
83468+
83469+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83470+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
83471+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
83472+ struct acl_subject_label *segvacl;
83473+ segvacl =
83474+ lookup_acl_subj_label(gr_usermode->segv_inode,
83475+ gr_usermode->segv_device,
83476+ current->role);
83477+ if (segvacl) {
83478+ segvacl->crashes = 0;
83479+ segvacl->expires = 0;
83480+ }
83481+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
83482+ gr_remove_uid(gr_usermode->segv_uid);
83483+ }
83484+ } else {
83485+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
83486+ error = -EPERM;
83487+ }
83488+ break;
83489+ case GR_SPROLE:
83490+ case GR_SPROLEPAM:
83491+ if (unlikely(!gr_acl_is_enabled())) {
83492+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
83493+ error = -EAGAIN;
83494+ break;
83495+ }
83496+
83497+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
83498+ current->role->expires = 0;
83499+ current->role->auth_attempts = 0;
83500+ }
83501+
83502+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83503+ time_after(current->role->expires, get_seconds())) {
83504+ error = -EBUSY;
83505+ goto out;
83506+ }
83507+
83508+ if (lookup_special_role_auth
83509+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
83510+ && ((!sprole_salt && !sprole_sum)
83511+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
83512+ char *p = "";
83513+ assign_special_role(gr_usermode->sp_role);
83514+ read_lock(&tasklist_lock);
83515+ if (current->real_parent)
83516+ p = current->real_parent->role->rolename;
83517+ read_unlock(&tasklist_lock);
83518+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
83519+ p, acl_sp_role_value);
83520+ } else {
83521+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
83522+ error = -EPERM;
83523+ if(!(current->role->auth_attempts++))
83524+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83525+
83526+ goto out;
83527+ }
83528+ break;
83529+ case GR_UNSPROLE:
83530+ if (unlikely(!gr_acl_is_enabled())) {
83531+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
83532+ error = -EAGAIN;
83533+ break;
83534+ }
83535+
83536+ if (current->role->roletype & GR_ROLE_SPECIAL) {
83537+ char *p = "";
83538+ int i = 0;
83539+
83540+ read_lock(&tasklist_lock);
83541+ if (current->real_parent) {
83542+ p = current->real_parent->role->rolename;
83543+ i = current->real_parent->acl_role_id;
83544+ }
83545+ read_unlock(&tasklist_lock);
83546+
83547+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
83548+ gr_set_acls(1);
83549+ } else {
83550+ error = -EPERM;
83551+ goto out;
83552+ }
83553+ break;
83554+ default:
83555+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
83556+ error = -EINVAL;
83557+ break;
83558+ }
83559+
83560+ if (error != -EPERM)
83561+ goto out;
83562+
83563+ if(!(gr_auth_attempts++))
83564+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83565+
83566+ out:
83567+ mutex_unlock(&gr_dev_mutex);
83568+
83569+ if (!error)
83570+ error = req_count;
83571+
83572+ return error;
83573+}
83574+
83575+int
83576+gr_set_acls(const int type)
83577+{
83578+ struct task_struct *task, *task2;
83579+ struct acl_role_label *role = current->role;
83580+ struct acl_subject_label *subj;
83581+ __u16 acl_role_id = current->acl_role_id;
83582+ const struct cred *cred;
83583+ int ret;
83584+
83585+ rcu_read_lock();
83586+ read_lock(&tasklist_lock);
83587+ read_lock(&grsec_exec_file_lock);
83588+ do_each_thread(task2, task) {
83589+ /* check to see if we're called from the exit handler,
83590+ if so, only replace ACLs that have inherited the admin
83591+ ACL */
83592+
83593+ if (type && (task->role != role ||
83594+ task->acl_role_id != acl_role_id))
83595+ continue;
83596+
83597+ task->acl_role_id = 0;
83598+ task->acl_sp_role = 0;
83599+ task->inherited = 0;
83600+
83601+ if (task->exec_file) {
83602+ cred = __task_cred(task);
83603+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83604+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
83605+ if (subj == NULL) {
83606+ ret = -EINVAL;
83607+ read_unlock(&grsec_exec_file_lock);
83608+ read_unlock(&tasklist_lock);
83609+ rcu_read_unlock();
83610+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
83611+ return ret;
83612+ }
83613+ __gr_apply_subject_to_task(polstate, task, subj);
83614+ } else {
83615+ // it's a kernel process
83616+ task->role = polstate->kernel_role;
83617+ task->acl = polstate->kernel_role->root_label;
83618+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83619+ task->acl->mode &= ~GR_PROCFIND;
83620+#endif
83621+ }
83622+ } while_each_thread(task2, task);
83623+ read_unlock(&grsec_exec_file_lock);
83624+ read_unlock(&tasklist_lock);
83625+ rcu_read_unlock();
83626+
83627+ return 0;
83628+}
83629diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
83630new file mode 100644
83631index 0000000..39645c9
83632--- /dev/null
83633+++ b/grsecurity/gracl_res.c
83634@@ -0,0 +1,68 @@
83635+#include <linux/kernel.h>
83636+#include <linux/sched.h>
83637+#include <linux/gracl.h>
83638+#include <linux/grinternal.h>
83639+
83640+static const char *restab_log[] = {
83641+ [RLIMIT_CPU] = "RLIMIT_CPU",
83642+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
83643+ [RLIMIT_DATA] = "RLIMIT_DATA",
83644+ [RLIMIT_STACK] = "RLIMIT_STACK",
83645+ [RLIMIT_CORE] = "RLIMIT_CORE",
83646+ [RLIMIT_RSS] = "RLIMIT_RSS",
83647+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
83648+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
83649+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
83650+ [RLIMIT_AS] = "RLIMIT_AS",
83651+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
83652+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
83653+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
83654+ [RLIMIT_NICE] = "RLIMIT_NICE",
83655+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
83656+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
83657+ [GR_CRASH_RES] = "RLIMIT_CRASH"
83658+};
83659+
83660+void
83661+gr_log_resource(const struct task_struct *task,
83662+ const int res, const unsigned long wanted, const int gt)
83663+{
83664+ const struct cred *cred;
83665+ unsigned long rlim;
83666+
83667+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
83668+ return;
83669+
83670+ // not yet supported resource
83671+ if (unlikely(!restab_log[res]))
83672+ return;
83673+
83674+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
83675+ rlim = task_rlimit_max(task, res);
83676+ else
83677+ rlim = task_rlimit(task, res);
83678+
83679+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
83680+ return;
83681+
83682+ rcu_read_lock();
83683+ cred = __task_cred(task);
83684+
83685+ if (res == RLIMIT_NPROC &&
83686+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
83687+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
83688+ goto out_rcu_unlock;
83689+ else if (res == RLIMIT_MEMLOCK &&
83690+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
83691+ goto out_rcu_unlock;
83692+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
83693+ goto out_rcu_unlock;
83694+ rcu_read_unlock();
83695+
83696+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
83697+
83698+ return;
83699+out_rcu_unlock:
83700+ rcu_read_unlock();
83701+ return;
83702+}
83703diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
83704new file mode 100644
83705index 0000000..35d9e65
83706--- /dev/null
83707+++ b/grsecurity/gracl_segv.c
83708@@ -0,0 +1,324 @@
83709+#include <linux/kernel.h>
83710+#include <linux/mm.h>
83711+#include <asm/uaccess.h>
83712+#include <asm/errno.h>
83713+#include <asm/mman.h>
83714+#include <net/sock.h>
83715+#include <linux/file.h>
83716+#include <linux/fs.h>
83717+#include <linux/net.h>
83718+#include <linux/in.h>
83719+#include <linux/slab.h>
83720+#include <linux/types.h>
83721+#include <linux/sched.h>
83722+#include <linux/timer.h>
83723+#include <linux/gracl.h>
83724+#include <linux/grsecurity.h>
83725+#include <linux/grinternal.h>
83726+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83727+#include <linux/magic.h>
83728+#include <linux/pagemap.h>
83729+#include "../fs/btrfs/async-thread.h"
83730+#include "../fs/btrfs/ctree.h"
83731+#include "../fs/btrfs/btrfs_inode.h"
83732+#endif
83733+
83734+static struct crash_uid *uid_set;
83735+static unsigned short uid_used;
83736+static DEFINE_SPINLOCK(gr_uid_lock);
83737+extern rwlock_t gr_inode_lock;
83738+extern struct acl_subject_label *
83739+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
83740+ struct acl_role_label *role);
83741+
83742+static inline dev_t __get_dev(const struct dentry *dentry)
83743+{
83744+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83745+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83746+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
83747+ else
83748+#endif
83749+ return dentry->d_sb->s_dev;
83750+}
83751+
83752+static inline u64 __get_ino(const struct dentry *dentry)
83753+{
83754+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83755+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83756+ return btrfs_ino(dentry->d_inode);
83757+ else
83758+#endif
83759+ return dentry->d_inode->i_ino;
83760+}
83761+
83762+int
83763+gr_init_uidset(void)
83764+{
83765+ uid_set =
83766+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
83767+ uid_used = 0;
83768+
83769+ return uid_set ? 1 : 0;
83770+}
83771+
83772+void
83773+gr_free_uidset(void)
83774+{
83775+ if (uid_set) {
83776+ struct crash_uid *tmpset;
83777+ spin_lock(&gr_uid_lock);
83778+ tmpset = uid_set;
83779+ uid_set = NULL;
83780+ uid_used = 0;
83781+ spin_unlock(&gr_uid_lock);
83782+ if (tmpset)
83783+ kfree(tmpset);
83784+ }
83785+
83786+ return;
83787+}
83788+
83789+int
83790+gr_find_uid(const uid_t uid)
83791+{
83792+ struct crash_uid *tmp = uid_set;
83793+ uid_t buid;
83794+ int low = 0, high = uid_used - 1, mid;
83795+
83796+ while (high >= low) {
83797+ mid = (low + high) >> 1;
83798+ buid = tmp[mid].uid;
83799+ if (buid == uid)
83800+ return mid;
83801+ if (buid > uid)
83802+ high = mid - 1;
83803+ if (buid < uid)
83804+ low = mid + 1;
83805+ }
83806+
83807+ return -1;
83808+}
83809+
83810+static void
83811+gr_insertsort(void)
83812+{
83813+ unsigned short i, j;
83814+ struct crash_uid index;
83815+
83816+ for (i = 1; i < uid_used; i++) {
83817+ index = uid_set[i];
83818+ j = i;
83819+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
83820+ uid_set[j] = uid_set[j - 1];
83821+ j--;
83822+ }
83823+ uid_set[j] = index;
83824+ }
83825+
83826+ return;
83827+}
83828+
83829+static void
83830+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
83831+{
83832+ int loc;
83833+ uid_t uid = GR_GLOBAL_UID(kuid);
83834+
83835+ if (uid_used == GR_UIDTABLE_MAX)
83836+ return;
83837+
83838+ loc = gr_find_uid(uid);
83839+
83840+ if (loc >= 0) {
83841+ uid_set[loc].expires = expires;
83842+ return;
83843+ }
83844+
83845+ uid_set[uid_used].uid = uid;
83846+ uid_set[uid_used].expires = expires;
83847+ uid_used++;
83848+
83849+ gr_insertsort();
83850+
83851+ return;
83852+}
83853+
83854+void
83855+gr_remove_uid(const unsigned short loc)
83856+{
83857+ unsigned short i;
83858+
83859+ for (i = loc + 1; i < uid_used; i++)
83860+ uid_set[i - 1] = uid_set[i];
83861+
83862+ uid_used--;
83863+
83864+ return;
83865+}
83866+
83867+int
83868+gr_check_crash_uid(const kuid_t kuid)
83869+{
83870+ int loc;
83871+ int ret = 0;
83872+ uid_t uid;
83873+
83874+ if (unlikely(!gr_acl_is_enabled()))
83875+ return 0;
83876+
83877+ uid = GR_GLOBAL_UID(kuid);
83878+
83879+ spin_lock(&gr_uid_lock);
83880+ loc = gr_find_uid(uid);
83881+
83882+ if (loc < 0)
83883+ goto out_unlock;
83884+
83885+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
83886+ gr_remove_uid(loc);
83887+ else
83888+ ret = 1;
83889+
83890+out_unlock:
83891+ spin_unlock(&gr_uid_lock);
83892+ return ret;
83893+}
83894+
83895+static int
83896+proc_is_setxid(const struct cred *cred)
83897+{
83898+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
83899+ !uid_eq(cred->uid, cred->fsuid))
83900+ return 1;
83901+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
83902+ !gid_eq(cred->gid, cred->fsgid))
83903+ return 1;
83904+
83905+ return 0;
83906+}
83907+
83908+extern int gr_fake_force_sig(int sig, struct task_struct *t);
83909+
83910+void
83911+gr_handle_crash(struct task_struct *task, const int sig)
83912+{
83913+ struct acl_subject_label *curr;
83914+ struct task_struct *tsk, *tsk2;
83915+ const struct cred *cred;
83916+ const struct cred *cred2;
83917+
83918+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
83919+ return;
83920+
83921+ if (unlikely(!gr_acl_is_enabled()))
83922+ return;
83923+
83924+ curr = task->acl;
83925+
83926+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
83927+ return;
83928+
83929+ if (time_before_eq(curr->expires, get_seconds())) {
83930+ curr->expires = 0;
83931+ curr->crashes = 0;
83932+ }
83933+
83934+ curr->crashes++;
83935+
83936+ if (!curr->expires)
83937+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
83938+
83939+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
83940+ time_after(curr->expires, get_seconds())) {
83941+ rcu_read_lock();
83942+ cred = __task_cred(task);
83943+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
83944+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
83945+ spin_lock(&gr_uid_lock);
83946+ gr_insert_uid(cred->uid, curr->expires);
83947+ spin_unlock(&gr_uid_lock);
83948+ curr->expires = 0;
83949+ curr->crashes = 0;
83950+ read_lock(&tasklist_lock);
83951+ do_each_thread(tsk2, tsk) {
83952+ cred2 = __task_cred(tsk);
83953+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
83954+ gr_fake_force_sig(SIGKILL, tsk);
83955+ } while_each_thread(tsk2, tsk);
83956+ read_unlock(&tasklist_lock);
83957+ } else {
83958+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
83959+ read_lock(&tasklist_lock);
83960+ read_lock(&grsec_exec_file_lock);
83961+ do_each_thread(tsk2, tsk) {
83962+ if (likely(tsk != task)) {
83963+ // if this thread has the same subject as the one that triggered
83964+ // RES_CRASH and it's the same binary, kill it
83965+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
83966+ gr_fake_force_sig(SIGKILL, tsk);
83967+ }
83968+ } while_each_thread(tsk2, tsk);
83969+ read_unlock(&grsec_exec_file_lock);
83970+ read_unlock(&tasklist_lock);
83971+ }
83972+ rcu_read_unlock();
83973+ }
83974+
83975+ return;
83976+}
83977+
83978+int
83979+gr_check_crash_exec(const struct file *filp)
83980+{
83981+ struct acl_subject_label *curr;
83982+ struct dentry *dentry;
83983+
83984+ if (unlikely(!gr_acl_is_enabled()))
83985+ return 0;
83986+
83987+ read_lock(&gr_inode_lock);
83988+ dentry = filp->f_path.dentry;
83989+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
83990+ current->role);
83991+ read_unlock(&gr_inode_lock);
83992+
83993+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
83994+ (!curr->crashes && !curr->expires))
83995+ return 0;
83996+
83997+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
83998+ time_after(curr->expires, get_seconds()))
83999+ return 1;
84000+ else if (time_before_eq(curr->expires, get_seconds())) {
84001+ curr->crashes = 0;
84002+ curr->expires = 0;
84003+ }
84004+
84005+ return 0;
84006+}
84007+
84008+void
84009+gr_handle_alertkill(struct task_struct *task)
84010+{
84011+ struct acl_subject_label *curracl;
84012+ __u32 curr_ip;
84013+ struct task_struct *p, *p2;
84014+
84015+ if (unlikely(!gr_acl_is_enabled()))
84016+ return;
84017+
84018+ curracl = task->acl;
84019+ curr_ip = task->signal->curr_ip;
84020+
84021+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
84022+ read_lock(&tasklist_lock);
84023+ do_each_thread(p2, p) {
84024+ if (p->signal->curr_ip == curr_ip)
84025+ gr_fake_force_sig(SIGKILL, p);
84026+ } while_each_thread(p2, p);
84027+ read_unlock(&tasklist_lock);
84028+ } else if (curracl->mode & GR_KILLPROC)
84029+ gr_fake_force_sig(SIGKILL, task);
84030+
84031+ return;
84032+}
84033diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
84034new file mode 100644
84035index 0000000..6b0c9cc
84036--- /dev/null
84037+++ b/grsecurity/gracl_shm.c
84038@@ -0,0 +1,40 @@
84039+#include <linux/kernel.h>
84040+#include <linux/mm.h>
84041+#include <linux/sched.h>
84042+#include <linux/file.h>
84043+#include <linux/ipc.h>
84044+#include <linux/gracl.h>
84045+#include <linux/grsecurity.h>
84046+#include <linux/grinternal.h>
84047+
84048+int
84049+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84050+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84051+{
84052+ struct task_struct *task;
84053+
84054+ if (!gr_acl_is_enabled())
84055+ return 1;
84056+
84057+ rcu_read_lock();
84058+ read_lock(&tasklist_lock);
84059+
84060+ task = find_task_by_vpid(shm_cprid);
84061+
84062+ if (unlikely(!task))
84063+ task = find_task_by_vpid(shm_lapid);
84064+
84065+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
84066+ (task_pid_nr(task) == shm_lapid)) &&
84067+ (task->acl->mode & GR_PROTSHM) &&
84068+ (task->acl != current->acl))) {
84069+ read_unlock(&tasklist_lock);
84070+ rcu_read_unlock();
84071+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
84072+ return 0;
84073+ }
84074+ read_unlock(&tasklist_lock);
84075+ rcu_read_unlock();
84076+
84077+ return 1;
84078+}
84079diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
84080new file mode 100644
84081index 0000000..bc0be01
84082--- /dev/null
84083+++ b/grsecurity/grsec_chdir.c
84084@@ -0,0 +1,19 @@
84085+#include <linux/kernel.h>
84086+#include <linux/sched.h>
84087+#include <linux/fs.h>
84088+#include <linux/file.h>
84089+#include <linux/grsecurity.h>
84090+#include <linux/grinternal.h>
84091+
84092+void
84093+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
84094+{
84095+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
84096+ if ((grsec_enable_chdir && grsec_enable_group &&
84097+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
84098+ !grsec_enable_group)) {
84099+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
84100+ }
84101+#endif
84102+ return;
84103+}
84104diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
84105new file mode 100644
84106index 0000000..114ea4f
84107--- /dev/null
84108+++ b/grsecurity/grsec_chroot.c
84109@@ -0,0 +1,467 @@
84110+#include <linux/kernel.h>
84111+#include <linux/module.h>
84112+#include <linux/sched.h>
84113+#include <linux/file.h>
84114+#include <linux/fs.h>
84115+#include <linux/mount.h>
84116+#include <linux/types.h>
84117+#include "../fs/mount.h"
84118+#include <linux/grsecurity.h>
84119+#include <linux/grinternal.h>
84120+
84121+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84122+int gr_init_ran;
84123+#endif
84124+
84125+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84126+{
84127+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84128+ struct dentry *tmpd = dentry;
84129+
84130+ read_seqlock_excl(&mount_lock);
84131+ write_seqlock(&rename_lock);
84132+
84133+ while (tmpd != mnt->mnt_root) {
84134+ atomic_inc(&tmpd->chroot_refcnt);
84135+ tmpd = tmpd->d_parent;
84136+ }
84137+ atomic_inc(&tmpd->chroot_refcnt);
84138+
84139+ write_sequnlock(&rename_lock);
84140+ read_sequnlock_excl(&mount_lock);
84141+#endif
84142+}
84143+
84144+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84145+{
84146+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84147+ struct dentry *tmpd = dentry;
84148+
84149+ read_seqlock_excl(&mount_lock);
84150+ write_seqlock(&rename_lock);
84151+
84152+ while (tmpd != mnt->mnt_root) {
84153+ atomic_dec(&tmpd->chroot_refcnt);
84154+ tmpd = tmpd->d_parent;
84155+ }
84156+ atomic_dec(&tmpd->chroot_refcnt);
84157+
84158+ write_sequnlock(&rename_lock);
84159+ read_sequnlock_excl(&mount_lock);
84160+#endif
84161+}
84162+
84163+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84164+static struct dentry *get_closest_chroot(struct dentry *dentry)
84165+{
84166+ write_seqlock(&rename_lock);
84167+ do {
84168+ if (atomic_read(&dentry->chroot_refcnt)) {
84169+ write_sequnlock(&rename_lock);
84170+ return dentry;
84171+ }
84172+ dentry = dentry->d_parent;
84173+ } while (!IS_ROOT(dentry));
84174+ write_sequnlock(&rename_lock);
84175+ return NULL;
84176+}
84177+#endif
84178+
84179+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
84180+ struct dentry *newdentry, struct vfsmount *newmnt)
84181+{
84182+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84183+ struct dentry *chroot;
84184+
84185+ if (unlikely(!grsec_enable_chroot_rename))
84186+ return 0;
84187+
84188+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
84189+ return 0;
84190+
84191+ chroot = get_closest_chroot(olddentry);
84192+
84193+ if (chroot == NULL)
84194+ return 0;
84195+
84196+ if (is_subdir(newdentry, chroot))
84197+ return 0;
84198+
84199+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
84200+
84201+ return 1;
84202+#else
84203+ return 0;
84204+#endif
84205+}
84206+
84207+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
84208+{
84209+#ifdef CONFIG_GRKERNSEC
84210+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
84211+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
84212+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84213+ && gr_init_ran
84214+#endif
84215+ )
84216+ task->gr_is_chrooted = 1;
84217+ else {
84218+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84219+ if (task_pid_nr(task) == 1 && !gr_init_ran)
84220+ gr_init_ran = 1;
84221+#endif
84222+ task->gr_is_chrooted = 0;
84223+ }
84224+
84225+ task->gr_chroot_dentry = path->dentry;
84226+#endif
84227+ return;
84228+}
84229+
84230+void gr_clear_chroot_entries(struct task_struct *task)
84231+{
84232+#ifdef CONFIG_GRKERNSEC
84233+ task->gr_is_chrooted = 0;
84234+ task->gr_chroot_dentry = NULL;
84235+#endif
84236+ return;
84237+}
84238+
84239+int
84240+gr_handle_chroot_unix(const pid_t pid)
84241+{
84242+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
84243+ struct task_struct *p;
84244+
84245+ if (unlikely(!grsec_enable_chroot_unix))
84246+ return 1;
84247+
84248+ if (likely(!proc_is_chrooted(current)))
84249+ return 1;
84250+
84251+ rcu_read_lock();
84252+ read_lock(&tasklist_lock);
84253+ p = find_task_by_vpid_unrestricted(pid);
84254+ if (unlikely(p && !have_same_root(current, p))) {
84255+ read_unlock(&tasklist_lock);
84256+ rcu_read_unlock();
84257+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
84258+ return 0;
84259+ }
84260+ read_unlock(&tasklist_lock);
84261+ rcu_read_unlock();
84262+#endif
84263+ return 1;
84264+}
84265+
84266+int
84267+gr_handle_chroot_nice(void)
84268+{
84269+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84270+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
84271+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
84272+ return -EPERM;
84273+ }
84274+#endif
84275+ return 0;
84276+}
84277+
84278+int
84279+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
84280+{
84281+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84282+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
84283+ && proc_is_chrooted(current)) {
84284+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
84285+ return -EACCES;
84286+ }
84287+#endif
84288+ return 0;
84289+}
84290+
84291+int
84292+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
84293+{
84294+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84295+ struct task_struct *p;
84296+ int ret = 0;
84297+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
84298+ return ret;
84299+
84300+ read_lock(&tasklist_lock);
84301+ do_each_pid_task(pid, type, p) {
84302+ if (!have_same_root(current, p)) {
84303+ ret = 1;
84304+ goto out;
84305+ }
84306+ } while_each_pid_task(pid, type, p);
84307+out:
84308+ read_unlock(&tasklist_lock);
84309+ return ret;
84310+#endif
84311+ return 0;
84312+}
84313+
84314+int
84315+gr_pid_is_chrooted(struct task_struct *p)
84316+{
84317+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84318+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
84319+ return 0;
84320+
84321+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
84322+ !have_same_root(current, p)) {
84323+ return 1;
84324+ }
84325+#endif
84326+ return 0;
84327+}
84328+
84329+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
84330+
84331+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
84332+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
84333+{
84334+ struct path path, currentroot;
84335+ int ret = 0;
84336+
84337+ path.dentry = (struct dentry *)u_dentry;
84338+ path.mnt = (struct vfsmount *)u_mnt;
84339+ get_fs_root(current->fs, &currentroot);
84340+ if (path_is_under(&path, &currentroot))
84341+ ret = 1;
84342+ path_put(&currentroot);
84343+
84344+ return ret;
84345+}
84346+#endif
84347+
84348+int
84349+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
84350+{
84351+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84352+ if (!grsec_enable_chroot_fchdir)
84353+ return 1;
84354+
84355+ if (!proc_is_chrooted(current))
84356+ return 1;
84357+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
84358+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
84359+ return 0;
84360+ }
84361+#endif
84362+ return 1;
84363+}
84364+
84365+int
84366+gr_chroot_fhandle(void)
84367+{
84368+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84369+ if (!grsec_enable_chroot_fchdir)
84370+ return 1;
84371+
84372+ if (!proc_is_chrooted(current))
84373+ return 1;
84374+ else {
84375+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
84376+ return 0;
84377+ }
84378+#endif
84379+ return 1;
84380+}
84381+
84382+int
84383+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84384+ const u64 shm_createtime)
84385+{
84386+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
84387+ struct task_struct *p;
84388+
84389+ if (unlikely(!grsec_enable_chroot_shmat))
84390+ return 1;
84391+
84392+ if (likely(!proc_is_chrooted(current)))
84393+ return 1;
84394+
84395+ rcu_read_lock();
84396+ read_lock(&tasklist_lock);
84397+
84398+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
84399+ if (time_before_eq64(p->start_time, shm_createtime)) {
84400+ if (have_same_root(current, p)) {
84401+ goto allow;
84402+ } else {
84403+ read_unlock(&tasklist_lock);
84404+ rcu_read_unlock();
84405+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84406+ return 0;
84407+ }
84408+ }
84409+ /* creator exited, pid reuse, fall through to next check */
84410+ }
84411+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
84412+ if (unlikely(!have_same_root(current, p))) {
84413+ read_unlock(&tasklist_lock);
84414+ rcu_read_unlock();
84415+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84416+ return 0;
84417+ }
84418+ }
84419+
84420+allow:
84421+ read_unlock(&tasklist_lock);
84422+ rcu_read_unlock();
84423+#endif
84424+ return 1;
84425+}
84426+
84427+void
84428+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
84429+{
84430+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
84431+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
84432+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
84433+#endif
84434+ return;
84435+}
84436+
84437+int
84438+gr_handle_chroot_mknod(const struct dentry *dentry,
84439+ const struct vfsmount *mnt, const int mode)
84440+{
84441+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
84442+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
84443+ proc_is_chrooted(current)) {
84444+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
84445+ return -EPERM;
84446+ }
84447+#endif
84448+ return 0;
84449+}
84450+
84451+int
84452+gr_handle_chroot_mount(const struct dentry *dentry,
84453+ const struct vfsmount *mnt, const char *dev_name)
84454+{
84455+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
84456+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
84457+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
84458+ return -EPERM;
84459+ }
84460+#endif
84461+ return 0;
84462+}
84463+
84464+int
84465+gr_handle_chroot_pivot(void)
84466+{
84467+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
84468+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
84469+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
84470+ return -EPERM;
84471+ }
84472+#endif
84473+ return 0;
84474+}
84475+
84476+int
84477+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
84478+{
84479+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
84480+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
84481+ !gr_is_outside_chroot(dentry, mnt)) {
84482+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
84483+ return -EPERM;
84484+ }
84485+#endif
84486+ return 0;
84487+}
84488+
84489+extern const char *captab_log[];
84490+extern int captab_log_entries;
84491+
84492+int
84493+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
84494+{
84495+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84496+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84497+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84498+ if (cap_raised(chroot_caps, cap)) {
84499+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
84500+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
84501+ }
84502+ return 0;
84503+ }
84504+ }
84505+#endif
84506+ return 1;
84507+}
84508+
84509+int
84510+gr_chroot_is_capable(const int cap)
84511+{
84512+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84513+ return gr_task_chroot_is_capable(current, current_cred(), cap);
84514+#endif
84515+ return 1;
84516+}
84517+
84518+int
84519+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
84520+{
84521+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84522+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84523+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84524+ if (cap_raised(chroot_caps, cap)) {
84525+ return 0;
84526+ }
84527+ }
84528+#endif
84529+ return 1;
84530+}
84531+
84532+int
84533+gr_chroot_is_capable_nolog(const int cap)
84534+{
84535+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84536+ return gr_task_chroot_is_capable_nolog(current, cap);
84537+#endif
84538+ return 1;
84539+}
84540+
84541+int
84542+gr_handle_chroot_sysctl(const int op)
84543+{
84544+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
84545+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
84546+ proc_is_chrooted(current))
84547+ return -EACCES;
84548+#endif
84549+ return 0;
84550+}
84551+
84552+void
84553+gr_handle_chroot_chdir(const struct path *path)
84554+{
84555+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
84556+ if (grsec_enable_chroot_chdir)
84557+ set_fs_pwd(current->fs, path);
84558+#endif
84559+ return;
84560+}
84561+
84562+int
84563+gr_handle_chroot_chmod(const struct dentry *dentry,
84564+ const struct vfsmount *mnt, const int mode)
84565+{
84566+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
84567+ /* allow chmod +s on directories, but not files */
84568+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
84569+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
84570+ proc_is_chrooted(current)) {
84571+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
84572+ return -EPERM;
84573+ }
84574+#endif
84575+ return 0;
84576+}
84577diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
84578new file mode 100644
84579index 0000000..946f750
84580--- /dev/null
84581+++ b/grsecurity/grsec_disabled.c
84582@@ -0,0 +1,445 @@
84583+#include <linux/kernel.h>
84584+#include <linux/module.h>
84585+#include <linux/sched.h>
84586+#include <linux/file.h>
84587+#include <linux/fs.h>
84588+#include <linux/kdev_t.h>
84589+#include <linux/net.h>
84590+#include <linux/in.h>
84591+#include <linux/ip.h>
84592+#include <linux/skbuff.h>
84593+#include <linux/sysctl.h>
84594+
84595+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84596+void
84597+pax_set_initial_flags(struct linux_binprm *bprm)
84598+{
84599+ return;
84600+}
84601+#endif
84602+
84603+#ifdef CONFIG_SYSCTL
84604+__u32
84605+gr_handle_sysctl(const struct ctl_table * table, const int op)
84606+{
84607+ return 0;
84608+}
84609+#endif
84610+
84611+#ifdef CONFIG_TASKSTATS
84612+int gr_is_taskstats_denied(int pid)
84613+{
84614+ return 0;
84615+}
84616+#endif
84617+
84618+int
84619+gr_acl_is_enabled(void)
84620+{
84621+ return 0;
84622+}
84623+
84624+int
84625+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
84626+{
84627+ return 0;
84628+}
84629+
84630+void
84631+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
84632+{
84633+ return;
84634+}
84635+
84636+int
84637+gr_handle_rawio(const struct inode *inode)
84638+{
84639+ return 0;
84640+}
84641+
84642+void
84643+gr_acl_handle_psacct(struct task_struct *task, const long code)
84644+{
84645+ return;
84646+}
84647+
84648+int
84649+gr_handle_ptrace(struct task_struct *task, const long request)
84650+{
84651+ return 0;
84652+}
84653+
84654+int
84655+gr_handle_proc_ptrace(struct task_struct *task)
84656+{
84657+ return 0;
84658+}
84659+
84660+int
84661+gr_set_acls(const int type)
84662+{
84663+ return 0;
84664+}
84665+
84666+int
84667+gr_check_hidden_task(const struct task_struct *tsk)
84668+{
84669+ return 0;
84670+}
84671+
84672+int
84673+gr_check_protected_task(const struct task_struct *task)
84674+{
84675+ return 0;
84676+}
84677+
84678+int
84679+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
84680+{
84681+ return 0;
84682+}
84683+
84684+void
84685+gr_copy_label(struct task_struct *tsk)
84686+{
84687+ return;
84688+}
84689+
84690+void
84691+gr_set_pax_flags(struct task_struct *task)
84692+{
84693+ return;
84694+}
84695+
84696+int
84697+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
84698+ const int unsafe_share)
84699+{
84700+ return 0;
84701+}
84702+
84703+void
84704+gr_handle_delete(const u64 ino, const dev_t dev)
84705+{
84706+ return;
84707+}
84708+
84709+void
84710+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
84711+{
84712+ return;
84713+}
84714+
84715+void
84716+gr_handle_crash(struct task_struct *task, const int sig)
84717+{
84718+ return;
84719+}
84720+
84721+int
84722+gr_check_crash_exec(const struct file *filp)
84723+{
84724+ return 0;
84725+}
84726+
84727+int
84728+gr_check_crash_uid(const kuid_t uid)
84729+{
84730+ return 0;
84731+}
84732+
84733+void
84734+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
84735+ struct dentry *old_dentry,
84736+ struct dentry *new_dentry,
84737+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
84738+{
84739+ return;
84740+}
84741+
84742+int
84743+gr_search_socket(const int family, const int type, const int protocol)
84744+{
84745+ return 1;
84746+}
84747+
84748+int
84749+gr_search_connectbind(const int mode, const struct socket *sock,
84750+ const struct sockaddr_in *addr)
84751+{
84752+ return 0;
84753+}
84754+
84755+void
84756+gr_handle_alertkill(struct task_struct *task)
84757+{
84758+ return;
84759+}
84760+
84761+__u32
84762+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
84763+{
84764+ return 1;
84765+}
84766+
84767+__u32
84768+gr_acl_handle_hidden_file(const struct dentry * dentry,
84769+ const struct vfsmount * mnt)
84770+{
84771+ return 1;
84772+}
84773+
84774+__u32
84775+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
84776+ int acc_mode)
84777+{
84778+ return 1;
84779+}
84780+
84781+__u32
84782+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
84783+{
84784+ return 1;
84785+}
84786+
84787+__u32
84788+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
84789+{
84790+ return 1;
84791+}
84792+
84793+int
84794+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
84795+ unsigned int *vm_flags)
84796+{
84797+ return 1;
84798+}
84799+
84800+__u32
84801+gr_acl_handle_truncate(const struct dentry * dentry,
84802+ const struct vfsmount * mnt)
84803+{
84804+ return 1;
84805+}
84806+
84807+__u32
84808+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
84809+{
84810+ return 1;
84811+}
84812+
84813+__u32
84814+gr_acl_handle_access(const struct dentry * dentry,
84815+ const struct vfsmount * mnt, const int fmode)
84816+{
84817+ return 1;
84818+}
84819+
84820+__u32
84821+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
84822+ umode_t *mode)
84823+{
84824+ return 1;
84825+}
84826+
84827+__u32
84828+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
84829+{
84830+ return 1;
84831+}
84832+
84833+__u32
84834+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
84835+{
84836+ return 1;
84837+}
84838+
84839+__u32
84840+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
84841+{
84842+ return 1;
84843+}
84844+
84845+void
84846+grsecurity_init(void)
84847+{
84848+ return;
84849+}
84850+
84851+umode_t gr_acl_umask(void)
84852+{
84853+ return 0;
84854+}
84855+
84856+__u32
84857+gr_acl_handle_mknod(const struct dentry * new_dentry,
84858+ const struct dentry * parent_dentry,
84859+ const struct vfsmount * parent_mnt,
84860+ const int mode)
84861+{
84862+ return 1;
84863+}
84864+
84865+__u32
84866+gr_acl_handle_mkdir(const struct dentry * new_dentry,
84867+ const struct dentry * parent_dentry,
84868+ const struct vfsmount * parent_mnt)
84869+{
84870+ return 1;
84871+}
84872+
84873+__u32
84874+gr_acl_handle_symlink(const struct dentry * new_dentry,
84875+ const struct dentry * parent_dentry,
84876+ const struct vfsmount * parent_mnt, const struct filename *from)
84877+{
84878+ return 1;
84879+}
84880+
84881+__u32
84882+gr_acl_handle_link(const struct dentry * new_dentry,
84883+ const struct dentry * parent_dentry,
84884+ const struct vfsmount * parent_mnt,
84885+ const struct dentry * old_dentry,
84886+ const struct vfsmount * old_mnt, const struct filename *to)
84887+{
84888+ return 1;
84889+}
84890+
84891+int
84892+gr_acl_handle_rename(const struct dentry *new_dentry,
84893+ const struct dentry *parent_dentry,
84894+ const struct vfsmount *parent_mnt,
84895+ const struct dentry *old_dentry,
84896+ const struct inode *old_parent_inode,
84897+ const struct vfsmount *old_mnt, const struct filename *newname,
84898+ unsigned int flags)
84899+{
84900+ return 0;
84901+}
84902+
84903+int
84904+gr_acl_handle_filldir(const struct file *file, const char *name,
84905+ const int namelen, const u64 ino)
84906+{
84907+ return 1;
84908+}
84909+
84910+int
84911+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84912+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84913+{
84914+ return 1;
84915+}
84916+
84917+int
84918+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
84919+{
84920+ return 0;
84921+}
84922+
84923+int
84924+gr_search_accept(const struct socket *sock)
84925+{
84926+ return 0;
84927+}
84928+
84929+int
84930+gr_search_listen(const struct socket *sock)
84931+{
84932+ return 0;
84933+}
84934+
84935+int
84936+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
84937+{
84938+ return 0;
84939+}
84940+
84941+__u32
84942+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
84943+{
84944+ return 1;
84945+}
84946+
84947+__u32
84948+gr_acl_handle_creat(const struct dentry * dentry,
84949+ const struct dentry * p_dentry,
84950+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
84951+ const int imode)
84952+{
84953+ return 1;
84954+}
84955+
84956+void
84957+gr_acl_handle_exit(void)
84958+{
84959+ return;
84960+}
84961+
84962+int
84963+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
84964+{
84965+ return 1;
84966+}
84967+
84968+void
84969+gr_set_role_label(const kuid_t uid, const kgid_t gid)
84970+{
84971+ return;
84972+}
84973+
84974+int
84975+gr_acl_handle_procpidmem(const struct task_struct *task)
84976+{
84977+ return 0;
84978+}
84979+
84980+int
84981+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
84982+{
84983+ return 0;
84984+}
84985+
84986+int
84987+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
84988+{
84989+ return 0;
84990+}
84991+
84992+int
84993+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
84994+{
84995+ return 0;
84996+}
84997+
84998+int
84999+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85000+{
85001+ return 0;
85002+}
85003+
85004+int gr_acl_enable_at_secure(void)
85005+{
85006+ return 0;
85007+}
85008+
85009+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
85010+{
85011+ return dentry->d_sb->s_dev;
85012+}
85013+
85014+u64 gr_get_ino_from_dentry(struct dentry *dentry)
85015+{
85016+ return dentry->d_inode->i_ino;
85017+}
85018+
85019+void gr_put_exec_file(struct task_struct *task)
85020+{
85021+ return;
85022+}
85023+
85024+#ifdef CONFIG_SECURITY
85025+EXPORT_SYMBOL_GPL(gr_check_user_change);
85026+EXPORT_SYMBOL_GPL(gr_check_group_change);
85027+#endif
85028diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
85029new file mode 100644
85030index 0000000..fb7531e
85031--- /dev/null
85032+++ b/grsecurity/grsec_exec.c
85033@@ -0,0 +1,189 @@
85034+#include <linux/kernel.h>
85035+#include <linux/sched.h>
85036+#include <linux/file.h>
85037+#include <linux/binfmts.h>
85038+#include <linux/fs.h>
85039+#include <linux/types.h>
85040+#include <linux/grdefs.h>
85041+#include <linux/grsecurity.h>
85042+#include <linux/grinternal.h>
85043+#include <linux/capability.h>
85044+#include <linux/module.h>
85045+#include <linux/compat.h>
85046+
85047+#include <asm/uaccess.h>
85048+
85049+#ifdef CONFIG_GRKERNSEC_EXECLOG
85050+static char gr_exec_arg_buf[132];
85051+static DEFINE_MUTEX(gr_exec_arg_mutex);
85052+#endif
85053+
85054+struct user_arg_ptr {
85055+#ifdef CONFIG_COMPAT
85056+ bool is_compat;
85057+#endif
85058+ union {
85059+ const char __user *const __user *native;
85060+#ifdef CONFIG_COMPAT
85061+ const compat_uptr_t __user *compat;
85062+#endif
85063+ } ptr;
85064+};
85065+
85066+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
85067+
85068+void
85069+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
85070+{
85071+#ifdef CONFIG_GRKERNSEC_EXECLOG
85072+ char *grarg = gr_exec_arg_buf;
85073+ unsigned int i, x, execlen = 0;
85074+ char c;
85075+
85076+ if (!((grsec_enable_execlog && grsec_enable_group &&
85077+ in_group_p(grsec_audit_gid))
85078+ || (grsec_enable_execlog && !grsec_enable_group)))
85079+ return;
85080+
85081+ mutex_lock(&gr_exec_arg_mutex);
85082+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
85083+
85084+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
85085+ const char __user *p;
85086+ unsigned int len;
85087+
85088+ p = get_user_arg_ptr(argv, i);
85089+ if (IS_ERR(p))
85090+ goto log;
85091+
85092+ len = strnlen_user(p, 128 - execlen);
85093+ if (len > 128 - execlen)
85094+ len = 128 - execlen;
85095+ else if (len > 0)
85096+ len--;
85097+ if (copy_from_user(grarg + execlen, p, len))
85098+ goto log;
85099+
85100+ /* rewrite unprintable characters */
85101+ for (x = 0; x < len; x++) {
85102+ c = *(grarg + execlen + x);
85103+ if (c < 32 || c > 126)
85104+ *(grarg + execlen + x) = ' ';
85105+ }
85106+
85107+ execlen += len;
85108+ *(grarg + execlen) = ' ';
85109+ *(grarg + execlen + 1) = '\0';
85110+ execlen++;
85111+ }
85112+
85113+ log:
85114+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
85115+ bprm->file->f_path.mnt, grarg);
85116+ mutex_unlock(&gr_exec_arg_mutex);
85117+#endif
85118+ return;
85119+}
85120+
85121+#ifdef CONFIG_GRKERNSEC
85122+extern int gr_acl_is_capable(const int cap);
85123+extern int gr_acl_is_capable_nolog(const int cap);
85124+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85125+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
85126+extern int gr_chroot_is_capable(const int cap);
85127+extern int gr_chroot_is_capable_nolog(const int cap);
85128+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85129+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
85130+#endif
85131+
85132+const char *captab_log[] = {
85133+ "CAP_CHOWN",
85134+ "CAP_DAC_OVERRIDE",
85135+ "CAP_DAC_READ_SEARCH",
85136+ "CAP_FOWNER",
85137+ "CAP_FSETID",
85138+ "CAP_KILL",
85139+ "CAP_SETGID",
85140+ "CAP_SETUID",
85141+ "CAP_SETPCAP",
85142+ "CAP_LINUX_IMMUTABLE",
85143+ "CAP_NET_BIND_SERVICE",
85144+ "CAP_NET_BROADCAST",
85145+ "CAP_NET_ADMIN",
85146+ "CAP_NET_RAW",
85147+ "CAP_IPC_LOCK",
85148+ "CAP_IPC_OWNER",
85149+ "CAP_SYS_MODULE",
85150+ "CAP_SYS_RAWIO",
85151+ "CAP_SYS_CHROOT",
85152+ "CAP_SYS_PTRACE",
85153+ "CAP_SYS_PACCT",
85154+ "CAP_SYS_ADMIN",
85155+ "CAP_SYS_BOOT",
85156+ "CAP_SYS_NICE",
85157+ "CAP_SYS_RESOURCE",
85158+ "CAP_SYS_TIME",
85159+ "CAP_SYS_TTY_CONFIG",
85160+ "CAP_MKNOD",
85161+ "CAP_LEASE",
85162+ "CAP_AUDIT_WRITE",
85163+ "CAP_AUDIT_CONTROL",
85164+ "CAP_SETFCAP",
85165+ "CAP_MAC_OVERRIDE",
85166+ "CAP_MAC_ADMIN",
85167+ "CAP_SYSLOG",
85168+ "CAP_WAKE_ALARM",
85169+ "CAP_BLOCK_SUSPEND",
85170+ "CAP_AUDIT_READ"
85171+};
85172+
85173+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
85174+
85175+int gr_is_capable(const int cap)
85176+{
85177+#ifdef CONFIG_GRKERNSEC
85178+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
85179+ return 1;
85180+ return 0;
85181+#else
85182+ return 1;
85183+#endif
85184+}
85185+
85186+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
85187+{
85188+#ifdef CONFIG_GRKERNSEC
85189+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
85190+ return 1;
85191+ return 0;
85192+#else
85193+ return 1;
85194+#endif
85195+}
85196+
85197+int gr_is_capable_nolog(const int cap)
85198+{
85199+#ifdef CONFIG_GRKERNSEC
85200+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
85201+ return 1;
85202+ return 0;
85203+#else
85204+ return 1;
85205+#endif
85206+}
85207+
85208+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
85209+{
85210+#ifdef CONFIG_GRKERNSEC
85211+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
85212+ return 1;
85213+ return 0;
85214+#else
85215+ return 1;
85216+#endif
85217+}
85218+
85219+EXPORT_SYMBOL_GPL(gr_is_capable);
85220+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
85221+EXPORT_SYMBOL_GPL(gr_task_is_capable);
85222+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
85223diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
85224new file mode 100644
85225index 0000000..06cc6ea
85226--- /dev/null
85227+++ b/grsecurity/grsec_fifo.c
85228@@ -0,0 +1,24 @@
85229+#include <linux/kernel.h>
85230+#include <linux/sched.h>
85231+#include <linux/fs.h>
85232+#include <linux/file.h>
85233+#include <linux/grinternal.h>
85234+
85235+int
85236+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
85237+ const struct dentry *dir, const int flag, const int acc_mode)
85238+{
85239+#ifdef CONFIG_GRKERNSEC_FIFO
85240+ const struct cred *cred = current_cred();
85241+
85242+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
85243+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
85244+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
85245+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
85246+ if (!inode_permission(dentry->d_inode, acc_mode))
85247+ 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));
85248+ return -EACCES;
85249+ }
85250+#endif
85251+ return 0;
85252+}
85253diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
85254new file mode 100644
85255index 0000000..8ca18bf
85256--- /dev/null
85257+++ b/grsecurity/grsec_fork.c
85258@@ -0,0 +1,23 @@
85259+#include <linux/kernel.h>
85260+#include <linux/sched.h>
85261+#include <linux/grsecurity.h>
85262+#include <linux/grinternal.h>
85263+#include <linux/errno.h>
85264+
85265+void
85266+gr_log_forkfail(const int retval)
85267+{
85268+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85269+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
85270+ switch (retval) {
85271+ case -EAGAIN:
85272+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
85273+ break;
85274+ case -ENOMEM:
85275+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
85276+ break;
85277+ }
85278+ }
85279+#endif
85280+ return;
85281+}
85282diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
85283new file mode 100644
85284index 0000000..4ed9e7d
85285--- /dev/null
85286+++ b/grsecurity/grsec_init.c
85287@@ -0,0 +1,290 @@
85288+#include <linux/kernel.h>
85289+#include <linux/sched.h>
85290+#include <linux/mm.h>
85291+#include <linux/gracl.h>
85292+#include <linux/slab.h>
85293+#include <linux/vmalloc.h>
85294+#include <linux/percpu.h>
85295+#include <linux/module.h>
85296+
85297+int grsec_enable_ptrace_readexec;
85298+int grsec_enable_setxid;
85299+int grsec_enable_symlinkown;
85300+kgid_t grsec_symlinkown_gid;
85301+int grsec_enable_brute;
85302+int grsec_enable_link;
85303+int grsec_enable_dmesg;
85304+int grsec_enable_harden_ptrace;
85305+int grsec_enable_harden_ipc;
85306+int grsec_enable_fifo;
85307+int grsec_enable_execlog;
85308+int grsec_enable_signal;
85309+int grsec_enable_forkfail;
85310+int grsec_enable_audit_ptrace;
85311+int grsec_enable_time;
85312+int grsec_enable_group;
85313+kgid_t grsec_audit_gid;
85314+int grsec_enable_chdir;
85315+int grsec_enable_mount;
85316+int grsec_enable_rofs;
85317+int grsec_deny_new_usb;
85318+int grsec_enable_chroot_findtask;
85319+int grsec_enable_chroot_mount;
85320+int grsec_enable_chroot_shmat;
85321+int grsec_enable_chroot_fchdir;
85322+int grsec_enable_chroot_double;
85323+int grsec_enable_chroot_pivot;
85324+int grsec_enable_chroot_chdir;
85325+int grsec_enable_chroot_chmod;
85326+int grsec_enable_chroot_mknod;
85327+int grsec_enable_chroot_nice;
85328+int grsec_enable_chroot_execlog;
85329+int grsec_enable_chroot_caps;
85330+int grsec_enable_chroot_rename;
85331+int grsec_enable_chroot_sysctl;
85332+int grsec_enable_chroot_unix;
85333+int grsec_enable_tpe;
85334+kgid_t grsec_tpe_gid;
85335+int grsec_enable_blackhole;
85336+#ifdef CONFIG_IPV6_MODULE
85337+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
85338+#endif
85339+int grsec_lastack_retries;
85340+int grsec_enable_tpe_all;
85341+int grsec_enable_tpe_invert;
85342+int grsec_enable_socket_all;
85343+kgid_t grsec_socket_all_gid;
85344+int grsec_enable_socket_client;
85345+kgid_t grsec_socket_client_gid;
85346+int grsec_enable_socket_server;
85347+kgid_t grsec_socket_server_gid;
85348+int grsec_resource_logging;
85349+int grsec_disable_privio;
85350+int grsec_enable_log_rwxmaps;
85351+int grsec_lock;
85352+
85353+DEFINE_SPINLOCK(grsec_alert_lock);
85354+unsigned long grsec_alert_wtime = 0;
85355+unsigned long grsec_alert_fyet = 0;
85356+
85357+DEFINE_SPINLOCK(grsec_audit_lock);
85358+
85359+DEFINE_RWLOCK(grsec_exec_file_lock);
85360+
85361+char *gr_shared_page[4];
85362+
85363+char *gr_alert_log_fmt;
85364+char *gr_audit_log_fmt;
85365+char *gr_alert_log_buf;
85366+char *gr_audit_log_buf;
85367+
85368+extern struct gr_arg *gr_usermode;
85369+extern unsigned char *gr_system_salt;
85370+extern unsigned char *gr_system_sum;
85371+
85372+void __init
85373+grsecurity_init(void)
85374+{
85375+ int j;
85376+ /* create the per-cpu shared pages */
85377+
85378+#ifdef CONFIG_X86
85379+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
85380+#endif
85381+
85382+ for (j = 0; j < 4; j++) {
85383+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
85384+ if (gr_shared_page[j] == NULL) {
85385+ panic("Unable to allocate grsecurity shared page");
85386+ return;
85387+ }
85388+ }
85389+
85390+ /* allocate log buffers */
85391+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
85392+ if (!gr_alert_log_fmt) {
85393+ panic("Unable to allocate grsecurity alert log format buffer");
85394+ return;
85395+ }
85396+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
85397+ if (!gr_audit_log_fmt) {
85398+ panic("Unable to allocate grsecurity audit log format buffer");
85399+ return;
85400+ }
85401+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85402+ if (!gr_alert_log_buf) {
85403+ panic("Unable to allocate grsecurity alert log buffer");
85404+ return;
85405+ }
85406+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85407+ if (!gr_audit_log_buf) {
85408+ panic("Unable to allocate grsecurity audit log buffer");
85409+ return;
85410+ }
85411+
85412+ /* allocate memory for authentication structure */
85413+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
85414+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
85415+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
85416+
85417+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
85418+ panic("Unable to allocate grsecurity authentication structure");
85419+ return;
85420+ }
85421+
85422+#ifdef CONFIG_GRKERNSEC_IO
85423+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
85424+ grsec_disable_privio = 1;
85425+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85426+ grsec_disable_privio = 1;
85427+#else
85428+ grsec_disable_privio = 0;
85429+#endif
85430+#endif
85431+
85432+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
85433+ /* for backward compatibility, tpe_invert always defaults to on if
85434+ enabled in the kernel
85435+ */
85436+ grsec_enable_tpe_invert = 1;
85437+#endif
85438+
85439+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85440+#ifndef CONFIG_GRKERNSEC_SYSCTL
85441+ grsec_lock = 1;
85442+#endif
85443+
85444+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
85445+ grsec_enable_log_rwxmaps = 1;
85446+#endif
85447+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
85448+ grsec_enable_group = 1;
85449+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
85450+#endif
85451+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
85452+ grsec_enable_ptrace_readexec = 1;
85453+#endif
85454+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
85455+ grsec_enable_chdir = 1;
85456+#endif
85457+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85458+ grsec_enable_harden_ptrace = 1;
85459+#endif
85460+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85461+ grsec_enable_harden_ipc = 1;
85462+#endif
85463+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
85464+ grsec_enable_mount = 1;
85465+#endif
85466+#ifdef CONFIG_GRKERNSEC_LINK
85467+ grsec_enable_link = 1;
85468+#endif
85469+#ifdef CONFIG_GRKERNSEC_BRUTE
85470+ grsec_enable_brute = 1;
85471+#endif
85472+#ifdef CONFIG_GRKERNSEC_DMESG
85473+ grsec_enable_dmesg = 1;
85474+#endif
85475+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
85476+ grsec_enable_blackhole = 1;
85477+ grsec_lastack_retries = 4;
85478+#endif
85479+#ifdef CONFIG_GRKERNSEC_FIFO
85480+ grsec_enable_fifo = 1;
85481+#endif
85482+#ifdef CONFIG_GRKERNSEC_EXECLOG
85483+ grsec_enable_execlog = 1;
85484+#endif
85485+#ifdef CONFIG_GRKERNSEC_SETXID
85486+ grsec_enable_setxid = 1;
85487+#endif
85488+#ifdef CONFIG_GRKERNSEC_SIGNAL
85489+ grsec_enable_signal = 1;
85490+#endif
85491+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85492+ grsec_enable_forkfail = 1;
85493+#endif
85494+#ifdef CONFIG_GRKERNSEC_TIME
85495+ grsec_enable_time = 1;
85496+#endif
85497+#ifdef CONFIG_GRKERNSEC_RESLOG
85498+ grsec_resource_logging = 1;
85499+#endif
85500+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85501+ grsec_enable_chroot_findtask = 1;
85502+#endif
85503+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
85504+ grsec_enable_chroot_unix = 1;
85505+#endif
85506+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
85507+ grsec_enable_chroot_mount = 1;
85508+#endif
85509+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
85510+ grsec_enable_chroot_fchdir = 1;
85511+#endif
85512+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
85513+ grsec_enable_chroot_shmat = 1;
85514+#endif
85515+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
85516+ grsec_enable_audit_ptrace = 1;
85517+#endif
85518+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
85519+ grsec_enable_chroot_double = 1;
85520+#endif
85521+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
85522+ grsec_enable_chroot_pivot = 1;
85523+#endif
85524+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
85525+ grsec_enable_chroot_chdir = 1;
85526+#endif
85527+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
85528+ grsec_enable_chroot_chmod = 1;
85529+#endif
85530+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
85531+ grsec_enable_chroot_mknod = 1;
85532+#endif
85533+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
85534+ grsec_enable_chroot_nice = 1;
85535+#endif
85536+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
85537+ grsec_enable_chroot_execlog = 1;
85538+#endif
85539+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
85540+ grsec_enable_chroot_caps = 1;
85541+#endif
85542+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
85543+ grsec_enable_chroot_rename = 1;
85544+#endif
85545+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
85546+ grsec_enable_chroot_sysctl = 1;
85547+#endif
85548+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85549+ grsec_enable_symlinkown = 1;
85550+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
85551+#endif
85552+#ifdef CONFIG_GRKERNSEC_TPE
85553+ grsec_enable_tpe = 1;
85554+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
85555+#ifdef CONFIG_GRKERNSEC_TPE_ALL
85556+ grsec_enable_tpe_all = 1;
85557+#endif
85558+#endif
85559+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
85560+ grsec_enable_socket_all = 1;
85561+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
85562+#endif
85563+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
85564+ grsec_enable_socket_client = 1;
85565+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
85566+#endif
85567+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
85568+ grsec_enable_socket_server = 1;
85569+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
85570+#endif
85571+#endif
85572+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
85573+ grsec_deny_new_usb = 1;
85574+#endif
85575+
85576+ return;
85577+}
85578diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
85579new file mode 100644
85580index 0000000..1773300
85581--- /dev/null
85582+++ b/grsecurity/grsec_ipc.c
85583@@ -0,0 +1,48 @@
85584+#include <linux/kernel.h>
85585+#include <linux/mm.h>
85586+#include <linux/sched.h>
85587+#include <linux/file.h>
85588+#include <linux/ipc.h>
85589+#include <linux/ipc_namespace.h>
85590+#include <linux/grsecurity.h>
85591+#include <linux/grinternal.h>
85592+
85593+int
85594+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
85595+{
85596+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85597+ int write;
85598+ int orig_granted_mode;
85599+ kuid_t euid;
85600+ kgid_t egid;
85601+
85602+ if (!grsec_enable_harden_ipc)
85603+ return 1;
85604+
85605+ euid = current_euid();
85606+ egid = current_egid();
85607+
85608+ write = requested_mode & 00002;
85609+ orig_granted_mode = ipcp->mode;
85610+
85611+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
85612+ orig_granted_mode >>= 6;
85613+ else {
85614+ /* if likely wrong permissions, lock to user */
85615+ if (orig_granted_mode & 0007)
85616+ orig_granted_mode = 0;
85617+ /* otherwise do a egid-only check */
85618+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
85619+ orig_granted_mode >>= 3;
85620+ /* otherwise, no access */
85621+ else
85622+ orig_granted_mode = 0;
85623+ }
85624+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
85625+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
85626+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
85627+ return 0;
85628+ }
85629+#endif
85630+ return 1;
85631+}
85632diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
85633new file mode 100644
85634index 0000000..5e05e20
85635--- /dev/null
85636+++ b/grsecurity/grsec_link.c
85637@@ -0,0 +1,58 @@
85638+#include <linux/kernel.h>
85639+#include <linux/sched.h>
85640+#include <linux/fs.h>
85641+#include <linux/file.h>
85642+#include <linux/grinternal.h>
85643+
85644+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
85645+{
85646+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85647+ const struct inode *link_inode = link->dentry->d_inode;
85648+
85649+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
85650+ /* ignore root-owned links, e.g. /proc/self */
85651+ gr_is_global_nonroot(link_inode->i_uid) && target &&
85652+ !uid_eq(link_inode->i_uid, target->i_uid)) {
85653+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
85654+ return 1;
85655+ }
85656+#endif
85657+ return 0;
85658+}
85659+
85660+int
85661+gr_handle_follow_link(const struct inode *parent,
85662+ const struct inode *inode,
85663+ const struct dentry *dentry, const struct vfsmount *mnt)
85664+{
85665+#ifdef CONFIG_GRKERNSEC_LINK
85666+ const struct cred *cred = current_cred();
85667+
85668+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
85669+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
85670+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
85671+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
85672+ return -EACCES;
85673+ }
85674+#endif
85675+ return 0;
85676+}
85677+
85678+int
85679+gr_handle_hardlink(const struct dentry *dentry,
85680+ const struct vfsmount *mnt,
85681+ struct inode *inode, const int mode, const struct filename *to)
85682+{
85683+#ifdef CONFIG_GRKERNSEC_LINK
85684+ const struct cred *cred = current_cred();
85685+
85686+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
85687+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
85688+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
85689+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
85690+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
85691+ return -EPERM;
85692+ }
85693+#endif
85694+ return 0;
85695+}
85696diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
85697new file mode 100644
85698index 0000000..dbe0a6b
85699--- /dev/null
85700+++ b/grsecurity/grsec_log.c
85701@@ -0,0 +1,341 @@
85702+#include <linux/kernel.h>
85703+#include <linux/sched.h>
85704+#include <linux/file.h>
85705+#include <linux/tty.h>
85706+#include <linux/fs.h>
85707+#include <linux/mm.h>
85708+#include <linux/grinternal.h>
85709+
85710+#ifdef CONFIG_TREE_PREEMPT_RCU
85711+#define DISABLE_PREEMPT() preempt_disable()
85712+#define ENABLE_PREEMPT() preempt_enable()
85713+#else
85714+#define DISABLE_PREEMPT()
85715+#define ENABLE_PREEMPT()
85716+#endif
85717+
85718+#define BEGIN_LOCKS(x) \
85719+ DISABLE_PREEMPT(); \
85720+ rcu_read_lock(); \
85721+ read_lock(&tasklist_lock); \
85722+ read_lock(&grsec_exec_file_lock); \
85723+ if (x != GR_DO_AUDIT) \
85724+ spin_lock(&grsec_alert_lock); \
85725+ else \
85726+ spin_lock(&grsec_audit_lock)
85727+
85728+#define END_LOCKS(x) \
85729+ if (x != GR_DO_AUDIT) \
85730+ spin_unlock(&grsec_alert_lock); \
85731+ else \
85732+ spin_unlock(&grsec_audit_lock); \
85733+ read_unlock(&grsec_exec_file_lock); \
85734+ read_unlock(&tasklist_lock); \
85735+ rcu_read_unlock(); \
85736+ ENABLE_PREEMPT(); \
85737+ if (x == GR_DONT_AUDIT) \
85738+ gr_handle_alertkill(current)
85739+
85740+enum {
85741+ FLOODING,
85742+ NO_FLOODING
85743+};
85744+
85745+extern char *gr_alert_log_fmt;
85746+extern char *gr_audit_log_fmt;
85747+extern char *gr_alert_log_buf;
85748+extern char *gr_audit_log_buf;
85749+
85750+static int gr_log_start(int audit)
85751+{
85752+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
85753+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
85754+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85755+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
85756+ unsigned long curr_secs = get_seconds();
85757+
85758+ if (audit == GR_DO_AUDIT)
85759+ goto set_fmt;
85760+
85761+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
85762+ grsec_alert_wtime = curr_secs;
85763+ grsec_alert_fyet = 0;
85764+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
85765+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
85766+ grsec_alert_fyet++;
85767+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
85768+ grsec_alert_wtime = curr_secs;
85769+ grsec_alert_fyet++;
85770+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
85771+ return FLOODING;
85772+ }
85773+ else return FLOODING;
85774+
85775+set_fmt:
85776+#endif
85777+ memset(buf, 0, PAGE_SIZE);
85778+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
85779+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
85780+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85781+ } else if (current->signal->curr_ip) {
85782+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
85783+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
85784+ } else if (gr_acl_is_enabled()) {
85785+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
85786+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85787+ } else {
85788+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
85789+ strcpy(buf, fmt);
85790+ }
85791+
85792+ return NO_FLOODING;
85793+}
85794+
85795+static void gr_log_middle(int audit, const char *msg, va_list ap)
85796+ __attribute__ ((format (printf, 2, 0)));
85797+
85798+static void gr_log_middle(int audit, const char *msg, va_list ap)
85799+{
85800+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85801+ unsigned int len = strlen(buf);
85802+
85803+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85804+
85805+ return;
85806+}
85807+
85808+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85809+ __attribute__ ((format (printf, 2, 3)));
85810+
85811+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85812+{
85813+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85814+ unsigned int len = strlen(buf);
85815+ va_list ap;
85816+
85817+ va_start(ap, msg);
85818+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85819+ va_end(ap);
85820+
85821+ return;
85822+}
85823+
85824+static void gr_log_end(int audit, int append_default)
85825+{
85826+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85827+ if (append_default) {
85828+ struct task_struct *task = current;
85829+ struct task_struct *parent = task->real_parent;
85830+ const struct cred *cred = __task_cred(task);
85831+ const struct cred *pcred = __task_cred(parent);
85832+ unsigned int len = strlen(buf);
85833+
85834+ 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));
85835+ }
85836+
85837+ printk("%s\n", buf);
85838+
85839+ return;
85840+}
85841+
85842+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
85843+{
85844+ int logtype;
85845+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
85846+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
85847+ void *voidptr = NULL;
85848+ int num1 = 0, num2 = 0;
85849+ unsigned long ulong1 = 0, ulong2 = 0;
85850+ struct dentry *dentry = NULL;
85851+ struct vfsmount *mnt = NULL;
85852+ struct file *file = NULL;
85853+ struct task_struct *task = NULL;
85854+ struct vm_area_struct *vma = NULL;
85855+ const struct cred *cred, *pcred;
85856+ va_list ap;
85857+
85858+ BEGIN_LOCKS(audit);
85859+ logtype = gr_log_start(audit);
85860+ if (logtype == FLOODING) {
85861+ END_LOCKS(audit);
85862+ return;
85863+ }
85864+ va_start(ap, argtypes);
85865+ switch (argtypes) {
85866+ case GR_TTYSNIFF:
85867+ task = va_arg(ap, struct task_struct *);
85868+ 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));
85869+ break;
85870+ case GR_SYSCTL_HIDDEN:
85871+ str1 = va_arg(ap, char *);
85872+ gr_log_middle_varargs(audit, msg, result, str1);
85873+ break;
85874+ case GR_RBAC:
85875+ dentry = va_arg(ap, struct dentry *);
85876+ mnt = va_arg(ap, struct vfsmount *);
85877+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
85878+ break;
85879+ case GR_RBAC_STR:
85880+ dentry = va_arg(ap, struct dentry *);
85881+ mnt = va_arg(ap, struct vfsmount *);
85882+ str1 = va_arg(ap, char *);
85883+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
85884+ break;
85885+ case GR_STR_RBAC:
85886+ str1 = va_arg(ap, char *);
85887+ dentry = va_arg(ap, struct dentry *);
85888+ mnt = va_arg(ap, struct vfsmount *);
85889+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
85890+ break;
85891+ case GR_RBAC_MODE2:
85892+ dentry = va_arg(ap, struct dentry *);
85893+ mnt = va_arg(ap, struct vfsmount *);
85894+ str1 = va_arg(ap, char *);
85895+ str2 = va_arg(ap, char *);
85896+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
85897+ break;
85898+ case GR_RBAC_MODE3:
85899+ dentry = va_arg(ap, struct dentry *);
85900+ mnt = va_arg(ap, struct vfsmount *);
85901+ str1 = va_arg(ap, char *);
85902+ str2 = va_arg(ap, char *);
85903+ str3 = va_arg(ap, char *);
85904+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
85905+ break;
85906+ case GR_FILENAME:
85907+ dentry = va_arg(ap, struct dentry *);
85908+ mnt = va_arg(ap, struct vfsmount *);
85909+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
85910+ break;
85911+ case GR_STR_FILENAME:
85912+ str1 = va_arg(ap, char *);
85913+ dentry = va_arg(ap, struct dentry *);
85914+ mnt = va_arg(ap, struct vfsmount *);
85915+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
85916+ break;
85917+ case GR_FILENAME_STR:
85918+ dentry = va_arg(ap, struct dentry *);
85919+ mnt = va_arg(ap, struct vfsmount *);
85920+ str1 = va_arg(ap, char *);
85921+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
85922+ break;
85923+ case GR_FILENAME_TWO_INT:
85924+ dentry = va_arg(ap, struct dentry *);
85925+ mnt = va_arg(ap, struct vfsmount *);
85926+ num1 = va_arg(ap, int);
85927+ num2 = va_arg(ap, int);
85928+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
85929+ break;
85930+ case GR_FILENAME_TWO_INT_STR:
85931+ dentry = va_arg(ap, struct dentry *);
85932+ mnt = va_arg(ap, struct vfsmount *);
85933+ num1 = va_arg(ap, int);
85934+ num2 = va_arg(ap, int);
85935+ str1 = va_arg(ap, char *);
85936+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
85937+ break;
85938+ case GR_TEXTREL:
85939+ file = va_arg(ap, struct file *);
85940+ ulong1 = va_arg(ap, unsigned long);
85941+ ulong2 = va_arg(ap, unsigned long);
85942+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
85943+ break;
85944+ case GR_PTRACE:
85945+ task = va_arg(ap, struct task_struct *);
85946+ 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));
85947+ break;
85948+ case GR_RESOURCE:
85949+ task = va_arg(ap, struct task_struct *);
85950+ cred = __task_cred(task);
85951+ pcred = __task_cred(task->real_parent);
85952+ ulong1 = va_arg(ap, unsigned long);
85953+ str1 = va_arg(ap, char *);
85954+ ulong2 = va_arg(ap, unsigned long);
85955+ 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));
85956+ break;
85957+ case GR_CAP:
85958+ task = va_arg(ap, struct task_struct *);
85959+ cred = __task_cred(task);
85960+ pcred = __task_cred(task->real_parent);
85961+ str1 = va_arg(ap, char *);
85962+ 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));
85963+ break;
85964+ case GR_SIG:
85965+ str1 = va_arg(ap, char *);
85966+ voidptr = va_arg(ap, void *);
85967+ gr_log_middle_varargs(audit, msg, str1, voidptr);
85968+ break;
85969+ case GR_SIG2:
85970+ task = va_arg(ap, struct task_struct *);
85971+ cred = __task_cred(task);
85972+ pcred = __task_cred(task->real_parent);
85973+ num1 = va_arg(ap, int);
85974+ 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));
85975+ break;
85976+ case GR_CRASH1:
85977+ task = va_arg(ap, struct task_struct *);
85978+ cred = __task_cred(task);
85979+ pcred = __task_cred(task->real_parent);
85980+ ulong1 = va_arg(ap, unsigned long);
85981+ 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);
85982+ break;
85983+ case GR_CRASH2:
85984+ task = va_arg(ap, struct task_struct *);
85985+ cred = __task_cred(task);
85986+ pcred = __task_cred(task->real_parent);
85987+ ulong1 = va_arg(ap, unsigned long);
85988+ 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);
85989+ break;
85990+ case GR_RWXMAP:
85991+ file = va_arg(ap, struct file *);
85992+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
85993+ break;
85994+ case GR_RWXMAPVMA:
85995+ vma = va_arg(ap, struct vm_area_struct *);
85996+ if (vma->vm_file)
85997+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
85998+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
85999+ str1 = "<stack>";
86000+ else if (vma->vm_start <= current->mm->brk &&
86001+ vma->vm_end >= current->mm->start_brk)
86002+ str1 = "<heap>";
86003+ else
86004+ str1 = "<anonymous mapping>";
86005+ gr_log_middle_varargs(audit, msg, str1);
86006+ break;
86007+ case GR_PSACCT:
86008+ {
86009+ unsigned int wday, cday;
86010+ __u8 whr, chr;
86011+ __u8 wmin, cmin;
86012+ __u8 wsec, csec;
86013+ char cur_tty[64] = { 0 };
86014+ char parent_tty[64] = { 0 };
86015+
86016+ task = va_arg(ap, struct task_struct *);
86017+ wday = va_arg(ap, unsigned int);
86018+ cday = va_arg(ap, unsigned int);
86019+ whr = va_arg(ap, int);
86020+ chr = va_arg(ap, int);
86021+ wmin = va_arg(ap, int);
86022+ cmin = va_arg(ap, int);
86023+ wsec = va_arg(ap, int);
86024+ csec = va_arg(ap, int);
86025+ ulong1 = va_arg(ap, unsigned long);
86026+ cred = __task_cred(task);
86027+ pcred = __task_cred(task->real_parent);
86028+
86029+ 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));
86030+ }
86031+ break;
86032+ default:
86033+ gr_log_middle(audit, msg, ap);
86034+ }
86035+ va_end(ap);
86036+ // these don't need DEFAULTSECARGS printed on the end
86037+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
86038+ gr_log_end(audit, 0);
86039+ else
86040+ gr_log_end(audit, 1);
86041+ END_LOCKS(audit);
86042+}
86043diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
86044new file mode 100644
86045index 0000000..0e39d8c
86046--- /dev/null
86047+++ b/grsecurity/grsec_mem.c
86048@@ -0,0 +1,48 @@
86049+#include <linux/kernel.h>
86050+#include <linux/sched.h>
86051+#include <linux/mm.h>
86052+#include <linux/mman.h>
86053+#include <linux/module.h>
86054+#include <linux/grinternal.h>
86055+
86056+void gr_handle_msr_write(void)
86057+{
86058+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
86059+ return;
86060+}
86061+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
86062+
86063+void
86064+gr_handle_ioperm(void)
86065+{
86066+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
86067+ return;
86068+}
86069+
86070+void
86071+gr_handle_iopl(void)
86072+{
86073+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
86074+ return;
86075+}
86076+
86077+void
86078+gr_handle_mem_readwrite(u64 from, u64 to)
86079+{
86080+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
86081+ return;
86082+}
86083+
86084+void
86085+gr_handle_vm86(void)
86086+{
86087+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
86088+ return;
86089+}
86090+
86091+void
86092+gr_log_badprocpid(const char *entry)
86093+{
86094+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
86095+ return;
86096+}
86097diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
86098new file mode 100644
86099index 0000000..6f9eb73
86100--- /dev/null
86101+++ b/grsecurity/grsec_mount.c
86102@@ -0,0 +1,65 @@
86103+#include <linux/kernel.h>
86104+#include <linux/sched.h>
86105+#include <linux/mount.h>
86106+#include <linux/major.h>
86107+#include <linux/grsecurity.h>
86108+#include <linux/grinternal.h>
86109+
86110+void
86111+gr_log_remount(const char *devname, const int retval)
86112+{
86113+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86114+ if (grsec_enable_mount && (retval >= 0))
86115+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
86116+#endif
86117+ return;
86118+}
86119+
86120+void
86121+gr_log_unmount(const char *devname, const int retval)
86122+{
86123+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86124+ if (grsec_enable_mount && (retval >= 0))
86125+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
86126+#endif
86127+ return;
86128+}
86129+
86130+void
86131+gr_log_mount(const char *from, struct path *to, const int retval)
86132+{
86133+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86134+ if (grsec_enable_mount && (retval >= 0))
86135+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
86136+#endif
86137+ return;
86138+}
86139+
86140+int
86141+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
86142+{
86143+#ifdef CONFIG_GRKERNSEC_ROFS
86144+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
86145+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
86146+ return -EPERM;
86147+ } else
86148+ return 0;
86149+#endif
86150+ return 0;
86151+}
86152+
86153+int
86154+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
86155+{
86156+#ifdef CONFIG_GRKERNSEC_ROFS
86157+ struct inode *inode = dentry->d_inode;
86158+
86159+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
86160+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
86161+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
86162+ return -EPERM;
86163+ } else
86164+ return 0;
86165+#endif
86166+ return 0;
86167+}
86168diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
86169new file mode 100644
86170index 0000000..6ee9d50
86171--- /dev/null
86172+++ b/grsecurity/grsec_pax.c
86173@@ -0,0 +1,45 @@
86174+#include <linux/kernel.h>
86175+#include <linux/sched.h>
86176+#include <linux/mm.h>
86177+#include <linux/file.h>
86178+#include <linux/grinternal.h>
86179+#include <linux/grsecurity.h>
86180+
86181+void
86182+gr_log_textrel(struct vm_area_struct * vma)
86183+{
86184+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86185+ if (grsec_enable_log_rwxmaps)
86186+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
86187+#endif
86188+ return;
86189+}
86190+
86191+void gr_log_ptgnustack(struct file *file)
86192+{
86193+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86194+ if (grsec_enable_log_rwxmaps)
86195+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
86196+#endif
86197+ return;
86198+}
86199+
86200+void
86201+gr_log_rwxmmap(struct file *file)
86202+{
86203+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86204+ if (grsec_enable_log_rwxmaps)
86205+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
86206+#endif
86207+ return;
86208+}
86209+
86210+void
86211+gr_log_rwxmprotect(struct vm_area_struct *vma)
86212+{
86213+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86214+ if (grsec_enable_log_rwxmaps)
86215+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
86216+#endif
86217+ return;
86218+}
86219diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
86220new file mode 100644
86221index 0000000..2005a3a
86222--- /dev/null
86223+++ b/grsecurity/grsec_proc.c
86224@@ -0,0 +1,20 @@
86225+#include <linux/kernel.h>
86226+#include <linux/sched.h>
86227+#include <linux/grsecurity.h>
86228+#include <linux/grinternal.h>
86229+
86230+int gr_proc_is_restricted(void)
86231+{
86232+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86233+ const struct cred *cred = current_cred();
86234+#endif
86235+
86236+#ifdef CONFIG_GRKERNSEC_PROC_USER
86237+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
86238+ return -EACCES;
86239+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86240+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
86241+ return -EACCES;
86242+#endif
86243+ return 0;
86244+}
86245diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
86246new file mode 100644
86247index 0000000..f7f29aa
86248--- /dev/null
86249+++ b/grsecurity/grsec_ptrace.c
86250@@ -0,0 +1,30 @@
86251+#include <linux/kernel.h>
86252+#include <linux/sched.h>
86253+#include <linux/grinternal.h>
86254+#include <linux/security.h>
86255+
86256+void
86257+gr_audit_ptrace(struct task_struct *task)
86258+{
86259+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
86260+ if (grsec_enable_audit_ptrace)
86261+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
86262+#endif
86263+ return;
86264+}
86265+
86266+int
86267+gr_ptrace_readexec(struct file *file, int unsafe_flags)
86268+{
86269+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86270+ const struct dentry *dentry = file->f_path.dentry;
86271+ const struct vfsmount *mnt = file->f_path.mnt;
86272+
86273+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
86274+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
86275+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
86276+ return -EACCES;
86277+ }
86278+#endif
86279+ return 0;
86280+}
86281diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
86282new file mode 100644
86283index 0000000..3860c7e
86284--- /dev/null
86285+++ b/grsecurity/grsec_sig.c
86286@@ -0,0 +1,236 @@
86287+#include <linux/kernel.h>
86288+#include <linux/sched.h>
86289+#include <linux/fs.h>
86290+#include <linux/delay.h>
86291+#include <linux/grsecurity.h>
86292+#include <linux/grinternal.h>
86293+#include <linux/hardirq.h>
86294+
86295+char *signames[] = {
86296+ [SIGSEGV] = "Segmentation fault",
86297+ [SIGILL] = "Illegal instruction",
86298+ [SIGABRT] = "Abort",
86299+ [SIGBUS] = "Invalid alignment/Bus error"
86300+};
86301+
86302+void
86303+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
86304+{
86305+#ifdef CONFIG_GRKERNSEC_SIGNAL
86306+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
86307+ (sig == SIGABRT) || (sig == SIGBUS))) {
86308+ if (task_pid_nr(t) == task_pid_nr(current)) {
86309+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
86310+ } else {
86311+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
86312+ }
86313+ }
86314+#endif
86315+ return;
86316+}
86317+
86318+int
86319+gr_handle_signal(const struct task_struct *p, const int sig)
86320+{
86321+#ifdef CONFIG_GRKERNSEC
86322+ /* ignore the 0 signal for protected task checks */
86323+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
86324+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
86325+ return -EPERM;
86326+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
86327+ return -EPERM;
86328+ }
86329+#endif
86330+ return 0;
86331+}
86332+
86333+#ifdef CONFIG_GRKERNSEC
86334+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
86335+
86336+int gr_fake_force_sig(int sig, struct task_struct *t)
86337+{
86338+ unsigned long int flags;
86339+ int ret, blocked, ignored;
86340+ struct k_sigaction *action;
86341+
86342+ spin_lock_irqsave(&t->sighand->siglock, flags);
86343+ action = &t->sighand->action[sig-1];
86344+ ignored = action->sa.sa_handler == SIG_IGN;
86345+ blocked = sigismember(&t->blocked, sig);
86346+ if (blocked || ignored) {
86347+ action->sa.sa_handler = SIG_DFL;
86348+ if (blocked) {
86349+ sigdelset(&t->blocked, sig);
86350+ recalc_sigpending_and_wake(t);
86351+ }
86352+ }
86353+ if (action->sa.sa_handler == SIG_DFL)
86354+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
86355+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
86356+
86357+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
86358+
86359+ return ret;
86360+}
86361+#endif
86362+
86363+#define GR_USER_BAN_TIME (15 * 60)
86364+#define GR_DAEMON_BRUTE_TIME (30 * 60)
86365+
86366+void gr_handle_brute_attach(int dumpable)
86367+{
86368+#ifdef CONFIG_GRKERNSEC_BRUTE
86369+ struct task_struct *p = current;
86370+ kuid_t uid = GLOBAL_ROOT_UID;
86371+ int daemon = 0;
86372+
86373+ if (!grsec_enable_brute)
86374+ return;
86375+
86376+ rcu_read_lock();
86377+ read_lock(&tasklist_lock);
86378+ read_lock(&grsec_exec_file_lock);
86379+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
86380+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
86381+ p->real_parent->brute = 1;
86382+ daemon = 1;
86383+ } else {
86384+ const struct cred *cred = __task_cred(p), *cred2;
86385+ struct task_struct *tsk, *tsk2;
86386+
86387+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
86388+ struct user_struct *user;
86389+
86390+ uid = cred->uid;
86391+
86392+ /* this is put upon execution past expiration */
86393+ user = find_user(uid);
86394+ if (user == NULL)
86395+ goto unlock;
86396+ user->suid_banned = 1;
86397+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
86398+ if (user->suid_ban_expires == ~0UL)
86399+ user->suid_ban_expires--;
86400+
86401+ /* only kill other threads of the same binary, from the same user */
86402+ do_each_thread(tsk2, tsk) {
86403+ cred2 = __task_cred(tsk);
86404+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
86405+ gr_fake_force_sig(SIGKILL, tsk);
86406+ } while_each_thread(tsk2, tsk);
86407+ }
86408+ }
86409+unlock:
86410+ read_unlock(&grsec_exec_file_lock);
86411+ read_unlock(&tasklist_lock);
86412+ rcu_read_unlock();
86413+
86414+ if (gr_is_global_nonroot(uid))
86415+ 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);
86416+ else if (daemon)
86417+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
86418+
86419+#endif
86420+ return;
86421+}
86422+
86423+void gr_handle_brute_check(void)
86424+{
86425+#ifdef CONFIG_GRKERNSEC_BRUTE
86426+ struct task_struct *p = current;
86427+
86428+ if (unlikely(p->brute)) {
86429+ if (!grsec_enable_brute)
86430+ p->brute = 0;
86431+ else if (time_before(get_seconds(), p->brute_expires))
86432+ msleep(30 * 1000);
86433+ }
86434+#endif
86435+ return;
86436+}
86437+
86438+void gr_handle_kernel_exploit(void)
86439+{
86440+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86441+ const struct cred *cred;
86442+ struct task_struct *tsk, *tsk2;
86443+ struct user_struct *user;
86444+ kuid_t uid;
86445+
86446+ if (in_irq() || in_serving_softirq() || in_nmi())
86447+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
86448+
86449+ uid = current_uid();
86450+
86451+ if (gr_is_global_root(uid))
86452+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
86453+ else {
86454+ /* kill all the processes of this user, hold a reference
86455+ to their creds struct, and prevent them from creating
86456+ another process until system reset
86457+ */
86458+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
86459+ GR_GLOBAL_UID(uid));
86460+ /* we intentionally leak this ref */
86461+ user = get_uid(current->cred->user);
86462+ if (user)
86463+ user->kernel_banned = 1;
86464+
86465+ /* kill all processes of this user */
86466+ read_lock(&tasklist_lock);
86467+ do_each_thread(tsk2, tsk) {
86468+ cred = __task_cred(tsk);
86469+ if (uid_eq(cred->uid, uid))
86470+ gr_fake_force_sig(SIGKILL, tsk);
86471+ } while_each_thread(tsk2, tsk);
86472+ read_unlock(&tasklist_lock);
86473+ }
86474+#endif
86475+}
86476+
86477+#ifdef CONFIG_GRKERNSEC_BRUTE
86478+static bool suid_ban_expired(struct user_struct *user)
86479+{
86480+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
86481+ user->suid_banned = 0;
86482+ user->suid_ban_expires = 0;
86483+ free_uid(user);
86484+ return true;
86485+ }
86486+
86487+ return false;
86488+}
86489+#endif
86490+
86491+int gr_process_kernel_exec_ban(void)
86492+{
86493+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86494+ if (unlikely(current->cred->user->kernel_banned))
86495+ return -EPERM;
86496+#endif
86497+ return 0;
86498+}
86499+
86500+int gr_process_kernel_setuid_ban(struct user_struct *user)
86501+{
86502+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86503+ if (unlikely(user->kernel_banned))
86504+ gr_fake_force_sig(SIGKILL, current);
86505+#endif
86506+ return 0;
86507+}
86508+
86509+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
86510+{
86511+#ifdef CONFIG_GRKERNSEC_BRUTE
86512+ struct user_struct *user = current->cred->user;
86513+ if (unlikely(user->suid_banned)) {
86514+ if (suid_ban_expired(user))
86515+ return 0;
86516+ /* disallow execution of suid binaries only */
86517+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
86518+ return -EPERM;
86519+ }
86520+#endif
86521+ return 0;
86522+}
86523diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
86524new file mode 100644
86525index 0000000..a523bd2
86526--- /dev/null
86527+++ b/grsecurity/grsec_sock.c
86528@@ -0,0 +1,244 @@
86529+#include <linux/kernel.h>
86530+#include <linux/module.h>
86531+#include <linux/sched.h>
86532+#include <linux/file.h>
86533+#include <linux/net.h>
86534+#include <linux/in.h>
86535+#include <linux/ip.h>
86536+#include <net/sock.h>
86537+#include <net/inet_sock.h>
86538+#include <linux/grsecurity.h>
86539+#include <linux/grinternal.h>
86540+#include <linux/gracl.h>
86541+
86542+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
86543+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
86544+
86545+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
86546+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
86547+
86548+#ifdef CONFIG_UNIX_MODULE
86549+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
86550+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
86551+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
86552+EXPORT_SYMBOL_GPL(gr_handle_create);
86553+#endif
86554+
86555+#ifdef CONFIG_GRKERNSEC
86556+#define gr_conn_table_size 32749
86557+struct conn_table_entry {
86558+ struct conn_table_entry *next;
86559+ struct signal_struct *sig;
86560+};
86561+
86562+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
86563+DEFINE_SPINLOCK(gr_conn_table_lock);
86564+
86565+extern const char * gr_socktype_to_name(unsigned char type);
86566+extern const char * gr_proto_to_name(unsigned char proto);
86567+extern const char * gr_sockfamily_to_name(unsigned char family);
86568+
86569+static int
86570+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
86571+{
86572+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
86573+}
86574+
86575+static int
86576+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
86577+ __u16 sport, __u16 dport)
86578+{
86579+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
86580+ sig->gr_sport == sport && sig->gr_dport == dport))
86581+ return 1;
86582+ else
86583+ return 0;
86584+}
86585+
86586+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
86587+{
86588+ struct conn_table_entry **match;
86589+ unsigned int index;
86590+
86591+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86592+ sig->gr_sport, sig->gr_dport,
86593+ gr_conn_table_size);
86594+
86595+ newent->sig = sig;
86596+
86597+ match = &gr_conn_table[index];
86598+ newent->next = *match;
86599+ *match = newent;
86600+
86601+ return;
86602+}
86603+
86604+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
86605+{
86606+ struct conn_table_entry *match, *last = NULL;
86607+ unsigned int index;
86608+
86609+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86610+ sig->gr_sport, sig->gr_dport,
86611+ gr_conn_table_size);
86612+
86613+ match = gr_conn_table[index];
86614+ while (match && !conn_match(match->sig,
86615+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
86616+ sig->gr_dport)) {
86617+ last = match;
86618+ match = match->next;
86619+ }
86620+
86621+ if (match) {
86622+ if (last)
86623+ last->next = match->next;
86624+ else
86625+ gr_conn_table[index] = NULL;
86626+ kfree(match);
86627+ }
86628+
86629+ return;
86630+}
86631+
86632+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
86633+ __u16 sport, __u16 dport)
86634+{
86635+ struct conn_table_entry *match;
86636+ unsigned int index;
86637+
86638+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
86639+
86640+ match = gr_conn_table[index];
86641+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
86642+ match = match->next;
86643+
86644+ if (match)
86645+ return match->sig;
86646+ else
86647+ return NULL;
86648+}
86649+
86650+#endif
86651+
86652+void gr_update_task_in_ip_table(const struct inet_sock *inet)
86653+{
86654+#ifdef CONFIG_GRKERNSEC
86655+ struct signal_struct *sig = current->signal;
86656+ struct conn_table_entry *newent;
86657+
86658+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
86659+ if (newent == NULL)
86660+ return;
86661+ /* no bh lock needed since we are called with bh disabled */
86662+ spin_lock(&gr_conn_table_lock);
86663+ gr_del_task_from_ip_table_nolock(sig);
86664+ sig->gr_saddr = inet->inet_rcv_saddr;
86665+ sig->gr_daddr = inet->inet_daddr;
86666+ sig->gr_sport = inet->inet_sport;
86667+ sig->gr_dport = inet->inet_dport;
86668+ gr_add_to_task_ip_table_nolock(sig, newent);
86669+ spin_unlock(&gr_conn_table_lock);
86670+#endif
86671+ return;
86672+}
86673+
86674+void gr_del_task_from_ip_table(struct task_struct *task)
86675+{
86676+#ifdef CONFIG_GRKERNSEC
86677+ spin_lock_bh(&gr_conn_table_lock);
86678+ gr_del_task_from_ip_table_nolock(task->signal);
86679+ spin_unlock_bh(&gr_conn_table_lock);
86680+#endif
86681+ return;
86682+}
86683+
86684+void
86685+gr_attach_curr_ip(const struct sock *sk)
86686+{
86687+#ifdef CONFIG_GRKERNSEC
86688+ struct signal_struct *p, *set;
86689+ const struct inet_sock *inet = inet_sk(sk);
86690+
86691+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
86692+ return;
86693+
86694+ set = current->signal;
86695+
86696+ spin_lock_bh(&gr_conn_table_lock);
86697+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
86698+ inet->inet_dport, inet->inet_sport);
86699+ if (unlikely(p != NULL)) {
86700+ set->curr_ip = p->curr_ip;
86701+ set->used_accept = 1;
86702+ gr_del_task_from_ip_table_nolock(p);
86703+ spin_unlock_bh(&gr_conn_table_lock);
86704+ return;
86705+ }
86706+ spin_unlock_bh(&gr_conn_table_lock);
86707+
86708+ set->curr_ip = inet->inet_daddr;
86709+ set->used_accept = 1;
86710+#endif
86711+ return;
86712+}
86713+
86714+int
86715+gr_handle_sock_all(const int family, const int type, const int protocol)
86716+{
86717+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
86718+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
86719+ (family != AF_UNIX)) {
86720+ if (family == AF_INET)
86721+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
86722+ else
86723+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
86724+ return -EACCES;
86725+ }
86726+#endif
86727+ return 0;
86728+}
86729+
86730+int
86731+gr_handle_sock_server(const struct sockaddr *sck)
86732+{
86733+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86734+ if (grsec_enable_socket_server &&
86735+ in_group_p(grsec_socket_server_gid) &&
86736+ sck && (sck->sa_family != AF_UNIX) &&
86737+ (sck->sa_family != AF_LOCAL)) {
86738+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86739+ return -EACCES;
86740+ }
86741+#endif
86742+ return 0;
86743+}
86744+
86745+int
86746+gr_handle_sock_server_other(const struct sock *sck)
86747+{
86748+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86749+ if (grsec_enable_socket_server &&
86750+ in_group_p(grsec_socket_server_gid) &&
86751+ sck && (sck->sk_family != AF_UNIX) &&
86752+ (sck->sk_family != AF_LOCAL)) {
86753+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86754+ return -EACCES;
86755+ }
86756+#endif
86757+ return 0;
86758+}
86759+
86760+int
86761+gr_handle_sock_client(const struct sockaddr *sck)
86762+{
86763+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
86764+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
86765+ sck && (sck->sa_family != AF_UNIX) &&
86766+ (sck->sa_family != AF_LOCAL)) {
86767+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
86768+ return -EACCES;
86769+ }
86770+#endif
86771+ return 0;
86772+}
86773diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
86774new file mode 100644
86775index 0000000..cce889e
86776--- /dev/null
86777+++ b/grsecurity/grsec_sysctl.c
86778@@ -0,0 +1,488 @@
86779+#include <linux/kernel.h>
86780+#include <linux/sched.h>
86781+#include <linux/sysctl.h>
86782+#include <linux/grsecurity.h>
86783+#include <linux/grinternal.h>
86784+
86785+int
86786+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
86787+{
86788+#ifdef CONFIG_GRKERNSEC_SYSCTL
86789+ if (dirname == NULL || name == NULL)
86790+ return 0;
86791+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
86792+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
86793+ return -EACCES;
86794+ }
86795+#endif
86796+ return 0;
86797+}
86798+
86799+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
86800+static int __maybe_unused __read_only one = 1;
86801+#endif
86802+
86803+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
86804+ defined(CONFIG_GRKERNSEC_DENYUSB)
86805+struct ctl_table grsecurity_table[] = {
86806+#ifdef CONFIG_GRKERNSEC_SYSCTL
86807+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
86808+#ifdef CONFIG_GRKERNSEC_IO
86809+ {
86810+ .procname = "disable_priv_io",
86811+ .data = &grsec_disable_privio,
86812+ .maxlen = sizeof(int),
86813+ .mode = 0600,
86814+ .proc_handler = &proc_dointvec,
86815+ },
86816+#endif
86817+#endif
86818+#ifdef CONFIG_GRKERNSEC_LINK
86819+ {
86820+ .procname = "linking_restrictions",
86821+ .data = &grsec_enable_link,
86822+ .maxlen = sizeof(int),
86823+ .mode = 0600,
86824+ .proc_handler = &proc_dointvec,
86825+ },
86826+#endif
86827+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
86828+ {
86829+ .procname = "enforce_symlinksifowner",
86830+ .data = &grsec_enable_symlinkown,
86831+ .maxlen = sizeof(int),
86832+ .mode = 0600,
86833+ .proc_handler = &proc_dointvec,
86834+ },
86835+ {
86836+ .procname = "symlinkown_gid",
86837+ .data = &grsec_symlinkown_gid,
86838+ .maxlen = sizeof(int),
86839+ .mode = 0600,
86840+ .proc_handler = &proc_dointvec,
86841+ },
86842+#endif
86843+#ifdef CONFIG_GRKERNSEC_BRUTE
86844+ {
86845+ .procname = "deter_bruteforce",
86846+ .data = &grsec_enable_brute,
86847+ .maxlen = sizeof(int),
86848+ .mode = 0600,
86849+ .proc_handler = &proc_dointvec,
86850+ },
86851+#endif
86852+#ifdef CONFIG_GRKERNSEC_FIFO
86853+ {
86854+ .procname = "fifo_restrictions",
86855+ .data = &grsec_enable_fifo,
86856+ .maxlen = sizeof(int),
86857+ .mode = 0600,
86858+ .proc_handler = &proc_dointvec,
86859+ },
86860+#endif
86861+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86862+ {
86863+ .procname = "ptrace_readexec",
86864+ .data = &grsec_enable_ptrace_readexec,
86865+ .maxlen = sizeof(int),
86866+ .mode = 0600,
86867+ .proc_handler = &proc_dointvec,
86868+ },
86869+#endif
86870+#ifdef CONFIG_GRKERNSEC_SETXID
86871+ {
86872+ .procname = "consistent_setxid",
86873+ .data = &grsec_enable_setxid,
86874+ .maxlen = sizeof(int),
86875+ .mode = 0600,
86876+ .proc_handler = &proc_dointvec,
86877+ },
86878+#endif
86879+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
86880+ {
86881+ .procname = "ip_blackhole",
86882+ .data = &grsec_enable_blackhole,
86883+ .maxlen = sizeof(int),
86884+ .mode = 0600,
86885+ .proc_handler = &proc_dointvec,
86886+ },
86887+ {
86888+ .procname = "lastack_retries",
86889+ .data = &grsec_lastack_retries,
86890+ .maxlen = sizeof(int),
86891+ .mode = 0600,
86892+ .proc_handler = &proc_dointvec,
86893+ },
86894+#endif
86895+#ifdef CONFIG_GRKERNSEC_EXECLOG
86896+ {
86897+ .procname = "exec_logging",
86898+ .data = &grsec_enable_execlog,
86899+ .maxlen = sizeof(int),
86900+ .mode = 0600,
86901+ .proc_handler = &proc_dointvec,
86902+ },
86903+#endif
86904+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86905+ {
86906+ .procname = "rwxmap_logging",
86907+ .data = &grsec_enable_log_rwxmaps,
86908+ .maxlen = sizeof(int),
86909+ .mode = 0600,
86910+ .proc_handler = &proc_dointvec,
86911+ },
86912+#endif
86913+#ifdef CONFIG_GRKERNSEC_SIGNAL
86914+ {
86915+ .procname = "signal_logging",
86916+ .data = &grsec_enable_signal,
86917+ .maxlen = sizeof(int),
86918+ .mode = 0600,
86919+ .proc_handler = &proc_dointvec,
86920+ },
86921+#endif
86922+#ifdef CONFIG_GRKERNSEC_FORKFAIL
86923+ {
86924+ .procname = "forkfail_logging",
86925+ .data = &grsec_enable_forkfail,
86926+ .maxlen = sizeof(int),
86927+ .mode = 0600,
86928+ .proc_handler = &proc_dointvec,
86929+ },
86930+#endif
86931+#ifdef CONFIG_GRKERNSEC_TIME
86932+ {
86933+ .procname = "timechange_logging",
86934+ .data = &grsec_enable_time,
86935+ .maxlen = sizeof(int),
86936+ .mode = 0600,
86937+ .proc_handler = &proc_dointvec,
86938+ },
86939+#endif
86940+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
86941+ {
86942+ .procname = "chroot_deny_shmat",
86943+ .data = &grsec_enable_chroot_shmat,
86944+ .maxlen = sizeof(int),
86945+ .mode = 0600,
86946+ .proc_handler = &proc_dointvec,
86947+ },
86948+#endif
86949+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
86950+ {
86951+ .procname = "chroot_deny_unix",
86952+ .data = &grsec_enable_chroot_unix,
86953+ .maxlen = sizeof(int),
86954+ .mode = 0600,
86955+ .proc_handler = &proc_dointvec,
86956+ },
86957+#endif
86958+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
86959+ {
86960+ .procname = "chroot_deny_mount",
86961+ .data = &grsec_enable_chroot_mount,
86962+ .maxlen = sizeof(int),
86963+ .mode = 0600,
86964+ .proc_handler = &proc_dointvec,
86965+ },
86966+#endif
86967+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
86968+ {
86969+ .procname = "chroot_deny_fchdir",
86970+ .data = &grsec_enable_chroot_fchdir,
86971+ .maxlen = sizeof(int),
86972+ .mode = 0600,
86973+ .proc_handler = &proc_dointvec,
86974+ },
86975+#endif
86976+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
86977+ {
86978+ .procname = "chroot_deny_chroot",
86979+ .data = &grsec_enable_chroot_double,
86980+ .maxlen = sizeof(int),
86981+ .mode = 0600,
86982+ .proc_handler = &proc_dointvec,
86983+ },
86984+#endif
86985+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
86986+ {
86987+ .procname = "chroot_deny_pivot",
86988+ .data = &grsec_enable_chroot_pivot,
86989+ .maxlen = sizeof(int),
86990+ .mode = 0600,
86991+ .proc_handler = &proc_dointvec,
86992+ },
86993+#endif
86994+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
86995+ {
86996+ .procname = "chroot_enforce_chdir",
86997+ .data = &grsec_enable_chroot_chdir,
86998+ .maxlen = sizeof(int),
86999+ .mode = 0600,
87000+ .proc_handler = &proc_dointvec,
87001+ },
87002+#endif
87003+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
87004+ {
87005+ .procname = "chroot_deny_chmod",
87006+ .data = &grsec_enable_chroot_chmod,
87007+ .maxlen = sizeof(int),
87008+ .mode = 0600,
87009+ .proc_handler = &proc_dointvec,
87010+ },
87011+#endif
87012+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
87013+ {
87014+ .procname = "chroot_deny_mknod",
87015+ .data = &grsec_enable_chroot_mknod,
87016+ .maxlen = sizeof(int),
87017+ .mode = 0600,
87018+ .proc_handler = &proc_dointvec,
87019+ },
87020+#endif
87021+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
87022+ {
87023+ .procname = "chroot_restrict_nice",
87024+ .data = &grsec_enable_chroot_nice,
87025+ .maxlen = sizeof(int),
87026+ .mode = 0600,
87027+ .proc_handler = &proc_dointvec,
87028+ },
87029+#endif
87030+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
87031+ {
87032+ .procname = "chroot_execlog",
87033+ .data = &grsec_enable_chroot_execlog,
87034+ .maxlen = sizeof(int),
87035+ .mode = 0600,
87036+ .proc_handler = &proc_dointvec,
87037+ },
87038+#endif
87039+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
87040+ {
87041+ .procname = "chroot_caps",
87042+ .data = &grsec_enable_chroot_caps,
87043+ .maxlen = sizeof(int),
87044+ .mode = 0600,
87045+ .proc_handler = &proc_dointvec,
87046+ },
87047+#endif
87048+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
87049+ {
87050+ .procname = "chroot_deny_bad_rename",
87051+ .data = &grsec_enable_chroot_rename,
87052+ .maxlen = sizeof(int),
87053+ .mode = 0600,
87054+ .proc_handler = &proc_dointvec,
87055+ },
87056+#endif
87057+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
87058+ {
87059+ .procname = "chroot_deny_sysctl",
87060+ .data = &grsec_enable_chroot_sysctl,
87061+ .maxlen = sizeof(int),
87062+ .mode = 0600,
87063+ .proc_handler = &proc_dointvec,
87064+ },
87065+#endif
87066+#ifdef CONFIG_GRKERNSEC_TPE
87067+ {
87068+ .procname = "tpe",
87069+ .data = &grsec_enable_tpe,
87070+ .maxlen = sizeof(int),
87071+ .mode = 0600,
87072+ .proc_handler = &proc_dointvec,
87073+ },
87074+ {
87075+ .procname = "tpe_gid",
87076+ .data = &grsec_tpe_gid,
87077+ .maxlen = sizeof(int),
87078+ .mode = 0600,
87079+ .proc_handler = &proc_dointvec,
87080+ },
87081+#endif
87082+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87083+ {
87084+ .procname = "tpe_invert",
87085+ .data = &grsec_enable_tpe_invert,
87086+ .maxlen = sizeof(int),
87087+ .mode = 0600,
87088+ .proc_handler = &proc_dointvec,
87089+ },
87090+#endif
87091+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87092+ {
87093+ .procname = "tpe_restrict_all",
87094+ .data = &grsec_enable_tpe_all,
87095+ .maxlen = sizeof(int),
87096+ .mode = 0600,
87097+ .proc_handler = &proc_dointvec,
87098+ },
87099+#endif
87100+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
87101+ {
87102+ .procname = "socket_all",
87103+ .data = &grsec_enable_socket_all,
87104+ .maxlen = sizeof(int),
87105+ .mode = 0600,
87106+ .proc_handler = &proc_dointvec,
87107+ },
87108+ {
87109+ .procname = "socket_all_gid",
87110+ .data = &grsec_socket_all_gid,
87111+ .maxlen = sizeof(int),
87112+ .mode = 0600,
87113+ .proc_handler = &proc_dointvec,
87114+ },
87115+#endif
87116+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
87117+ {
87118+ .procname = "socket_client",
87119+ .data = &grsec_enable_socket_client,
87120+ .maxlen = sizeof(int),
87121+ .mode = 0600,
87122+ .proc_handler = &proc_dointvec,
87123+ },
87124+ {
87125+ .procname = "socket_client_gid",
87126+ .data = &grsec_socket_client_gid,
87127+ .maxlen = sizeof(int),
87128+ .mode = 0600,
87129+ .proc_handler = &proc_dointvec,
87130+ },
87131+#endif
87132+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
87133+ {
87134+ .procname = "socket_server",
87135+ .data = &grsec_enable_socket_server,
87136+ .maxlen = sizeof(int),
87137+ .mode = 0600,
87138+ .proc_handler = &proc_dointvec,
87139+ },
87140+ {
87141+ .procname = "socket_server_gid",
87142+ .data = &grsec_socket_server_gid,
87143+ .maxlen = sizeof(int),
87144+ .mode = 0600,
87145+ .proc_handler = &proc_dointvec,
87146+ },
87147+#endif
87148+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
87149+ {
87150+ .procname = "audit_group",
87151+ .data = &grsec_enable_group,
87152+ .maxlen = sizeof(int),
87153+ .mode = 0600,
87154+ .proc_handler = &proc_dointvec,
87155+ },
87156+ {
87157+ .procname = "audit_gid",
87158+ .data = &grsec_audit_gid,
87159+ .maxlen = sizeof(int),
87160+ .mode = 0600,
87161+ .proc_handler = &proc_dointvec,
87162+ },
87163+#endif
87164+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
87165+ {
87166+ .procname = "audit_chdir",
87167+ .data = &grsec_enable_chdir,
87168+ .maxlen = sizeof(int),
87169+ .mode = 0600,
87170+ .proc_handler = &proc_dointvec,
87171+ },
87172+#endif
87173+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
87174+ {
87175+ .procname = "audit_mount",
87176+ .data = &grsec_enable_mount,
87177+ .maxlen = sizeof(int),
87178+ .mode = 0600,
87179+ .proc_handler = &proc_dointvec,
87180+ },
87181+#endif
87182+#ifdef CONFIG_GRKERNSEC_DMESG
87183+ {
87184+ .procname = "dmesg",
87185+ .data = &grsec_enable_dmesg,
87186+ .maxlen = sizeof(int),
87187+ .mode = 0600,
87188+ .proc_handler = &proc_dointvec,
87189+ },
87190+#endif
87191+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
87192+ {
87193+ .procname = "chroot_findtask",
87194+ .data = &grsec_enable_chroot_findtask,
87195+ .maxlen = sizeof(int),
87196+ .mode = 0600,
87197+ .proc_handler = &proc_dointvec,
87198+ },
87199+#endif
87200+#ifdef CONFIG_GRKERNSEC_RESLOG
87201+ {
87202+ .procname = "resource_logging",
87203+ .data = &grsec_resource_logging,
87204+ .maxlen = sizeof(int),
87205+ .mode = 0600,
87206+ .proc_handler = &proc_dointvec,
87207+ },
87208+#endif
87209+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
87210+ {
87211+ .procname = "audit_ptrace",
87212+ .data = &grsec_enable_audit_ptrace,
87213+ .maxlen = sizeof(int),
87214+ .mode = 0600,
87215+ .proc_handler = &proc_dointvec,
87216+ },
87217+#endif
87218+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
87219+ {
87220+ .procname = "harden_ptrace",
87221+ .data = &grsec_enable_harden_ptrace,
87222+ .maxlen = sizeof(int),
87223+ .mode = 0600,
87224+ .proc_handler = &proc_dointvec,
87225+ },
87226+#endif
87227+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
87228+ {
87229+ .procname = "harden_ipc",
87230+ .data = &grsec_enable_harden_ipc,
87231+ .maxlen = sizeof(int),
87232+ .mode = 0600,
87233+ .proc_handler = &proc_dointvec,
87234+ },
87235+#endif
87236+ {
87237+ .procname = "grsec_lock",
87238+ .data = &grsec_lock,
87239+ .maxlen = sizeof(int),
87240+ .mode = 0600,
87241+ .proc_handler = &proc_dointvec,
87242+ },
87243+#endif
87244+#ifdef CONFIG_GRKERNSEC_ROFS
87245+ {
87246+ .procname = "romount_protect",
87247+ .data = &grsec_enable_rofs,
87248+ .maxlen = sizeof(int),
87249+ .mode = 0600,
87250+ .proc_handler = &proc_dointvec_minmax,
87251+ .extra1 = &one,
87252+ .extra2 = &one,
87253+ },
87254+#endif
87255+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
87256+ {
87257+ .procname = "deny_new_usb",
87258+ .data = &grsec_deny_new_usb,
87259+ .maxlen = sizeof(int),
87260+ .mode = 0600,
87261+ .proc_handler = &proc_dointvec,
87262+ },
87263+#endif
87264+ { }
87265+};
87266+#endif
87267diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
87268new file mode 100644
87269index 0000000..61b514e
87270--- /dev/null
87271+++ b/grsecurity/grsec_time.c
87272@@ -0,0 +1,16 @@
87273+#include <linux/kernel.h>
87274+#include <linux/sched.h>
87275+#include <linux/grinternal.h>
87276+#include <linux/module.h>
87277+
87278+void
87279+gr_log_timechange(void)
87280+{
87281+#ifdef CONFIG_GRKERNSEC_TIME
87282+ if (grsec_enable_time)
87283+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
87284+#endif
87285+ return;
87286+}
87287+
87288+EXPORT_SYMBOL_GPL(gr_log_timechange);
87289diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
87290new file mode 100644
87291index 0000000..d1953de
87292--- /dev/null
87293+++ b/grsecurity/grsec_tpe.c
87294@@ -0,0 +1,78 @@
87295+#include <linux/kernel.h>
87296+#include <linux/sched.h>
87297+#include <linux/file.h>
87298+#include <linux/fs.h>
87299+#include <linux/grinternal.h>
87300+
87301+extern int gr_acl_tpe_check(void);
87302+
87303+int
87304+gr_tpe_allow(const struct file *file)
87305+{
87306+#ifdef CONFIG_GRKERNSEC
87307+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
87308+ struct inode *file_inode = file->f_path.dentry->d_inode;
87309+ const struct cred *cred = current_cred();
87310+ char *msg = NULL;
87311+ char *msg2 = NULL;
87312+
87313+ // never restrict root
87314+ if (gr_is_global_root(cred->uid))
87315+ return 1;
87316+
87317+ if (grsec_enable_tpe) {
87318+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87319+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
87320+ msg = "not being in trusted group";
87321+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
87322+ msg = "being in untrusted group";
87323+#else
87324+ if (in_group_p(grsec_tpe_gid))
87325+ msg = "being in untrusted group";
87326+#endif
87327+ }
87328+ if (!msg && gr_acl_tpe_check())
87329+ msg = "being in untrusted role";
87330+
87331+ // not in any affected group/role
87332+ if (!msg)
87333+ goto next_check;
87334+
87335+ if (gr_is_global_nonroot(inode->i_uid))
87336+ msg2 = "file in non-root-owned directory";
87337+ else if (inode->i_mode & S_IWOTH)
87338+ msg2 = "file in world-writable directory";
87339+ else if (inode->i_mode & S_IWGRP)
87340+ msg2 = "file in group-writable directory";
87341+ else if (file_inode->i_mode & S_IWOTH)
87342+ msg2 = "file is world-writable";
87343+
87344+ if (msg && msg2) {
87345+ char fullmsg[70] = {0};
87346+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
87347+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
87348+ return 0;
87349+ }
87350+ msg = NULL;
87351+next_check:
87352+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87353+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
87354+ return 1;
87355+
87356+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
87357+ msg = "directory not owned by user";
87358+ else if (inode->i_mode & S_IWOTH)
87359+ msg = "file in world-writable directory";
87360+ else if (inode->i_mode & S_IWGRP)
87361+ msg = "file in group-writable directory";
87362+ else if (file_inode->i_mode & S_IWOTH)
87363+ msg = "file is world-writable";
87364+
87365+ if (msg) {
87366+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
87367+ return 0;
87368+ }
87369+#endif
87370+#endif
87371+ return 1;
87372+}
87373diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
87374new file mode 100644
87375index 0000000..ae02d8e
87376--- /dev/null
87377+++ b/grsecurity/grsec_usb.c
87378@@ -0,0 +1,15 @@
87379+#include <linux/kernel.h>
87380+#include <linux/grinternal.h>
87381+#include <linux/module.h>
87382+
87383+int gr_handle_new_usb(void)
87384+{
87385+#ifdef CONFIG_GRKERNSEC_DENYUSB
87386+ if (grsec_deny_new_usb) {
87387+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
87388+ return 1;
87389+ }
87390+#endif
87391+ return 0;
87392+}
87393+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
87394diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
87395new file mode 100644
87396index 0000000..158b330
87397--- /dev/null
87398+++ b/grsecurity/grsum.c
87399@@ -0,0 +1,64 @@
87400+#include <linux/err.h>
87401+#include <linux/kernel.h>
87402+#include <linux/sched.h>
87403+#include <linux/mm.h>
87404+#include <linux/scatterlist.h>
87405+#include <linux/crypto.h>
87406+#include <linux/gracl.h>
87407+
87408+
87409+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
87410+#error "crypto and sha256 must be built into the kernel"
87411+#endif
87412+
87413+int
87414+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
87415+{
87416+ struct crypto_hash *tfm;
87417+ struct hash_desc desc;
87418+ struct scatterlist sg[2];
87419+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
87420+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
87421+ unsigned long *sumptr = (unsigned long *)sum;
87422+ int cryptres;
87423+ int retval = 1;
87424+ volatile int mismatched = 0;
87425+ volatile int dummy = 0;
87426+ unsigned int i;
87427+
87428+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
87429+ if (IS_ERR(tfm)) {
87430+ /* should never happen, since sha256 should be built in */
87431+ memset(entry->pw, 0, GR_PW_LEN);
87432+ return 1;
87433+ }
87434+
87435+ sg_init_table(sg, 2);
87436+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
87437+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
87438+
87439+ desc.tfm = tfm;
87440+ desc.flags = 0;
87441+
87442+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
87443+ temp_sum);
87444+
87445+ memset(entry->pw, 0, GR_PW_LEN);
87446+
87447+ if (cryptres)
87448+ goto out;
87449+
87450+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
87451+ if (sumptr[i] != tmpsumptr[i])
87452+ mismatched = 1;
87453+ else
87454+ dummy = 1; // waste a cycle
87455+
87456+ if (!mismatched)
87457+ retval = dummy - 1;
87458+
87459+out:
87460+ crypto_free_hash(tfm);
87461+
87462+ return retval;
87463+}
87464diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
87465index 5bdab6b..9ae82fe 100644
87466--- a/include/asm-generic/4level-fixup.h
87467+++ b/include/asm-generic/4level-fixup.h
87468@@ -14,8 +14,10 @@
87469 #define pmd_alloc(mm, pud, address) \
87470 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
87471 NULL: pmd_offset(pud, address))
87472+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
87473
87474 #define pud_alloc(mm, pgd, address) (pgd)
87475+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
87476 #define pud_offset(pgd, start) (pgd)
87477 #define pud_none(pud) 0
87478 #define pud_bad(pud) 0
87479diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
87480index b7babf0..1e4b4f1 100644
87481--- a/include/asm-generic/atomic-long.h
87482+++ b/include/asm-generic/atomic-long.h
87483@@ -22,6 +22,12 @@
87484
87485 typedef atomic64_t atomic_long_t;
87486
87487+#ifdef CONFIG_PAX_REFCOUNT
87488+typedef atomic64_unchecked_t atomic_long_unchecked_t;
87489+#else
87490+typedef atomic64_t atomic_long_unchecked_t;
87491+#endif
87492+
87493 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
87494
87495 static inline long atomic_long_read(atomic_long_t *l)
87496@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87497 return (long)atomic64_read(v);
87498 }
87499
87500+#ifdef CONFIG_PAX_REFCOUNT
87501+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87502+{
87503+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87504+
87505+ return (long)atomic64_read_unchecked(v);
87506+}
87507+#endif
87508+
87509 static inline void atomic_long_set(atomic_long_t *l, long i)
87510 {
87511 atomic64_t *v = (atomic64_t *)l;
87512@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87513 atomic64_set(v, i);
87514 }
87515
87516+#ifdef CONFIG_PAX_REFCOUNT
87517+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87518+{
87519+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87520+
87521+ atomic64_set_unchecked(v, i);
87522+}
87523+#endif
87524+
87525 static inline void atomic_long_inc(atomic_long_t *l)
87526 {
87527 atomic64_t *v = (atomic64_t *)l;
87528@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87529 atomic64_inc(v);
87530 }
87531
87532+#ifdef CONFIG_PAX_REFCOUNT
87533+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87534+{
87535+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87536+
87537+ atomic64_inc_unchecked(v);
87538+}
87539+#endif
87540+
87541 static inline void atomic_long_dec(atomic_long_t *l)
87542 {
87543 atomic64_t *v = (atomic64_t *)l;
87544@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87545 atomic64_dec(v);
87546 }
87547
87548+#ifdef CONFIG_PAX_REFCOUNT
87549+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87550+{
87551+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87552+
87553+ atomic64_dec_unchecked(v);
87554+}
87555+#endif
87556+
87557 static inline void atomic_long_add(long i, atomic_long_t *l)
87558 {
87559 atomic64_t *v = (atomic64_t *)l;
87560@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87561 atomic64_add(i, v);
87562 }
87563
87564+#ifdef CONFIG_PAX_REFCOUNT
87565+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87566+{
87567+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87568+
87569+ atomic64_add_unchecked(i, v);
87570+}
87571+#endif
87572+
87573 static inline void atomic_long_sub(long i, atomic_long_t *l)
87574 {
87575 atomic64_t *v = (atomic64_t *)l;
87576@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87577 atomic64_sub(i, v);
87578 }
87579
87580+#ifdef CONFIG_PAX_REFCOUNT
87581+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87582+{
87583+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87584+
87585+ atomic64_sub_unchecked(i, v);
87586+}
87587+#endif
87588+
87589 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87590 {
87591 atomic64_t *v = (atomic64_t *)l;
87592@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87593 return atomic64_add_negative(i, v);
87594 }
87595
87596-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87597+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87598 {
87599 atomic64_t *v = (atomic64_t *)l;
87600
87601 return (long)atomic64_add_return(i, v);
87602 }
87603
87604+#ifdef CONFIG_PAX_REFCOUNT
87605+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87606+{
87607+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87608+
87609+ return (long)atomic64_add_return_unchecked(i, v);
87610+}
87611+#endif
87612+
87613 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87614 {
87615 atomic64_t *v = (atomic64_t *)l;
87616@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87617 return (long)atomic64_inc_return(v);
87618 }
87619
87620+#ifdef CONFIG_PAX_REFCOUNT
87621+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87622+{
87623+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87624+
87625+ return (long)atomic64_inc_return_unchecked(v);
87626+}
87627+#endif
87628+
87629 static inline long atomic_long_dec_return(atomic_long_t *l)
87630 {
87631 atomic64_t *v = (atomic64_t *)l;
87632@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87633
87634 typedef atomic_t atomic_long_t;
87635
87636+#ifdef CONFIG_PAX_REFCOUNT
87637+typedef atomic_unchecked_t atomic_long_unchecked_t;
87638+#else
87639+typedef atomic_t atomic_long_unchecked_t;
87640+#endif
87641+
87642 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
87643 static inline long atomic_long_read(atomic_long_t *l)
87644 {
87645@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87646 return (long)atomic_read(v);
87647 }
87648
87649+#ifdef CONFIG_PAX_REFCOUNT
87650+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87651+{
87652+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87653+
87654+ return (long)atomic_read_unchecked(v);
87655+}
87656+#endif
87657+
87658 static inline void atomic_long_set(atomic_long_t *l, long i)
87659 {
87660 atomic_t *v = (atomic_t *)l;
87661@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87662 atomic_set(v, i);
87663 }
87664
87665+#ifdef CONFIG_PAX_REFCOUNT
87666+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87667+{
87668+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87669+
87670+ atomic_set_unchecked(v, i);
87671+}
87672+#endif
87673+
87674 static inline void atomic_long_inc(atomic_long_t *l)
87675 {
87676 atomic_t *v = (atomic_t *)l;
87677@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87678 atomic_inc(v);
87679 }
87680
87681+#ifdef CONFIG_PAX_REFCOUNT
87682+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87683+{
87684+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87685+
87686+ atomic_inc_unchecked(v);
87687+}
87688+#endif
87689+
87690 static inline void atomic_long_dec(atomic_long_t *l)
87691 {
87692 atomic_t *v = (atomic_t *)l;
87693@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87694 atomic_dec(v);
87695 }
87696
87697+#ifdef CONFIG_PAX_REFCOUNT
87698+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87699+{
87700+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87701+
87702+ atomic_dec_unchecked(v);
87703+}
87704+#endif
87705+
87706 static inline void atomic_long_add(long i, atomic_long_t *l)
87707 {
87708 atomic_t *v = (atomic_t *)l;
87709@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87710 atomic_add(i, v);
87711 }
87712
87713+#ifdef CONFIG_PAX_REFCOUNT
87714+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87715+{
87716+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87717+
87718+ atomic_add_unchecked(i, v);
87719+}
87720+#endif
87721+
87722 static inline void atomic_long_sub(long i, atomic_long_t *l)
87723 {
87724 atomic_t *v = (atomic_t *)l;
87725@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87726 atomic_sub(i, v);
87727 }
87728
87729+#ifdef CONFIG_PAX_REFCOUNT
87730+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87731+{
87732+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87733+
87734+ atomic_sub_unchecked(i, v);
87735+}
87736+#endif
87737+
87738 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87739 {
87740 atomic_t *v = (atomic_t *)l;
87741@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87742 return atomic_add_negative(i, v);
87743 }
87744
87745-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87746+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87747 {
87748 atomic_t *v = (atomic_t *)l;
87749
87750 return (long)atomic_add_return(i, v);
87751 }
87752
87753+#ifdef CONFIG_PAX_REFCOUNT
87754+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87755+{
87756+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87757+
87758+ return (long)atomic_add_return_unchecked(i, v);
87759+}
87760+
87761+#endif
87762+
87763 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87764 {
87765 atomic_t *v = (atomic_t *)l;
87766@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87767 return (long)atomic_inc_return(v);
87768 }
87769
87770+#ifdef CONFIG_PAX_REFCOUNT
87771+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87772+{
87773+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87774+
87775+ return (long)atomic_inc_return_unchecked(v);
87776+}
87777+#endif
87778+
87779 static inline long atomic_long_dec_return(atomic_long_t *l)
87780 {
87781 atomic_t *v = (atomic_t *)l;
87782@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87783
87784 #endif /* BITS_PER_LONG == 64 */
87785
87786+#ifdef CONFIG_PAX_REFCOUNT
87787+static inline void pax_refcount_needs_these_functions(void)
87788+{
87789+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
87790+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
87791+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
87792+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
87793+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
87794+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
87795+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
87796+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
87797+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
87798+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
87799+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
87800+#ifdef CONFIG_X86
87801+ atomic_clear_mask_unchecked(0, NULL);
87802+ atomic_set_mask_unchecked(0, NULL);
87803+#endif
87804+
87805+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
87806+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
87807+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
87808+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
87809+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
87810+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
87811+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
87812+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
87813+}
87814+#else
87815+#define atomic_read_unchecked(v) atomic_read(v)
87816+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
87817+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
87818+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
87819+#define atomic_inc_unchecked(v) atomic_inc(v)
87820+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
87821+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
87822+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
87823+#define atomic_dec_unchecked(v) atomic_dec(v)
87824+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
87825+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
87826+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
87827+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
87828+
87829+#define atomic_long_read_unchecked(v) atomic_long_read(v)
87830+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
87831+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
87832+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
87833+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
87834+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
87835+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
87836+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
87837+#endif
87838+
87839 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
87840diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
87841index 30ad9c8..c70c170 100644
87842--- a/include/asm-generic/atomic64.h
87843+++ b/include/asm-generic/atomic64.h
87844@@ -16,6 +16,8 @@ typedef struct {
87845 long long counter;
87846 } atomic64_t;
87847
87848+typedef atomic64_t atomic64_unchecked_t;
87849+
87850 #define ATOMIC64_INIT(i) { (i) }
87851
87852 extern long long atomic64_read(const atomic64_t *v);
87853@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
87854 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
87855 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
87856
87857+#define atomic64_read_unchecked(v) atomic64_read(v)
87858+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
87859+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
87860+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
87861+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
87862+#define atomic64_inc_unchecked(v) atomic64_inc(v)
87863+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
87864+#define atomic64_dec_unchecked(v) atomic64_dec(v)
87865+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
87866+
87867 #endif /* _ASM_GENERIC_ATOMIC64_H */
87868diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
87869index f5c40b0..e902f9d 100644
87870--- a/include/asm-generic/barrier.h
87871+++ b/include/asm-generic/barrier.h
87872@@ -82,7 +82,7 @@
87873 do { \
87874 compiletime_assert_atomic_type(*p); \
87875 smp_mb(); \
87876- ACCESS_ONCE(*p) = (v); \
87877+ ACCESS_ONCE_RW(*p) = (v); \
87878 } while (0)
87879
87880 #define smp_load_acquire(p) \
87881diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
87882index a60a7cc..0fe12f2 100644
87883--- a/include/asm-generic/bitops/__fls.h
87884+++ b/include/asm-generic/bitops/__fls.h
87885@@ -9,7 +9,7 @@
87886 *
87887 * Undefined if no set bit exists, so code should check against 0 first.
87888 */
87889-static __always_inline unsigned long __fls(unsigned long word)
87890+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
87891 {
87892 int num = BITS_PER_LONG - 1;
87893
87894diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
87895index 0576d1f..dad6c71 100644
87896--- a/include/asm-generic/bitops/fls.h
87897+++ b/include/asm-generic/bitops/fls.h
87898@@ -9,7 +9,7 @@
87899 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
87900 */
87901
87902-static __always_inline int fls(int x)
87903+static __always_inline int __intentional_overflow(-1) fls(int x)
87904 {
87905 int r = 32;
87906
87907diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
87908index b097cf8..3d40e14 100644
87909--- a/include/asm-generic/bitops/fls64.h
87910+++ b/include/asm-generic/bitops/fls64.h
87911@@ -15,7 +15,7 @@
87912 * at position 64.
87913 */
87914 #if BITS_PER_LONG == 32
87915-static __always_inline int fls64(__u64 x)
87916+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
87917 {
87918 __u32 h = x >> 32;
87919 if (h)
87920@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
87921 return fls(x);
87922 }
87923 #elif BITS_PER_LONG == 64
87924-static __always_inline int fls64(__u64 x)
87925+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
87926 {
87927 if (x == 0)
87928 return 0;
87929diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
87930index 630dd23..8c1dcb6b 100644
87931--- a/include/asm-generic/bug.h
87932+++ b/include/asm-generic/bug.h
87933@@ -62,13 +62,13 @@ struct bug_entry {
87934 * to provide better diagnostics.
87935 */
87936 #ifndef __WARN_TAINT
87937-extern __printf(3, 4)
87938+extern __printf(3, 4) __nocapture(1, 3, 4)
87939 void warn_slowpath_fmt(const char *file, const int line,
87940 const char *fmt, ...);
87941-extern __printf(4, 5)
87942+extern __printf(4, 5) __nocapture(1, 4, 5)
87943 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
87944 const char *fmt, ...);
87945-extern void warn_slowpath_null(const char *file, const int line);
87946+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
87947 #define WANT_WARN_ON_SLOWPATH
87948 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
87949 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
87950diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
87951index 1bfcfe5..e04c5c9 100644
87952--- a/include/asm-generic/cache.h
87953+++ b/include/asm-generic/cache.h
87954@@ -6,7 +6,7 @@
87955 * cache lines need to provide their own cache.h.
87956 */
87957
87958-#define L1_CACHE_SHIFT 5
87959-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
87960+#define L1_CACHE_SHIFT 5UL
87961+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
87962
87963 #endif /* __ASM_GENERIC_CACHE_H */
87964diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
87965index 0d68a1e..b74a761 100644
87966--- a/include/asm-generic/emergency-restart.h
87967+++ b/include/asm-generic/emergency-restart.h
87968@@ -1,7 +1,7 @@
87969 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
87970 #define _ASM_GENERIC_EMERGENCY_RESTART_H
87971
87972-static inline void machine_emergency_restart(void)
87973+static inline __noreturn void machine_emergency_restart(void)
87974 {
87975 machine_restart(NULL);
87976 }
87977diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
87978index 90f99c7..00ce236 100644
87979--- a/include/asm-generic/kmap_types.h
87980+++ b/include/asm-generic/kmap_types.h
87981@@ -2,9 +2,9 @@
87982 #define _ASM_GENERIC_KMAP_TYPES_H
87983
87984 #ifdef __WITH_KM_FENCE
87985-# define KM_TYPE_NR 41
87986+# define KM_TYPE_NR 42
87987 #else
87988-# define KM_TYPE_NR 20
87989+# define KM_TYPE_NR 21
87990 #endif
87991
87992 #endif
87993diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
87994index 9ceb03b..62b0b8f 100644
87995--- a/include/asm-generic/local.h
87996+++ b/include/asm-generic/local.h
87997@@ -23,24 +23,37 @@ typedef struct
87998 atomic_long_t a;
87999 } local_t;
88000
88001+typedef struct {
88002+ atomic_long_unchecked_t a;
88003+} local_unchecked_t;
88004+
88005 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
88006
88007 #define local_read(l) atomic_long_read(&(l)->a)
88008+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
88009 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
88010+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
88011 #define local_inc(l) atomic_long_inc(&(l)->a)
88012+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
88013 #define local_dec(l) atomic_long_dec(&(l)->a)
88014+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
88015 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
88016+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
88017 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
88018+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
88019
88020 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
88021 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
88022 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
88023 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
88024 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
88025+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
88026 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
88027 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
88028+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
88029
88030 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88031+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88032 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
88033 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
88034 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
88035diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
88036index 725612b..9cc513a 100644
88037--- a/include/asm-generic/pgtable-nopmd.h
88038+++ b/include/asm-generic/pgtable-nopmd.h
88039@@ -1,14 +1,19 @@
88040 #ifndef _PGTABLE_NOPMD_H
88041 #define _PGTABLE_NOPMD_H
88042
88043-#ifndef __ASSEMBLY__
88044-
88045 #include <asm-generic/pgtable-nopud.h>
88046
88047-struct mm_struct;
88048-
88049 #define __PAGETABLE_PMD_FOLDED
88050
88051+#define PMD_SHIFT PUD_SHIFT
88052+#define PTRS_PER_PMD 1
88053+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
88054+#define PMD_MASK (~(PMD_SIZE-1))
88055+
88056+#ifndef __ASSEMBLY__
88057+
88058+struct mm_struct;
88059+
88060 /*
88061 * Having the pmd type consist of a pud gets the size right, and allows
88062 * us to conceptually access the pud entry that this pmd is folded into
88063@@ -16,11 +21,6 @@ struct mm_struct;
88064 */
88065 typedef struct { pud_t pud; } pmd_t;
88066
88067-#define PMD_SHIFT PUD_SHIFT
88068-#define PTRS_PER_PMD 1
88069-#define PMD_SIZE (1UL << PMD_SHIFT)
88070-#define PMD_MASK (~(PMD_SIZE-1))
88071-
88072 /*
88073 * The "pud_xxx()" functions here are trivial for a folded two-level
88074 * setup: the pmd is never bad, and a pmd always exists (as it's folded
88075diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
88076index 810431d..0ec4804f 100644
88077--- a/include/asm-generic/pgtable-nopud.h
88078+++ b/include/asm-generic/pgtable-nopud.h
88079@@ -1,10 +1,15 @@
88080 #ifndef _PGTABLE_NOPUD_H
88081 #define _PGTABLE_NOPUD_H
88082
88083-#ifndef __ASSEMBLY__
88084-
88085 #define __PAGETABLE_PUD_FOLDED
88086
88087+#define PUD_SHIFT PGDIR_SHIFT
88088+#define PTRS_PER_PUD 1
88089+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
88090+#define PUD_MASK (~(PUD_SIZE-1))
88091+
88092+#ifndef __ASSEMBLY__
88093+
88094 /*
88095 * Having the pud type consist of a pgd gets the size right, and allows
88096 * us to conceptually access the pgd entry that this pud is folded into
88097@@ -12,11 +17,6 @@
88098 */
88099 typedef struct { pgd_t pgd; } pud_t;
88100
88101-#define PUD_SHIFT PGDIR_SHIFT
88102-#define PTRS_PER_PUD 1
88103-#define PUD_SIZE (1UL << PUD_SHIFT)
88104-#define PUD_MASK (~(PUD_SIZE-1))
88105-
88106 /*
88107 * The "pgd_xxx()" functions here are trivial for a folded two-level
88108 * setup: the pud is never bad, and a pud always exists (as it's folded
88109@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
88110 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
88111
88112 #define pgd_populate(mm, pgd, pud) do { } while (0)
88113+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
88114 /*
88115 * (puds are folded into pgds so this doesn't get actually called,
88116 * but the define is needed for a generic inline function.)
88117diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
88118index 4d46085..f4e92ef 100644
88119--- a/include/asm-generic/pgtable.h
88120+++ b/include/asm-generic/pgtable.h
88121@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
88122 }
88123 #endif /* CONFIG_NUMA_BALANCING */
88124
88125+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
88126+#ifdef CONFIG_PAX_KERNEXEC
88127+#error KERNEXEC requires pax_open_kernel
88128+#else
88129+static inline unsigned long pax_open_kernel(void) { return 0; }
88130+#endif
88131+#endif
88132+
88133+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
88134+#ifdef CONFIG_PAX_KERNEXEC
88135+#error KERNEXEC requires pax_close_kernel
88136+#else
88137+static inline unsigned long pax_close_kernel(void) { return 0; }
88138+#endif
88139+#endif
88140+
88141 #endif /* CONFIG_MMU */
88142
88143 #endif /* !__ASSEMBLY__ */
88144diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
88145index 72d8803..cb9749c 100644
88146--- a/include/asm-generic/uaccess.h
88147+++ b/include/asm-generic/uaccess.h
88148@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
88149 return __clear_user(to, n);
88150 }
88151
88152+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
88153+#ifdef CONFIG_PAX_MEMORY_UDEREF
88154+#error UDEREF requires pax_open_userland
88155+#else
88156+static inline unsigned long pax_open_userland(void) { return 0; }
88157+#endif
88158+#endif
88159+
88160+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
88161+#ifdef CONFIG_PAX_MEMORY_UDEREF
88162+#error UDEREF requires pax_close_userland
88163+#else
88164+static inline unsigned long pax_close_userland(void) { return 0; }
88165+#endif
88166+#endif
88167+
88168 #endif /* __ASM_GENERIC_UACCESS_H */
88169diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
88170index ac78910..8b5f068 100644
88171--- a/include/asm-generic/vmlinux.lds.h
88172+++ b/include/asm-generic/vmlinux.lds.h
88173@@ -234,6 +234,7 @@
88174 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
88175 VMLINUX_SYMBOL(__start_rodata) = .; \
88176 *(.rodata) *(.rodata.*) \
88177+ *(.data..read_only) \
88178 *(__vermagic) /* Kernel version magic */ \
88179 . = ALIGN(8); \
88180 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
88181@@ -492,6 +493,7 @@
88182 KERNEL_CTORS() \
88183 MCOUNT_REC() \
88184 *(.init.rodata) \
88185+ *(.init.rodata.*) \
88186 FTRACE_EVENTS() \
88187 TRACE_SYSCALLS() \
88188 KPROBE_BLACKLIST() \
88189@@ -511,6 +513,8 @@
88190
88191 #define EXIT_DATA \
88192 *(.exit.data) \
88193+ *(.exit.rodata) \
88194+ *(.exit.rodata.*) \
88195 MEM_DISCARD(exit.data) \
88196 MEM_DISCARD(exit.rodata)
88197
88198@@ -727,17 +731,18 @@
88199 * section in the linker script will go there too. @phdr should have
88200 * a leading colon.
88201 *
88202- * Note that this macros defines __per_cpu_load as an absolute symbol.
88203+ * Note that this macros defines per_cpu_load as an absolute symbol.
88204 * If there is no need to put the percpu section at a predetermined
88205 * address, use PERCPU_SECTION.
88206 */
88207 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
88208- VMLINUX_SYMBOL(__per_cpu_load) = .; \
88209- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
88210+ per_cpu_load = .; \
88211+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
88212 - LOAD_OFFSET) { \
88213+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
88214 PERCPU_INPUT(cacheline) \
88215 } phdr \
88216- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
88217+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
88218
88219 /**
88220 * PERCPU_SECTION - define output section for percpu area, simple version
88221diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
88222index 623a59c..1e79ab9 100644
88223--- a/include/crypto/algapi.h
88224+++ b/include/crypto/algapi.h
88225@@ -34,7 +34,7 @@ struct crypto_type {
88226 unsigned int maskclear;
88227 unsigned int maskset;
88228 unsigned int tfmsize;
88229-};
88230+} __do_const;
88231
88232 struct crypto_instance {
88233 struct crypto_alg alg;
88234diff --git a/include/drm/drmP.h b/include/drm/drmP.h
88235index e928625..ff97886 100644
88236--- a/include/drm/drmP.h
88237+++ b/include/drm/drmP.h
88238@@ -59,6 +59,7 @@
88239
88240 #include <asm/mman.h>
88241 #include <asm/pgalloc.h>
88242+#include <asm/local.h>
88243 #include <asm/uaccess.h>
88244
88245 #include <uapi/drm/drm.h>
88246@@ -133,17 +134,18 @@ void drm_err(const char *format, ...);
88247 /*@{*/
88248
88249 /* driver capabilities and requirements mask */
88250-#define DRIVER_USE_AGP 0x1
88251-#define DRIVER_PCI_DMA 0x8
88252-#define DRIVER_SG 0x10
88253-#define DRIVER_HAVE_DMA 0x20
88254-#define DRIVER_HAVE_IRQ 0x40
88255-#define DRIVER_IRQ_SHARED 0x80
88256-#define DRIVER_GEM 0x1000
88257-#define DRIVER_MODESET 0x2000
88258-#define DRIVER_PRIME 0x4000
88259-#define DRIVER_RENDER 0x8000
88260-#define DRIVER_ATOMIC 0x10000
88261+#define DRIVER_USE_AGP 0x1
88262+#define DRIVER_PCI_DMA 0x8
88263+#define DRIVER_SG 0x10
88264+#define DRIVER_HAVE_DMA 0x20
88265+#define DRIVER_HAVE_IRQ 0x40
88266+#define DRIVER_IRQ_SHARED 0x80
88267+#define DRIVER_GEM 0x1000
88268+#define DRIVER_MODESET 0x2000
88269+#define DRIVER_PRIME 0x4000
88270+#define DRIVER_RENDER 0x8000
88271+#define DRIVER_ATOMIC 0x10000
88272+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
88273
88274 /***********************************************************************/
88275 /** \name Macros to make printk easier */
88276@@ -224,10 +226,12 @@ void drm_err(const char *format, ...);
88277 * \param cmd command.
88278 * \param arg argument.
88279 */
88280-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
88281+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
88282+ struct drm_file *file_priv);
88283+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
88284 struct drm_file *file_priv);
88285
88286-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88287+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
88288 unsigned long arg);
88289
88290 #define DRM_IOCTL_NR(n) _IOC_NR(n)
88291@@ -243,10 +247,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88292 struct drm_ioctl_desc {
88293 unsigned int cmd;
88294 int flags;
88295- drm_ioctl_t *func;
88296+ drm_ioctl_t func;
88297 unsigned int cmd_drv;
88298 const char *name;
88299-};
88300+} __do_const;
88301
88302 /**
88303 * Creates a driver or general drm_ioctl_desc array entry for the given
88304@@ -632,7 +636,8 @@ struct drm_info_list {
88305 int (*show)(struct seq_file*, void*); /** show callback */
88306 u32 driver_features; /**< Required driver features for this entry */
88307 void *data;
88308-};
88309+} __do_const;
88310+typedef struct drm_info_list __no_const drm_info_list_no_const;
88311
88312 /**
88313 * debugfs node structure. This structure represents a debugfs file.
88314@@ -716,7 +721,7 @@ struct drm_device {
88315
88316 /** \name Usage Counters */
88317 /*@{ */
88318- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88319+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88320 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
88321 int buf_use; /**< Buffers in use -- cannot alloc */
88322 atomic_t buf_alloc; /**< Buffer allocation in progress */
88323diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
88324index c250a22..59d2094 100644
88325--- a/include/drm/drm_crtc_helper.h
88326+++ b/include/drm/drm_crtc_helper.h
88327@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
88328 int (*atomic_check)(struct drm_encoder *encoder,
88329 struct drm_crtc_state *crtc_state,
88330 struct drm_connector_state *conn_state);
88331-};
88332+} __no_const;
88333
88334 /**
88335 * struct drm_connector_helper_funcs - helper operations for connectors
88336diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
88337index d016dc5..3951fe0 100644
88338--- a/include/drm/i915_pciids.h
88339+++ b/include/drm/i915_pciids.h
88340@@ -37,7 +37,7 @@
88341 */
88342 #define INTEL_VGA_DEVICE(id, info) { \
88343 0x8086, id, \
88344- ~0, ~0, \
88345+ PCI_ANY_ID, PCI_ANY_ID, \
88346 0x030000, 0xff0000, \
88347 (unsigned long) info }
88348
88349diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
88350index 72dcbe8..8db58d7 100644
88351--- a/include/drm/ttm/ttm_memory.h
88352+++ b/include/drm/ttm/ttm_memory.h
88353@@ -48,7 +48,7 @@
88354
88355 struct ttm_mem_shrink {
88356 int (*do_shrink) (struct ttm_mem_shrink *);
88357-};
88358+} __no_const;
88359
88360 /**
88361 * struct ttm_mem_global - Global memory accounting structure.
88362diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
88363index 49a8284..9643967 100644
88364--- a/include/drm/ttm/ttm_page_alloc.h
88365+++ b/include/drm/ttm/ttm_page_alloc.h
88366@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
88367 */
88368 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
88369
88370+struct device;
88371 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88372 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88373
88374diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
88375index 4b840e8..155d235 100644
88376--- a/include/keys/asymmetric-subtype.h
88377+++ b/include/keys/asymmetric-subtype.h
88378@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
88379 /* Verify the signature on a key of this subtype (optional) */
88380 int (*verify_signature)(const struct key *key,
88381 const struct public_key_signature *sig);
88382-};
88383+} __do_const;
88384
88385 /**
88386 * asymmetric_key_subtype - Get the subtype from an asymmetric key
88387diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
88388index c1da539..1dcec55 100644
88389--- a/include/linux/atmdev.h
88390+++ b/include/linux/atmdev.h
88391@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
88392 #endif
88393
88394 struct k_atm_aal_stats {
88395-#define __HANDLE_ITEM(i) atomic_t i
88396+#define __HANDLE_ITEM(i) atomic_unchecked_t i
88397 __AAL_STAT_ITEMS
88398 #undef __HANDLE_ITEM
88399 };
88400@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
88401 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
88402 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
88403 struct module *owner;
88404-};
88405+} __do_const ;
88406
88407 struct atmphy_ops {
88408 int (*start)(struct atm_dev *dev);
88409diff --git a/include/linux/atomic.h b/include/linux/atomic.h
88410index 5b08a85..60922fb 100644
88411--- a/include/linux/atomic.h
88412+++ b/include/linux/atomic.h
88413@@ -12,7 +12,7 @@
88414 * Atomically adds @a to @v, so long as @v was not already @u.
88415 * Returns non-zero if @v was not @u, and zero otherwise.
88416 */
88417-static inline int atomic_add_unless(atomic_t *v, int a, int u)
88418+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
88419 {
88420 return __atomic_add_unless(v, a, u) != u;
88421 }
88422diff --git a/include/linux/audit.h b/include/linux/audit.h
88423index c2e7e3a..8bfc0e1 100644
88424--- a/include/linux/audit.h
88425+++ b/include/linux/audit.h
88426@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
88427 extern unsigned int audit_serial(void);
88428 extern int auditsc_get_stamp(struct audit_context *ctx,
88429 struct timespec *t, unsigned int *serial);
88430-extern int audit_set_loginuid(kuid_t loginuid);
88431+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
88432
88433 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
88434 {
88435diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
88436index 576e463..28fd926 100644
88437--- a/include/linux/binfmts.h
88438+++ b/include/linux/binfmts.h
88439@@ -44,7 +44,7 @@ struct linux_binprm {
88440 unsigned interp_flags;
88441 unsigned interp_data;
88442 unsigned long loader, exec;
88443-};
88444+} __randomize_layout;
88445
88446 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
88447 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
88448@@ -77,8 +77,10 @@ struct linux_binfmt {
88449 int (*load_binary)(struct linux_binprm *);
88450 int (*load_shlib)(struct file *);
88451 int (*core_dump)(struct coredump_params *cprm);
88452+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
88453+ void (*handle_mmap)(struct file *);
88454 unsigned long min_coredump; /* minimal dump size */
88455-};
88456+} __do_const __randomize_layout;
88457
88458 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
88459
88460diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
88461index dbfbf49..10be372 100644
88462--- a/include/linux/bitmap.h
88463+++ b/include/linux/bitmap.h
88464@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
88465 return __bitmap_full(src, nbits);
88466 }
88467
88468-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
88469+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
88470 {
88471 if (small_const_nbits(nbits))
88472 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
88473diff --git a/include/linux/bitops.h b/include/linux/bitops.h
88474index 5d858e0..336c1d9 100644
88475--- a/include/linux/bitops.h
88476+++ b/include/linux/bitops.h
88477@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
88478 * @word: value to rotate
88479 * @shift: bits to roll
88480 */
88481-static inline __u32 rol32(__u32 word, unsigned int shift)
88482+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
88483 {
88484 return (word << shift) | (word >> (32 - shift));
88485 }
88486@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
88487 * @word: value to rotate
88488 * @shift: bits to roll
88489 */
88490-static inline __u32 ror32(__u32 word, unsigned int shift)
88491+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
88492 {
88493 return (word >> shift) | (word << (32 - shift));
88494 }
88495@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
88496 return (__s32)(value << shift) >> shift;
88497 }
88498
88499-static inline unsigned fls_long(unsigned long l)
88500+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
88501 {
88502 if (sizeof(l) == 4)
88503 return fls(l);
88504diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
88505index 7f9a516..8889453 100644
88506--- a/include/linux/blkdev.h
88507+++ b/include/linux/blkdev.h
88508@@ -1616,7 +1616,7 @@ struct block_device_operations {
88509 /* this callback is with swap_lock and sometimes page table lock held */
88510 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
88511 struct module *owner;
88512-};
88513+} __do_const;
88514
88515 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
88516 unsigned long);
88517diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
88518index afc1343..9735539 100644
88519--- a/include/linux/blktrace_api.h
88520+++ b/include/linux/blktrace_api.h
88521@@ -25,7 +25,7 @@ struct blk_trace {
88522 struct dentry *dropped_file;
88523 struct dentry *msg_file;
88524 struct list_head running_list;
88525- atomic_t dropped;
88526+ atomic_unchecked_t dropped;
88527 };
88528
88529 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
88530diff --git a/include/linux/cache.h b/include/linux/cache.h
88531index 17e7e82..1d7da26 100644
88532--- a/include/linux/cache.h
88533+++ b/include/linux/cache.h
88534@@ -16,6 +16,14 @@
88535 #define __read_mostly
88536 #endif
88537
88538+#ifndef __read_only
88539+#ifdef CONFIG_PAX_KERNEXEC
88540+#error KERNEXEC requires __read_only
88541+#else
88542+#define __read_only __read_mostly
88543+#endif
88544+#endif
88545+
88546 #ifndef ____cacheline_aligned
88547 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
88548 #endif
88549diff --git a/include/linux/capability.h b/include/linux/capability.h
88550index aa93e5e..985a1b0 100644
88551--- a/include/linux/capability.h
88552+++ b/include/linux/capability.h
88553@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
88554 extern bool capable(int cap);
88555 extern bool ns_capable(struct user_namespace *ns, int cap);
88556 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
88557+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
88558 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
88559+extern bool capable_nolog(int cap);
88560+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
88561
88562 /* audit system wants to get cap info from files as well */
88563 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
88564
88565+extern int is_privileged_binary(const struct dentry *dentry);
88566+
88567 #endif /* !_LINUX_CAPABILITY_H */
88568diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
88569index 8609d57..86e4d79 100644
88570--- a/include/linux/cdrom.h
88571+++ b/include/linux/cdrom.h
88572@@ -87,7 +87,6 @@ struct cdrom_device_ops {
88573
88574 /* driver specifications */
88575 const int capability; /* capability flags */
88576- int n_minors; /* number of active minor devices */
88577 /* handle uniform packets for scsi type devices (scsi,atapi) */
88578 int (*generic_packet) (struct cdrom_device_info *,
88579 struct packet_command *);
88580diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
88581index 4ce9056..86caac6 100644
88582--- a/include/linux/cleancache.h
88583+++ b/include/linux/cleancache.h
88584@@ -31,7 +31,7 @@ struct cleancache_ops {
88585 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
88586 void (*invalidate_inode)(int, struct cleancache_filekey);
88587 void (*invalidate_fs)(int);
88588-};
88589+} __no_const;
88590
88591 extern struct cleancache_ops *
88592 cleancache_register_ops(struct cleancache_ops *ops);
88593diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
88594index 5591ea7..61b77ce 100644
88595--- a/include/linux/clk-provider.h
88596+++ b/include/linux/clk-provider.h
88597@@ -195,6 +195,7 @@ struct clk_ops {
88598 void (*init)(struct clk_hw *hw);
88599 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
88600 };
88601+typedef struct clk_ops __no_const clk_ops_no_const;
88602
88603 /**
88604 * struct clk_init_data - holds init data that's common to all clocks and is
88605diff --git a/include/linux/compat.h b/include/linux/compat.h
88606index ab25814..d1540d1 100644
88607--- a/include/linux/compat.h
88608+++ b/include/linux/compat.h
88609@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
88610 compat_size_t __user *len_ptr);
88611
88612 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
88613-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
88614+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
88615 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
88616 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
88617 compat_ssize_t msgsz, int msgflg);
88618@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
88619 long compat_sys_msgctl(int first, int second, void __user *uptr);
88620 long compat_sys_shmctl(int first, int second, void __user *uptr);
88621 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
88622- unsigned nsems, const struct compat_timespec __user *timeout);
88623+ compat_long_t nsems, const struct compat_timespec __user *timeout);
88624 asmlinkage long compat_sys_keyctl(u32 option,
88625 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
88626 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
88627@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
88628 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
88629 compat_ulong_t addr, compat_ulong_t data);
88630 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88631- compat_long_t addr, compat_long_t data);
88632+ compat_ulong_t addr, compat_ulong_t data);
88633
88634 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
88635 /*
88636diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
88637index cdf13ca..ba5e086 100644
88638--- a/include/linux/compiler-gcc.h
88639+++ b/include/linux/compiler-gcc.h
88640@@ -94,8 +94,8 @@
88641 */
88642 #define __pure __attribute__((pure))
88643 #define __aligned(x) __attribute__((aligned(x)))
88644-#define __printf(a, b) __attribute__((format(printf, a, b)))
88645-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
88646+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
88647+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
88648 #define noinline __attribute__((noinline))
88649 #define __attribute_const__ __attribute__((__const__))
88650 #define __maybe_unused __attribute__((unused))
88651diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
88652index 769e198..7ee7cb5 100644
88653--- a/include/linux/compiler-gcc4.h
88654+++ b/include/linux/compiler-gcc4.h
88655@@ -39,9 +39,38 @@
88656 # define __compiletime_warning(message) __attribute__((warning(message)))
88657 # define __compiletime_error(message) __attribute__((error(message)))
88658 #endif /* __CHECKER__ */
88659+
88660+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88661+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88662+#define __bos0(ptr) __bos((ptr), 0)
88663+#define __bos1(ptr) __bos((ptr), 1)
88664 #endif /* GCC_VERSION >= 40300 */
88665
88666 #if GCC_VERSION >= 40500
88667+
88668+#ifdef RANDSTRUCT_PLUGIN
88669+#define __randomize_layout __attribute__((randomize_layout))
88670+#define __no_randomize_layout __attribute__((no_randomize_layout))
88671+#endif
88672+
88673+#ifdef CONSTIFY_PLUGIN
88674+#define __no_const __attribute__((no_const))
88675+#define __do_const __attribute__((do_const))
88676+#endif
88677+
88678+#ifdef SIZE_OVERFLOW_PLUGIN
88679+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88680+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88681+#endif
88682+
88683+#ifdef LATENT_ENTROPY_PLUGIN
88684+#define __latent_entropy __attribute__((latent_entropy))
88685+#endif
88686+
88687+#ifdef INITIFY_PLUGIN
88688+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88689+#endif
88690+
88691 /*
88692 * Mark a position in code as unreachable. This can be used to
88693 * suppress control flow warnings after asm blocks that transfer
88694diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
88695index efee493..8aa8f6b 100644
88696--- a/include/linux/compiler-gcc5.h
88697+++ b/include/linux/compiler-gcc5.h
88698@@ -28,6 +28,34 @@
88699 # define __compiletime_error(message) __attribute__((error(message)))
88700 #endif /* __CHECKER__ */
88701
88702+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88703+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88704+#define __bos0(ptr) __bos((ptr), 0)
88705+#define __bos1(ptr) __bos((ptr), 1)
88706+
88707+#ifdef RANDSTRUCT_PLUGIN
88708+#define __randomize_layout __attribute__((randomize_layout))
88709+#define __no_randomize_layout __attribute__((no_randomize_layout))
88710+#endif
88711+
88712+#ifdef CONSTIFY_PLUGIN
88713+#define __no_const __attribute__((no_const))
88714+#define __do_const __attribute__((do_const))
88715+#endif
88716+
88717+#ifdef SIZE_OVERFLOW_PLUGIN
88718+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88719+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88720+#endif
88721+
88722+#ifdef LATENT_ENTROPY_PLUGIN
88723+#define __latent_entropy __attribute__((latent_entropy))
88724+#endif
88725+
88726+#ifdef INITIFY_PLUGIN
88727+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88728+#endif
88729+
88730 /*
88731 * Mark a position in code as unreachable. This can be used to
88732 * suppress control flow warnings after asm blocks that transfer
88733diff --git a/include/linux/compiler.h b/include/linux/compiler.h
88734index 1b45e4a..eff29a7 100644
88735--- a/include/linux/compiler.h
88736+++ b/include/linux/compiler.h
88737@@ -5,11 +5,14 @@
88738
88739 #ifdef __CHECKER__
88740 # define __user __attribute__((noderef, address_space(1)))
88741+# define __force_user __force __user
88742 # define __kernel __attribute__((address_space(0)))
88743+# define __force_kernel __force __kernel
88744 # define __safe __attribute__((safe))
88745 # define __force __attribute__((force))
88746 # define __nocast __attribute__((nocast))
88747 # define __iomem __attribute__((noderef, address_space(2)))
88748+# define __force_iomem __force __iomem
88749 # define __must_hold(x) __attribute__((context(x,1,1)))
88750 # define __acquires(x) __attribute__((context(x,0,1)))
88751 # define __releases(x) __attribute__((context(x,1,0)))
88752@@ -17,20 +20,37 @@
88753 # define __release(x) __context__(x,-1)
88754 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
88755 # define __percpu __attribute__((noderef, address_space(3)))
88756+# define __force_percpu __force __percpu
88757 #ifdef CONFIG_SPARSE_RCU_POINTER
88758 # define __rcu __attribute__((noderef, address_space(4)))
88759+# define __force_rcu __force __rcu
88760 #else
88761 # define __rcu
88762+# define __force_rcu
88763 #endif
88764 extern void __chk_user_ptr(const volatile void __user *);
88765 extern void __chk_io_ptr(const volatile void __iomem *);
88766 #else
88767-# define __user
88768-# define __kernel
88769+# ifdef CHECKER_PLUGIN
88770+//# define __user
88771+//# define __force_user
88772+//# define __kernel
88773+//# define __force_kernel
88774+# else
88775+# ifdef STRUCTLEAK_PLUGIN
88776+# define __user __attribute__((user))
88777+# else
88778+# define __user
88779+# endif
88780+# define __force_user
88781+# define __kernel
88782+# define __force_kernel
88783+# endif
88784 # define __safe
88785 # define __force
88786 # define __nocast
88787 # define __iomem
88788+# define __force_iomem
88789 # define __chk_user_ptr(x) (void)0
88790 # define __chk_io_ptr(x) (void)0
88791 # define __builtin_warning(x, y...) (1)
88792@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
88793 # define __release(x) (void)0
88794 # define __cond_lock(x,c) (c)
88795 # define __percpu
88796+# define __force_percpu
88797 # define __rcu
88798+# define __force_rcu
88799 #endif
88800
88801 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
88802@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
88803 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
88804 {
88805 switch (size) {
88806- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
88807- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
88808- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
88809+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
88810+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
88811+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
88812 #ifdef CONFIG_64BIT
88813- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
88814+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
88815 #endif
88816 default:
88817 barrier();
88818- __builtin_memcpy((void *)res, (const void *)p, size);
88819+ __builtin_memcpy(res, (const void *)p, size);
88820 data_access_exceeds_word_size();
88821 barrier();
88822 }
88823 }
88824
88825-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
88826+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
88827 {
88828 switch (size) {
88829- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
88830- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
88831- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
88832+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
88833+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
88834+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
88835 #ifdef CONFIG_64BIT
88836- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
88837+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
88838 #endif
88839 default:
88840 barrier();
88841- __builtin_memcpy((void *)p, (const void *)res, size);
88842+ __builtin_memcpy((void *)p, res, size);
88843 data_access_exceeds_word_size();
88844 barrier();
88845 }
88846@@ -364,6 +386,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88847 # define __attribute_const__ /* unimplemented */
88848 #endif
88849
88850+#ifndef __randomize_layout
88851+# define __randomize_layout
88852+#endif
88853+
88854+#ifndef __no_randomize_layout
88855+# define __no_randomize_layout
88856+#endif
88857+
88858+#ifndef __no_const
88859+# define __no_const
88860+#endif
88861+
88862+#ifndef __do_const
88863+# define __do_const
88864+#endif
88865+
88866+#ifndef __size_overflow
88867+# define __size_overflow(...)
88868+#endif
88869+
88870+#ifndef __intentional_overflow
88871+# define __intentional_overflow(...)
88872+#endif
88873+
88874+#ifndef __latent_entropy
88875+# define __latent_entropy
88876+#endif
88877+
88878+#ifndef __nocapture
88879+# define __nocapture(...)
88880+#endif
88881+
88882 /*
88883 * Tell gcc if a function is cold. The compiler will assume any path
88884 * directly leading to the call is unlikely.
88885@@ -373,6 +427,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88886 #define __cold
88887 #endif
88888
88889+#ifndef __alloc_size
88890+#define __alloc_size(...)
88891+#endif
88892+
88893+#ifndef __bos
88894+#define __bos(ptr, arg)
88895+#endif
88896+
88897+#ifndef __bos0
88898+#define __bos0(ptr)
88899+#endif
88900+
88901+#ifndef __bos1
88902+#define __bos1(ptr)
88903+#endif
88904+
88905 /* Simple shorthand for a section definition */
88906 #ifndef __section
88907 # define __section(S) __attribute__ ((__section__(#S)))
88908@@ -387,6 +457,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88909 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
88910 #endif
88911
88912+#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))
88913+
88914 /* Is this type a native word size -- useful for atomic operations */
88915 #ifndef __native_word
88916 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
88917@@ -466,8 +538,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88918 */
88919 #define __ACCESS_ONCE(x) ({ \
88920 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
88921- (volatile typeof(x) *)&(x); })
88922+ (volatile const typeof(x) *)&(x); })
88923 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
88924+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
88925
88926 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
88927 #ifdef CONFIG_KPROBES
88928diff --git a/include/linux/completion.h b/include/linux/completion.h
88929index 5d5aaae..0ea9b84 100644
88930--- a/include/linux/completion.h
88931+++ b/include/linux/completion.h
88932@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
88933
88934 extern void wait_for_completion(struct completion *);
88935 extern void wait_for_completion_io(struct completion *);
88936-extern int wait_for_completion_interruptible(struct completion *x);
88937-extern int wait_for_completion_killable(struct completion *x);
88938+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
88939+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
88940 extern unsigned long wait_for_completion_timeout(struct completion *x,
88941- unsigned long timeout);
88942+ unsigned long timeout) __intentional_overflow(-1);
88943 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
88944- unsigned long timeout);
88945+ unsigned long timeout) __intentional_overflow(-1);
88946 extern long wait_for_completion_interruptible_timeout(
88947- struct completion *x, unsigned long timeout);
88948+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
88949 extern long wait_for_completion_killable_timeout(
88950- struct completion *x, unsigned long timeout);
88951+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
88952 extern bool try_wait_for_completion(struct completion *x);
88953 extern bool completion_done(struct completion *x);
88954
88955diff --git a/include/linux/configfs.h b/include/linux/configfs.h
88956index 34025df..d94bbbc 100644
88957--- a/include/linux/configfs.h
88958+++ b/include/linux/configfs.h
88959@@ -125,7 +125,7 @@ struct configfs_attribute {
88960 const char *ca_name;
88961 struct module *ca_owner;
88962 umode_t ca_mode;
88963-};
88964+} __do_const;
88965
88966 /*
88967 * Users often need to create attribute structures for their configurable
88968diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
88969index 2ee4888..0451f5e 100644
88970--- a/include/linux/cpufreq.h
88971+++ b/include/linux/cpufreq.h
88972@@ -207,6 +207,7 @@ struct global_attr {
88973 ssize_t (*store)(struct kobject *a, struct attribute *b,
88974 const char *c, size_t count);
88975 };
88976+typedef struct global_attr __no_const global_attr_no_const;
88977
88978 #define define_one_global_ro(_name) \
88979 static struct global_attr _name = \
88980@@ -278,7 +279,7 @@ struct cpufreq_driver {
88981 bool boost_supported;
88982 bool boost_enabled;
88983 int (*set_boost)(int state);
88984-};
88985+} __do_const;
88986
88987 /* flags */
88988 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
88989diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
88990index 9c5e892..feb34e0 100644
88991--- a/include/linux/cpuidle.h
88992+++ b/include/linux/cpuidle.h
88993@@ -59,7 +59,8 @@ struct cpuidle_state {
88994 void (*enter_freeze) (struct cpuidle_device *dev,
88995 struct cpuidle_driver *drv,
88996 int index);
88997-};
88998+} __do_const;
88999+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
89000
89001 /* Idle State Flags */
89002 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
89003@@ -227,7 +228,7 @@ struct cpuidle_governor {
89004 void (*reflect) (struct cpuidle_device *dev, int index);
89005
89006 struct module *owner;
89007-};
89008+} __do_const;
89009
89010 #ifdef CONFIG_CPU_IDLE
89011 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
89012diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
89013index 086549a..a572d94 100644
89014--- a/include/linux/cpumask.h
89015+++ b/include/linux/cpumask.h
89016@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89017 }
89018
89019 /* Valid inputs for n are -1 and 0. */
89020-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89021+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89022 {
89023 return n+1;
89024 }
89025
89026-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89027+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89028 {
89029 return n+1;
89030 }
89031
89032-static inline unsigned int cpumask_next_and(int n,
89033+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
89034 const struct cpumask *srcp,
89035 const struct cpumask *andp)
89036 {
89037@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89038 *
89039 * Returns >= nr_cpu_ids if no further cpus set.
89040 */
89041-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89042+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89043 {
89044 /* -1 is a legal arg here. */
89045 if (n != -1)
89046@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89047 *
89048 * Returns >= nr_cpu_ids if no further cpus unset.
89049 */
89050-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89051+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89052 {
89053 /* -1 is a legal arg here. */
89054 if (n != -1)
89055@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89056 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
89057 }
89058
89059-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
89060+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
89061 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
89062 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
89063
89064@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
89065 * cpumask_weight - Count of bits in *srcp
89066 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
89067 */
89068-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
89069+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
89070 {
89071 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
89072 }
89073diff --git a/include/linux/cred.h b/include/linux/cred.h
89074index 2fb2ca2..d6a3340 100644
89075--- a/include/linux/cred.h
89076+++ b/include/linux/cred.h
89077@@ -35,7 +35,7 @@ struct group_info {
89078 int nblocks;
89079 kgid_t small_block[NGROUPS_SMALL];
89080 kgid_t *blocks[0];
89081-};
89082+} __randomize_layout;
89083
89084 /**
89085 * get_group_info - Get a reference to a group info structure
89086@@ -137,7 +137,7 @@ struct cred {
89087 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
89088 struct group_info *group_info; /* supplementary groups for euid/fsgid */
89089 struct rcu_head rcu; /* RCU deletion hook */
89090-};
89091+} __randomize_layout;
89092
89093 extern void __put_cred(struct cred *);
89094 extern void exit_creds(struct task_struct *);
89095@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
89096 static inline void validate_process_creds(void)
89097 {
89098 }
89099+static inline void validate_task_creds(struct task_struct *task)
89100+{
89101+}
89102 #endif
89103
89104 /**
89105@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
89106
89107 #define task_uid(task) (task_cred_xxx((task), uid))
89108 #define task_euid(task) (task_cred_xxx((task), euid))
89109+#define task_securebits(task) (task_cred_xxx((task), securebits))
89110
89111 #define current_cred_xxx(xxx) \
89112 ({ \
89113diff --git a/include/linux/crypto.h b/include/linux/crypto.h
89114index fb5ef16..05d1e59 100644
89115--- a/include/linux/crypto.h
89116+++ b/include/linux/crypto.h
89117@@ -626,7 +626,7 @@ struct cipher_tfm {
89118 const u8 *key, unsigned int keylen);
89119 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89120 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89121-};
89122+} __no_const;
89123
89124 struct hash_tfm {
89125 int (*init)(struct hash_desc *desc);
89126@@ -647,13 +647,13 @@ struct compress_tfm {
89127 int (*cot_decompress)(struct crypto_tfm *tfm,
89128 const u8 *src, unsigned int slen,
89129 u8 *dst, unsigned int *dlen);
89130-};
89131+} __no_const;
89132
89133 struct rng_tfm {
89134 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
89135 unsigned int dlen);
89136 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
89137-};
89138+} __no_const;
89139
89140 #define crt_ablkcipher crt_u.ablkcipher
89141 #define crt_aead crt_u.aead
89142diff --git a/include/linux/ctype.h b/include/linux/ctype.h
89143index 653589e..4ef254a 100644
89144--- a/include/linux/ctype.h
89145+++ b/include/linux/ctype.h
89146@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
89147 * Fast implementation of tolower() for internal usage. Do not use in your
89148 * code.
89149 */
89150-static inline char _tolower(const char c)
89151+static inline unsigned char _tolower(const unsigned char c)
89152 {
89153 return c | 0x20;
89154 }
89155diff --git a/include/linux/dcache.h b/include/linux/dcache.h
89156index d835879..c8e5b92 100644
89157--- a/include/linux/dcache.h
89158+++ b/include/linux/dcache.h
89159@@ -123,6 +123,9 @@ struct dentry {
89160 unsigned long d_time; /* used by d_revalidate */
89161 void *d_fsdata; /* fs-specific data */
89162
89163+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
89164+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
89165+#endif
89166 struct list_head d_lru; /* LRU list */
89167 struct list_head d_child; /* child of parent list */
89168 struct list_head d_subdirs; /* our children */
89169@@ -133,7 +136,7 @@ struct dentry {
89170 struct hlist_node d_alias; /* inode alias list */
89171 struct rcu_head d_rcu;
89172 } d_u;
89173-};
89174+} __randomize_layout;
89175
89176 /*
89177 * dentry->d_lock spinlock nesting subclasses:
89178@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
89179
89180 static inline unsigned d_count(const struct dentry *dentry)
89181 {
89182- return dentry->d_lockref.count;
89183+ return __lockref_read(&dentry->d_lockref);
89184 }
89185
89186 /*
89187@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
89188 static inline struct dentry *dget_dlock(struct dentry *dentry)
89189 {
89190 if (dentry)
89191- dentry->d_lockref.count++;
89192+ __lockref_inc(&dentry->d_lockref);
89193 return dentry;
89194 }
89195
89196diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
89197index 7925bf0..d5143d2 100644
89198--- a/include/linux/decompress/mm.h
89199+++ b/include/linux/decompress/mm.h
89200@@ -77,7 +77,7 @@ static void free(void *where)
89201 * warnings when not needed (indeed large_malloc / large_free are not
89202 * needed by inflate */
89203
89204-#define malloc(a) kmalloc(a, GFP_KERNEL)
89205+#define malloc(a) kmalloc((a), GFP_KERNEL)
89206 #define free(a) kfree(a)
89207
89208 #define large_malloc(a) vmalloc(a)
89209diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
89210index ce447f0..83c66bd 100644
89211--- a/include/linux/devfreq.h
89212+++ b/include/linux/devfreq.h
89213@@ -114,7 +114,7 @@ struct devfreq_governor {
89214 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
89215 int (*event_handler)(struct devfreq *devfreq,
89216 unsigned int event, void *data);
89217-};
89218+} __do_const;
89219
89220 /**
89221 * struct devfreq - Device devfreq structure
89222diff --git a/include/linux/device.h b/include/linux/device.h
89223index 0eb8ee2..c603b6a 100644
89224--- a/include/linux/device.h
89225+++ b/include/linux/device.h
89226@@ -311,7 +311,7 @@ struct subsys_interface {
89227 struct list_head node;
89228 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
89229 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
89230-};
89231+} __do_const;
89232
89233 int subsys_interface_register(struct subsys_interface *sif);
89234 void subsys_interface_unregister(struct subsys_interface *sif);
89235@@ -507,7 +507,7 @@ struct device_type {
89236 void (*release)(struct device *dev);
89237
89238 const struct dev_pm_ops *pm;
89239-};
89240+} __do_const;
89241
89242 /* interface for exporting device attributes */
89243 struct device_attribute {
89244@@ -517,11 +517,12 @@ struct device_attribute {
89245 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
89246 const char *buf, size_t count);
89247 };
89248+typedef struct device_attribute __no_const device_attribute_no_const;
89249
89250 struct dev_ext_attribute {
89251 struct device_attribute attr;
89252 void *var;
89253-};
89254+} __do_const;
89255
89256 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
89257 char *buf);
89258diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
89259index c3007cb..43efc8c 100644
89260--- a/include/linux/dma-mapping.h
89261+++ b/include/linux/dma-mapping.h
89262@@ -60,7 +60,7 @@ struct dma_map_ops {
89263 u64 (*get_required_mask)(struct device *dev);
89264 #endif
89265 int is_phys;
89266-};
89267+} __do_const;
89268
89269 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
89270
89271diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
89272index b6997a0..108be6c 100644
89273--- a/include/linux/dmaengine.h
89274+++ b/include/linux/dmaengine.h
89275@@ -1133,9 +1133,9 @@ struct dma_pinned_list {
89276 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
89277 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
89278
89279-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89280+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89281 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
89282-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89283+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89284 struct dma_pinned_list *pinned_list, struct page *page,
89285 unsigned int offset, size_t len);
89286
89287diff --git a/include/linux/efi.h b/include/linux/efi.h
89288index cf7e431..d239dce 100644
89289--- a/include/linux/efi.h
89290+++ b/include/linux/efi.h
89291@@ -1056,6 +1056,7 @@ struct efivar_operations {
89292 efi_set_variable_nonblocking_t *set_variable_nonblocking;
89293 efi_query_variable_store_t *query_variable_store;
89294 };
89295+typedef struct efivar_operations __no_const efivar_operations_no_const;
89296
89297 struct efivars {
89298 /*
89299diff --git a/include/linux/elf.h b/include/linux/elf.h
89300index 20fa8d8..3d0dd18 100644
89301--- a/include/linux/elf.h
89302+++ b/include/linux/elf.h
89303@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
89304 #define elf_note elf32_note
89305 #define elf_addr_t Elf32_Off
89306 #define Elf_Half Elf32_Half
89307+#define elf_dyn Elf32_Dyn
89308
89309 #else
89310
89311@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
89312 #define elf_note elf64_note
89313 #define elf_addr_t Elf64_Off
89314 #define Elf_Half Elf64_Half
89315+#define elf_dyn Elf64_Dyn
89316
89317 #endif
89318
89319diff --git a/include/linux/err.h b/include/linux/err.h
89320index a729120..6ede2c9 100644
89321--- a/include/linux/err.h
89322+++ b/include/linux/err.h
89323@@ -20,12 +20,12 @@
89324
89325 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
89326
89327-static inline void * __must_check ERR_PTR(long error)
89328+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
89329 {
89330 return (void *) error;
89331 }
89332
89333-static inline long __must_check PTR_ERR(__force const void *ptr)
89334+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
89335 {
89336 return (long) ptr;
89337 }
89338diff --git a/include/linux/extcon.h b/include/linux/extcon.h
89339index 36f49c4..a2a1f4c 100644
89340--- a/include/linux/extcon.h
89341+++ b/include/linux/extcon.h
89342@@ -135,7 +135,7 @@ struct extcon_dev {
89343 /* /sys/class/extcon/.../mutually_exclusive/... */
89344 struct attribute_group attr_g_muex;
89345 struct attribute **attrs_muex;
89346- struct device_attribute *d_attrs_muex;
89347+ device_attribute_no_const *d_attrs_muex;
89348 };
89349
89350 /**
89351diff --git a/include/linux/fb.h b/include/linux/fb.h
89352index 043f328..180ccbf 100644
89353--- a/include/linux/fb.h
89354+++ b/include/linux/fb.h
89355@@ -305,7 +305,8 @@ struct fb_ops {
89356 /* called at KDB enter and leave time to prepare the console */
89357 int (*fb_debug_enter)(struct fb_info *info);
89358 int (*fb_debug_leave)(struct fb_info *info);
89359-};
89360+} __do_const;
89361+typedef struct fb_ops __no_const fb_ops_no_const;
89362
89363 #ifdef CONFIG_FB_TILEBLITTING
89364 #define FB_TILE_CURSOR_NONE 0
89365diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
89366index 230f87b..1fd0485 100644
89367--- a/include/linux/fdtable.h
89368+++ b/include/linux/fdtable.h
89369@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
89370 void put_files_struct(struct files_struct *fs);
89371 void reset_files_struct(struct files_struct *);
89372 int unshare_files(struct files_struct **);
89373-struct files_struct *dup_fd(struct files_struct *, int *);
89374+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
89375 void do_close_on_exec(struct files_struct *);
89376 int iterate_fd(struct files_struct *, unsigned,
89377 int (*)(const void *, struct file *, unsigned),
89378diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
89379index 8293262..2b3b8bd 100644
89380--- a/include/linux/frontswap.h
89381+++ b/include/linux/frontswap.h
89382@@ -11,7 +11,7 @@ struct frontswap_ops {
89383 int (*load)(unsigned, pgoff_t, struct page *);
89384 void (*invalidate_page)(unsigned, pgoff_t);
89385 void (*invalidate_area)(unsigned);
89386-};
89387+} __no_const;
89388
89389 extern bool frontswap_enabled;
89390 extern struct frontswap_ops *
89391diff --git a/include/linux/fs.h b/include/linux/fs.h
89392index 52cc449..31f35cb 100644
89393--- a/include/linux/fs.h
89394+++ b/include/linux/fs.h
89395@@ -410,7 +410,7 @@ struct address_space {
89396 spinlock_t private_lock; /* for use by the address_space */
89397 struct list_head private_list; /* ditto */
89398 void *private_data; /* ditto */
89399-} __attribute__((aligned(sizeof(long))));
89400+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
89401 /*
89402 * On most architectures that alignment is already the case; but
89403 * must be enforced here for CRIS, to let the least significant bit
89404@@ -453,7 +453,7 @@ struct block_device {
89405 int bd_fsfreeze_count;
89406 /* Mutex for freeze */
89407 struct mutex bd_fsfreeze_mutex;
89408-};
89409+} __randomize_layout;
89410
89411 /*
89412 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
89413@@ -639,7 +639,7 @@ struct inode {
89414 #endif
89415
89416 void *i_private; /* fs or device private pointer */
89417-};
89418+} __randomize_layout;
89419
89420 static inline int inode_unhashed(struct inode *inode)
89421 {
89422@@ -834,7 +834,7 @@ struct file {
89423 struct list_head f_tfile_llink;
89424 #endif /* #ifdef CONFIG_EPOLL */
89425 struct address_space *f_mapping;
89426-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
89427+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
89428
89429 struct file_handle {
89430 __u32 handle_bytes;
89431@@ -962,7 +962,7 @@ struct file_lock {
89432 int state; /* state of grant or error if -ve */
89433 } afs;
89434 } fl_u;
89435-};
89436+} __randomize_layout;
89437
89438 struct file_lock_context {
89439 spinlock_t flc_lock;
89440@@ -1316,7 +1316,7 @@ struct super_block {
89441 * Indicates how deep in a filesystem stack this SB is
89442 */
89443 int s_stack_depth;
89444-};
89445+} __randomize_layout;
89446
89447 extern struct timespec current_fs_time(struct super_block *sb);
89448
89449@@ -1570,7 +1570,8 @@ struct file_operations {
89450 #ifndef CONFIG_MMU
89451 unsigned (*mmap_capabilities)(struct file *);
89452 #endif
89453-};
89454+} __do_const __randomize_layout;
89455+typedef struct file_operations __no_const file_operations_no_const;
89456
89457 struct inode_operations {
89458 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
89459@@ -2269,7 +2270,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
89460 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
89461 unsigned int count, const char *name,
89462 const struct file_operations *fops);
89463-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89464+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89465 unsigned int count, const char *name);
89466 extern void unregister_chrdev_region(dev_t, unsigned);
89467 extern void chrdev_show(struct seq_file *,off_t);
89468@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
89469 return !IS_DEADDIR(inode);
89470 }
89471
89472+static inline bool is_sidechannel_device(const struct inode *inode)
89473+{
89474+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
89475+ umode_t mode = inode->i_mode;
89476+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
89477+#else
89478+ return false;
89479+#endif
89480+}
89481+
89482 #endif /* _LINUX_FS_H */
89483diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
89484index 0efc3e6..fd23610 100644
89485--- a/include/linux/fs_struct.h
89486+++ b/include/linux/fs_struct.h
89487@@ -6,13 +6,13 @@
89488 #include <linux/seqlock.h>
89489
89490 struct fs_struct {
89491- int users;
89492+ atomic_t users;
89493 spinlock_t lock;
89494 seqcount_t seq;
89495 int umask;
89496 int in_exec;
89497 struct path root, pwd;
89498-};
89499+} __randomize_layout;
89500
89501 extern struct kmem_cache *fs_cachep;
89502
89503diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
89504index 7714849..a4a5c7a 100644
89505--- a/include/linux/fscache-cache.h
89506+++ b/include/linux/fscache-cache.h
89507@@ -113,7 +113,7 @@ struct fscache_operation {
89508 fscache_operation_release_t release;
89509 };
89510
89511-extern atomic_t fscache_op_debug_id;
89512+extern atomic_unchecked_t fscache_op_debug_id;
89513 extern void fscache_op_work_func(struct work_struct *work);
89514
89515 extern void fscache_enqueue_operation(struct fscache_operation *);
89516@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
89517 INIT_WORK(&op->work, fscache_op_work_func);
89518 atomic_set(&op->usage, 1);
89519 op->state = FSCACHE_OP_ST_INITIALISED;
89520- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
89521+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
89522 op->processor = processor;
89523 op->release = release;
89524 INIT_LIST_HEAD(&op->pend_link);
89525diff --git a/include/linux/fscache.h b/include/linux/fscache.h
89526index 115bb81..e7b812b 100644
89527--- a/include/linux/fscache.h
89528+++ b/include/linux/fscache.h
89529@@ -152,7 +152,7 @@ struct fscache_cookie_def {
89530 * - this is mandatory for any object that may have data
89531 */
89532 void (*now_uncached)(void *cookie_netfs_data);
89533-};
89534+} __do_const;
89535
89536 /*
89537 * fscache cached network filesystem type
89538diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
89539index 7ee1774..72505b8 100644
89540--- a/include/linux/fsnotify.h
89541+++ b/include/linux/fsnotify.h
89542@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
89543 struct inode *inode = file_inode(file);
89544 __u32 mask = FS_ACCESS;
89545
89546+ if (is_sidechannel_device(inode))
89547+ return;
89548+
89549 if (S_ISDIR(inode->i_mode))
89550 mask |= FS_ISDIR;
89551
89552@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
89553 struct inode *inode = file_inode(file);
89554 __u32 mask = FS_MODIFY;
89555
89556+ if (is_sidechannel_device(inode))
89557+ return;
89558+
89559 if (S_ISDIR(inode->i_mode))
89560 mask |= FS_ISDIR;
89561
89562@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
89563 */
89564 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
89565 {
89566- return kstrdup(name, GFP_KERNEL);
89567+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
89568 }
89569
89570 /*
89571diff --git a/include/linux/genhd.h b/include/linux/genhd.h
89572index ec274e0..e678159 100644
89573--- a/include/linux/genhd.h
89574+++ b/include/linux/genhd.h
89575@@ -194,7 +194,7 @@ struct gendisk {
89576 struct kobject *slave_dir;
89577
89578 struct timer_rand_state *random;
89579- atomic_t sync_io; /* RAID */
89580+ atomic_unchecked_t sync_io; /* RAID */
89581 struct disk_events *ev;
89582 #ifdef CONFIG_BLK_DEV_INTEGRITY
89583 struct blk_integrity *integrity;
89584@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
89585 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
89586
89587 /* drivers/char/random.c */
89588-extern void add_disk_randomness(struct gendisk *disk);
89589+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
89590 extern void rand_initialize_disk(struct gendisk *disk);
89591
89592 static inline sector_t get_start_sect(struct block_device *bdev)
89593diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
89594index 667c311..abac2a7 100644
89595--- a/include/linux/genl_magic_func.h
89596+++ b/include/linux/genl_magic_func.h
89597@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
89598 },
89599
89600 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
89601-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
89602+static struct genl_ops ZZZ_genl_ops[] = {
89603 #include GENL_MAGIC_INCLUDE_FILE
89604 };
89605
89606diff --git a/include/linux/gfp.h b/include/linux/gfp.h
89607index eb6fafe..9360779 100644
89608--- a/include/linux/gfp.h
89609+++ b/include/linux/gfp.h
89610@@ -35,6 +35,13 @@ struct vm_area_struct;
89611 #define ___GFP_NO_KSWAPD 0x400000u
89612 #define ___GFP_OTHER_NODE 0x800000u
89613 #define ___GFP_WRITE 0x1000000u
89614+
89615+#ifdef CONFIG_PAX_USERCOPY_SLABS
89616+#define ___GFP_USERCOPY 0x2000000u
89617+#else
89618+#define ___GFP_USERCOPY 0
89619+#endif
89620+
89621 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
89622
89623 /*
89624@@ -92,6 +99,7 @@ struct vm_area_struct;
89625 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
89626 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
89627 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
89628+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
89629
89630 /*
89631 * This may seem redundant, but it's a way of annotating false positives vs.
89632@@ -99,7 +107,7 @@ struct vm_area_struct;
89633 */
89634 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
89635
89636-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
89637+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
89638 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
89639
89640 /* This equals 0, but use constants in case they ever change */
89641@@ -154,6 +162,8 @@ struct vm_area_struct;
89642 /* 4GB DMA on some platforms */
89643 #define GFP_DMA32 __GFP_DMA32
89644
89645+#define GFP_USERCOPY __GFP_USERCOPY
89646+
89647 /* Convert GFP flags to their corresponding migrate type */
89648 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
89649 {
89650diff --git a/include/linux/gracl.h b/include/linux/gracl.h
89651new file mode 100644
89652index 0000000..91858e4
89653--- /dev/null
89654+++ b/include/linux/gracl.h
89655@@ -0,0 +1,342 @@
89656+#ifndef GR_ACL_H
89657+#define GR_ACL_H
89658+
89659+#include <linux/grdefs.h>
89660+#include <linux/resource.h>
89661+#include <linux/capability.h>
89662+#include <linux/dcache.h>
89663+#include <asm/resource.h>
89664+
89665+/* Major status information */
89666+
89667+#define GR_VERSION "grsecurity 3.1"
89668+#define GRSECURITY_VERSION 0x3100
89669+
89670+enum {
89671+ GR_SHUTDOWN = 0,
89672+ GR_ENABLE = 1,
89673+ GR_SPROLE = 2,
89674+ GR_OLDRELOAD = 3,
89675+ GR_SEGVMOD = 4,
89676+ GR_STATUS = 5,
89677+ GR_UNSPROLE = 6,
89678+ GR_PASSSET = 7,
89679+ GR_SPROLEPAM = 8,
89680+ GR_RELOAD = 9,
89681+};
89682+
89683+/* Password setup definitions
89684+ * kernel/grhash.c */
89685+enum {
89686+ GR_PW_LEN = 128,
89687+ GR_SALT_LEN = 16,
89688+ GR_SHA_LEN = 32,
89689+};
89690+
89691+enum {
89692+ GR_SPROLE_LEN = 64,
89693+};
89694+
89695+enum {
89696+ GR_NO_GLOB = 0,
89697+ GR_REG_GLOB,
89698+ GR_CREATE_GLOB
89699+};
89700+
89701+#define GR_NLIMITS 32
89702+
89703+/* Begin Data Structures */
89704+
89705+struct sprole_pw {
89706+ unsigned char *rolename;
89707+ unsigned char salt[GR_SALT_LEN];
89708+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
89709+};
89710+
89711+struct name_entry {
89712+ __u32 key;
89713+ u64 inode;
89714+ dev_t device;
89715+ char *name;
89716+ __u16 len;
89717+ __u8 deleted;
89718+ struct name_entry *prev;
89719+ struct name_entry *next;
89720+};
89721+
89722+struct inodev_entry {
89723+ struct name_entry *nentry;
89724+ struct inodev_entry *prev;
89725+ struct inodev_entry *next;
89726+};
89727+
89728+struct acl_role_db {
89729+ struct acl_role_label **r_hash;
89730+ __u32 r_size;
89731+};
89732+
89733+struct inodev_db {
89734+ struct inodev_entry **i_hash;
89735+ __u32 i_size;
89736+};
89737+
89738+struct name_db {
89739+ struct name_entry **n_hash;
89740+ __u32 n_size;
89741+};
89742+
89743+struct crash_uid {
89744+ uid_t uid;
89745+ unsigned long expires;
89746+};
89747+
89748+struct gr_hash_struct {
89749+ void **table;
89750+ void **nametable;
89751+ void *first;
89752+ __u32 table_size;
89753+ __u32 used_size;
89754+ int type;
89755+};
89756+
89757+/* Userspace Grsecurity ACL data structures */
89758+
89759+struct acl_subject_label {
89760+ char *filename;
89761+ u64 inode;
89762+ dev_t device;
89763+ __u32 mode;
89764+ kernel_cap_t cap_mask;
89765+ kernel_cap_t cap_lower;
89766+ kernel_cap_t cap_invert_audit;
89767+
89768+ struct rlimit res[GR_NLIMITS];
89769+ __u32 resmask;
89770+
89771+ __u8 user_trans_type;
89772+ __u8 group_trans_type;
89773+ uid_t *user_transitions;
89774+ gid_t *group_transitions;
89775+ __u16 user_trans_num;
89776+ __u16 group_trans_num;
89777+
89778+ __u32 sock_families[2];
89779+ __u32 ip_proto[8];
89780+ __u32 ip_type;
89781+ struct acl_ip_label **ips;
89782+ __u32 ip_num;
89783+ __u32 inaddr_any_override;
89784+
89785+ __u32 crashes;
89786+ unsigned long expires;
89787+
89788+ struct acl_subject_label *parent_subject;
89789+ struct gr_hash_struct *hash;
89790+ struct acl_subject_label *prev;
89791+ struct acl_subject_label *next;
89792+
89793+ struct acl_object_label **obj_hash;
89794+ __u32 obj_hash_size;
89795+ __u16 pax_flags;
89796+};
89797+
89798+struct role_allowed_ip {
89799+ __u32 addr;
89800+ __u32 netmask;
89801+
89802+ struct role_allowed_ip *prev;
89803+ struct role_allowed_ip *next;
89804+};
89805+
89806+struct role_transition {
89807+ char *rolename;
89808+
89809+ struct role_transition *prev;
89810+ struct role_transition *next;
89811+};
89812+
89813+struct acl_role_label {
89814+ char *rolename;
89815+ uid_t uidgid;
89816+ __u16 roletype;
89817+
89818+ __u16 auth_attempts;
89819+ unsigned long expires;
89820+
89821+ struct acl_subject_label *root_label;
89822+ struct gr_hash_struct *hash;
89823+
89824+ struct acl_role_label *prev;
89825+ struct acl_role_label *next;
89826+
89827+ struct role_transition *transitions;
89828+ struct role_allowed_ip *allowed_ips;
89829+ uid_t *domain_children;
89830+ __u16 domain_child_num;
89831+
89832+ umode_t umask;
89833+
89834+ struct acl_subject_label **subj_hash;
89835+ __u32 subj_hash_size;
89836+};
89837+
89838+struct user_acl_role_db {
89839+ struct acl_role_label **r_table;
89840+ __u32 num_pointers; /* Number of allocations to track */
89841+ __u32 num_roles; /* Number of roles */
89842+ __u32 num_domain_children; /* Number of domain children */
89843+ __u32 num_subjects; /* Number of subjects */
89844+ __u32 num_objects; /* Number of objects */
89845+};
89846+
89847+struct acl_object_label {
89848+ char *filename;
89849+ u64 inode;
89850+ dev_t device;
89851+ __u32 mode;
89852+
89853+ struct acl_subject_label *nested;
89854+ struct acl_object_label *globbed;
89855+
89856+ /* next two structures not used */
89857+
89858+ struct acl_object_label *prev;
89859+ struct acl_object_label *next;
89860+};
89861+
89862+struct acl_ip_label {
89863+ char *iface;
89864+ __u32 addr;
89865+ __u32 netmask;
89866+ __u16 low, high;
89867+ __u8 mode;
89868+ __u32 type;
89869+ __u32 proto[8];
89870+
89871+ /* next two structures not used */
89872+
89873+ struct acl_ip_label *prev;
89874+ struct acl_ip_label *next;
89875+};
89876+
89877+struct gr_arg {
89878+ struct user_acl_role_db role_db;
89879+ unsigned char pw[GR_PW_LEN];
89880+ unsigned char salt[GR_SALT_LEN];
89881+ unsigned char sum[GR_SHA_LEN];
89882+ unsigned char sp_role[GR_SPROLE_LEN];
89883+ struct sprole_pw *sprole_pws;
89884+ dev_t segv_device;
89885+ u64 segv_inode;
89886+ uid_t segv_uid;
89887+ __u16 num_sprole_pws;
89888+ __u16 mode;
89889+};
89890+
89891+struct gr_arg_wrapper {
89892+ struct gr_arg *arg;
89893+ __u32 version;
89894+ __u32 size;
89895+};
89896+
89897+struct subject_map {
89898+ struct acl_subject_label *user;
89899+ struct acl_subject_label *kernel;
89900+ struct subject_map *prev;
89901+ struct subject_map *next;
89902+};
89903+
89904+struct acl_subj_map_db {
89905+ struct subject_map **s_hash;
89906+ __u32 s_size;
89907+};
89908+
89909+struct gr_policy_state {
89910+ struct sprole_pw **acl_special_roles;
89911+ __u16 num_sprole_pws;
89912+ struct acl_role_label *kernel_role;
89913+ struct acl_role_label *role_list;
89914+ struct acl_role_label *default_role;
89915+ struct acl_role_db acl_role_set;
89916+ struct acl_subj_map_db subj_map_set;
89917+ struct name_db name_set;
89918+ struct inodev_db inodev_set;
89919+};
89920+
89921+struct gr_alloc_state {
89922+ unsigned long alloc_stack_next;
89923+ unsigned long alloc_stack_size;
89924+ void **alloc_stack;
89925+};
89926+
89927+struct gr_reload_state {
89928+ struct gr_policy_state oldpolicy;
89929+ struct gr_alloc_state oldalloc;
89930+ struct gr_policy_state newpolicy;
89931+ struct gr_alloc_state newalloc;
89932+ struct gr_policy_state *oldpolicy_ptr;
89933+ struct gr_alloc_state *oldalloc_ptr;
89934+ unsigned char oldmode;
89935+};
89936+
89937+/* End Data Structures Section */
89938+
89939+/* Hash functions generated by empirical testing by Brad Spengler
89940+ Makes good use of the low bits of the inode. Generally 0-1 times
89941+ in loop for successful match. 0-3 for unsuccessful match.
89942+ Shift/add algorithm with modulus of table size and an XOR*/
89943+
89944+static __inline__ unsigned int
89945+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
89946+{
89947+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
89948+}
89949+
89950+ static __inline__ unsigned int
89951+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
89952+{
89953+ return ((const unsigned long)userp % sz);
89954+}
89955+
89956+static __inline__ unsigned int
89957+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
89958+{
89959+ unsigned int rem;
89960+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
89961+ return rem;
89962+}
89963+
89964+static __inline__ unsigned int
89965+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
89966+{
89967+ return full_name_hash((const unsigned char *)name, len) % sz;
89968+}
89969+
89970+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
89971+ subj = NULL; \
89972+ iter = 0; \
89973+ while (iter < role->subj_hash_size) { \
89974+ if (subj == NULL) \
89975+ subj = role->subj_hash[iter]; \
89976+ if (subj == NULL) { \
89977+ iter++; \
89978+ continue; \
89979+ }
89980+
89981+#define FOR_EACH_SUBJECT_END(subj,iter) \
89982+ subj = subj->next; \
89983+ if (subj == NULL) \
89984+ iter++; \
89985+ }
89986+
89987+
89988+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
89989+ subj = role->hash->first; \
89990+ while (subj != NULL) {
89991+
89992+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
89993+ subj = subj->next; \
89994+ }
89995+
89996+#endif
89997+
89998diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
89999new file mode 100644
90000index 0000000..af64092
90001--- /dev/null
90002+++ b/include/linux/gracl_compat.h
90003@@ -0,0 +1,156 @@
90004+#ifndef GR_ACL_COMPAT_H
90005+#define GR_ACL_COMPAT_H
90006+
90007+#include <linux/resource.h>
90008+#include <asm/resource.h>
90009+
90010+struct sprole_pw_compat {
90011+ compat_uptr_t rolename;
90012+ unsigned char salt[GR_SALT_LEN];
90013+ unsigned char sum[GR_SHA_LEN];
90014+};
90015+
90016+struct gr_hash_struct_compat {
90017+ compat_uptr_t table;
90018+ compat_uptr_t nametable;
90019+ compat_uptr_t first;
90020+ __u32 table_size;
90021+ __u32 used_size;
90022+ int type;
90023+};
90024+
90025+struct acl_subject_label_compat {
90026+ compat_uptr_t filename;
90027+ compat_u64 inode;
90028+ __u32 device;
90029+ __u32 mode;
90030+ kernel_cap_t cap_mask;
90031+ kernel_cap_t cap_lower;
90032+ kernel_cap_t cap_invert_audit;
90033+
90034+ struct compat_rlimit res[GR_NLIMITS];
90035+ __u32 resmask;
90036+
90037+ __u8 user_trans_type;
90038+ __u8 group_trans_type;
90039+ compat_uptr_t user_transitions;
90040+ compat_uptr_t group_transitions;
90041+ __u16 user_trans_num;
90042+ __u16 group_trans_num;
90043+
90044+ __u32 sock_families[2];
90045+ __u32 ip_proto[8];
90046+ __u32 ip_type;
90047+ compat_uptr_t ips;
90048+ __u32 ip_num;
90049+ __u32 inaddr_any_override;
90050+
90051+ __u32 crashes;
90052+ compat_ulong_t expires;
90053+
90054+ compat_uptr_t parent_subject;
90055+ compat_uptr_t hash;
90056+ compat_uptr_t prev;
90057+ compat_uptr_t next;
90058+
90059+ compat_uptr_t obj_hash;
90060+ __u32 obj_hash_size;
90061+ __u16 pax_flags;
90062+};
90063+
90064+struct role_allowed_ip_compat {
90065+ __u32 addr;
90066+ __u32 netmask;
90067+
90068+ compat_uptr_t prev;
90069+ compat_uptr_t next;
90070+};
90071+
90072+struct role_transition_compat {
90073+ compat_uptr_t rolename;
90074+
90075+ compat_uptr_t prev;
90076+ compat_uptr_t next;
90077+};
90078+
90079+struct acl_role_label_compat {
90080+ compat_uptr_t rolename;
90081+ uid_t uidgid;
90082+ __u16 roletype;
90083+
90084+ __u16 auth_attempts;
90085+ compat_ulong_t expires;
90086+
90087+ compat_uptr_t root_label;
90088+ compat_uptr_t hash;
90089+
90090+ compat_uptr_t prev;
90091+ compat_uptr_t next;
90092+
90093+ compat_uptr_t transitions;
90094+ compat_uptr_t allowed_ips;
90095+ compat_uptr_t domain_children;
90096+ __u16 domain_child_num;
90097+
90098+ umode_t umask;
90099+
90100+ compat_uptr_t subj_hash;
90101+ __u32 subj_hash_size;
90102+};
90103+
90104+struct user_acl_role_db_compat {
90105+ compat_uptr_t r_table;
90106+ __u32 num_pointers;
90107+ __u32 num_roles;
90108+ __u32 num_domain_children;
90109+ __u32 num_subjects;
90110+ __u32 num_objects;
90111+};
90112+
90113+struct acl_object_label_compat {
90114+ compat_uptr_t filename;
90115+ compat_u64 inode;
90116+ __u32 device;
90117+ __u32 mode;
90118+
90119+ compat_uptr_t nested;
90120+ compat_uptr_t globbed;
90121+
90122+ compat_uptr_t prev;
90123+ compat_uptr_t next;
90124+};
90125+
90126+struct acl_ip_label_compat {
90127+ compat_uptr_t iface;
90128+ __u32 addr;
90129+ __u32 netmask;
90130+ __u16 low, high;
90131+ __u8 mode;
90132+ __u32 type;
90133+ __u32 proto[8];
90134+
90135+ compat_uptr_t prev;
90136+ compat_uptr_t next;
90137+};
90138+
90139+struct gr_arg_compat {
90140+ struct user_acl_role_db_compat role_db;
90141+ unsigned char pw[GR_PW_LEN];
90142+ unsigned char salt[GR_SALT_LEN];
90143+ unsigned char sum[GR_SHA_LEN];
90144+ unsigned char sp_role[GR_SPROLE_LEN];
90145+ compat_uptr_t sprole_pws;
90146+ __u32 segv_device;
90147+ compat_u64 segv_inode;
90148+ uid_t segv_uid;
90149+ __u16 num_sprole_pws;
90150+ __u16 mode;
90151+};
90152+
90153+struct gr_arg_wrapper_compat {
90154+ compat_uptr_t arg;
90155+ __u32 version;
90156+ __u32 size;
90157+};
90158+
90159+#endif
90160diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
90161new file mode 100644
90162index 0000000..323ecf2
90163--- /dev/null
90164+++ b/include/linux/gralloc.h
90165@@ -0,0 +1,9 @@
90166+#ifndef __GRALLOC_H
90167+#define __GRALLOC_H
90168+
90169+void acl_free_all(void);
90170+int acl_alloc_stack_init(unsigned long size);
90171+void *acl_alloc(unsigned long len);
90172+void *acl_alloc_num(unsigned long num, unsigned long len);
90173+
90174+#endif
90175diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
90176new file mode 100644
90177index 0000000..be66033
90178--- /dev/null
90179+++ b/include/linux/grdefs.h
90180@@ -0,0 +1,140 @@
90181+#ifndef GRDEFS_H
90182+#define GRDEFS_H
90183+
90184+/* Begin grsecurity status declarations */
90185+
90186+enum {
90187+ GR_READY = 0x01,
90188+ GR_STATUS_INIT = 0x00 // disabled state
90189+};
90190+
90191+/* Begin ACL declarations */
90192+
90193+/* Role flags */
90194+
90195+enum {
90196+ GR_ROLE_USER = 0x0001,
90197+ GR_ROLE_GROUP = 0x0002,
90198+ GR_ROLE_DEFAULT = 0x0004,
90199+ GR_ROLE_SPECIAL = 0x0008,
90200+ GR_ROLE_AUTH = 0x0010,
90201+ GR_ROLE_NOPW = 0x0020,
90202+ GR_ROLE_GOD = 0x0040,
90203+ GR_ROLE_LEARN = 0x0080,
90204+ GR_ROLE_TPE = 0x0100,
90205+ GR_ROLE_DOMAIN = 0x0200,
90206+ GR_ROLE_PAM = 0x0400,
90207+ GR_ROLE_PERSIST = 0x0800
90208+};
90209+
90210+/* ACL Subject and Object mode flags */
90211+enum {
90212+ GR_DELETED = 0x80000000
90213+};
90214+
90215+/* ACL Object-only mode flags */
90216+enum {
90217+ GR_READ = 0x00000001,
90218+ GR_APPEND = 0x00000002,
90219+ GR_WRITE = 0x00000004,
90220+ GR_EXEC = 0x00000008,
90221+ GR_FIND = 0x00000010,
90222+ GR_INHERIT = 0x00000020,
90223+ GR_SETID = 0x00000040,
90224+ GR_CREATE = 0x00000080,
90225+ GR_DELETE = 0x00000100,
90226+ GR_LINK = 0x00000200,
90227+ GR_AUDIT_READ = 0x00000400,
90228+ GR_AUDIT_APPEND = 0x00000800,
90229+ GR_AUDIT_WRITE = 0x00001000,
90230+ GR_AUDIT_EXEC = 0x00002000,
90231+ GR_AUDIT_FIND = 0x00004000,
90232+ GR_AUDIT_INHERIT= 0x00008000,
90233+ GR_AUDIT_SETID = 0x00010000,
90234+ GR_AUDIT_CREATE = 0x00020000,
90235+ GR_AUDIT_DELETE = 0x00040000,
90236+ GR_AUDIT_LINK = 0x00080000,
90237+ GR_PTRACERD = 0x00100000,
90238+ GR_NOPTRACE = 0x00200000,
90239+ GR_SUPPRESS = 0x00400000,
90240+ GR_NOLEARN = 0x00800000,
90241+ GR_INIT_TRANSFER= 0x01000000
90242+};
90243+
90244+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
90245+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
90246+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
90247+
90248+/* ACL subject-only mode flags */
90249+enum {
90250+ GR_KILL = 0x00000001,
90251+ GR_VIEW = 0x00000002,
90252+ GR_PROTECTED = 0x00000004,
90253+ GR_LEARN = 0x00000008,
90254+ GR_OVERRIDE = 0x00000010,
90255+ /* just a placeholder, this mode is only used in userspace */
90256+ GR_DUMMY = 0x00000020,
90257+ GR_PROTSHM = 0x00000040,
90258+ GR_KILLPROC = 0x00000080,
90259+ GR_KILLIPPROC = 0x00000100,
90260+ /* just a placeholder, this mode is only used in userspace */
90261+ GR_NOTROJAN = 0x00000200,
90262+ GR_PROTPROCFD = 0x00000400,
90263+ GR_PROCACCT = 0x00000800,
90264+ GR_RELAXPTRACE = 0x00001000,
90265+ //GR_NESTED = 0x00002000,
90266+ GR_INHERITLEARN = 0x00004000,
90267+ GR_PROCFIND = 0x00008000,
90268+ GR_POVERRIDE = 0x00010000,
90269+ GR_KERNELAUTH = 0x00020000,
90270+ GR_ATSECURE = 0x00040000,
90271+ GR_SHMEXEC = 0x00080000
90272+};
90273+
90274+enum {
90275+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
90276+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
90277+ GR_PAX_ENABLE_MPROTECT = 0x0004,
90278+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
90279+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
90280+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
90281+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
90282+ GR_PAX_DISABLE_MPROTECT = 0x0400,
90283+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
90284+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
90285+};
90286+
90287+enum {
90288+ GR_ID_USER = 0x01,
90289+ GR_ID_GROUP = 0x02,
90290+};
90291+
90292+enum {
90293+ GR_ID_ALLOW = 0x01,
90294+ GR_ID_DENY = 0x02,
90295+};
90296+
90297+#define GR_CRASH_RES 31
90298+#define GR_UIDTABLE_MAX 500
90299+
90300+/* begin resource learning section */
90301+enum {
90302+ GR_RLIM_CPU_BUMP = 60,
90303+ GR_RLIM_FSIZE_BUMP = 50000,
90304+ GR_RLIM_DATA_BUMP = 10000,
90305+ GR_RLIM_STACK_BUMP = 1000,
90306+ GR_RLIM_CORE_BUMP = 10000,
90307+ GR_RLIM_RSS_BUMP = 500000,
90308+ GR_RLIM_NPROC_BUMP = 1,
90309+ GR_RLIM_NOFILE_BUMP = 5,
90310+ GR_RLIM_MEMLOCK_BUMP = 50000,
90311+ GR_RLIM_AS_BUMP = 500000,
90312+ GR_RLIM_LOCKS_BUMP = 2,
90313+ GR_RLIM_SIGPENDING_BUMP = 5,
90314+ GR_RLIM_MSGQUEUE_BUMP = 10000,
90315+ GR_RLIM_NICE_BUMP = 1,
90316+ GR_RLIM_RTPRIO_BUMP = 1,
90317+ GR_RLIM_RTTIME_BUMP = 1000000
90318+};
90319+
90320+#endif
90321diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
90322new file mode 100644
90323index 0000000..fb1de5d
90324--- /dev/null
90325+++ b/include/linux/grinternal.h
90326@@ -0,0 +1,230 @@
90327+#ifndef __GRINTERNAL_H
90328+#define __GRINTERNAL_H
90329+
90330+#ifdef CONFIG_GRKERNSEC
90331+
90332+#include <linux/fs.h>
90333+#include <linux/mnt_namespace.h>
90334+#include <linux/nsproxy.h>
90335+#include <linux/gracl.h>
90336+#include <linux/grdefs.h>
90337+#include <linux/grmsg.h>
90338+
90339+void gr_add_learn_entry(const char *fmt, ...)
90340+ __attribute__ ((format (printf, 1, 2)));
90341+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
90342+ const struct vfsmount *mnt);
90343+__u32 gr_check_create(const struct dentry *new_dentry,
90344+ const struct dentry *parent,
90345+ const struct vfsmount *mnt, const __u32 mode);
90346+int gr_check_protected_task(const struct task_struct *task);
90347+__u32 to_gr_audit(const __u32 reqmode);
90348+int gr_set_acls(const int type);
90349+int gr_acl_is_enabled(void);
90350+char gr_roletype_to_char(void);
90351+
90352+void gr_handle_alertkill(struct task_struct *task);
90353+char *gr_to_filename(const struct dentry *dentry,
90354+ const struct vfsmount *mnt);
90355+char *gr_to_filename1(const struct dentry *dentry,
90356+ const struct vfsmount *mnt);
90357+char *gr_to_filename2(const struct dentry *dentry,
90358+ const struct vfsmount *mnt);
90359+char *gr_to_filename3(const struct dentry *dentry,
90360+ const struct vfsmount *mnt);
90361+
90362+extern int grsec_enable_ptrace_readexec;
90363+extern int grsec_enable_harden_ptrace;
90364+extern int grsec_enable_link;
90365+extern int grsec_enable_fifo;
90366+extern int grsec_enable_execve;
90367+extern int grsec_enable_shm;
90368+extern int grsec_enable_execlog;
90369+extern int grsec_enable_signal;
90370+extern int grsec_enable_audit_ptrace;
90371+extern int grsec_enable_forkfail;
90372+extern int grsec_enable_time;
90373+extern int grsec_enable_rofs;
90374+extern int grsec_deny_new_usb;
90375+extern int grsec_enable_chroot_shmat;
90376+extern int grsec_enable_chroot_mount;
90377+extern int grsec_enable_chroot_double;
90378+extern int grsec_enable_chroot_pivot;
90379+extern int grsec_enable_chroot_chdir;
90380+extern int grsec_enable_chroot_chmod;
90381+extern int grsec_enable_chroot_mknod;
90382+extern int grsec_enable_chroot_fchdir;
90383+extern int grsec_enable_chroot_nice;
90384+extern int grsec_enable_chroot_execlog;
90385+extern int grsec_enable_chroot_caps;
90386+extern int grsec_enable_chroot_rename;
90387+extern int grsec_enable_chroot_sysctl;
90388+extern int grsec_enable_chroot_unix;
90389+extern int grsec_enable_symlinkown;
90390+extern kgid_t grsec_symlinkown_gid;
90391+extern int grsec_enable_tpe;
90392+extern kgid_t grsec_tpe_gid;
90393+extern int grsec_enable_tpe_all;
90394+extern int grsec_enable_tpe_invert;
90395+extern int grsec_enable_socket_all;
90396+extern kgid_t grsec_socket_all_gid;
90397+extern int grsec_enable_socket_client;
90398+extern kgid_t grsec_socket_client_gid;
90399+extern int grsec_enable_socket_server;
90400+extern kgid_t grsec_socket_server_gid;
90401+extern kgid_t grsec_audit_gid;
90402+extern int grsec_enable_group;
90403+extern int grsec_enable_log_rwxmaps;
90404+extern int grsec_enable_mount;
90405+extern int grsec_enable_chdir;
90406+extern int grsec_resource_logging;
90407+extern int grsec_enable_blackhole;
90408+extern int grsec_lastack_retries;
90409+extern int grsec_enable_brute;
90410+extern int grsec_enable_harden_ipc;
90411+extern int grsec_lock;
90412+
90413+extern spinlock_t grsec_alert_lock;
90414+extern unsigned long grsec_alert_wtime;
90415+extern unsigned long grsec_alert_fyet;
90416+
90417+extern spinlock_t grsec_audit_lock;
90418+
90419+extern rwlock_t grsec_exec_file_lock;
90420+
90421+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
90422+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
90423+ (tsk)->exec_file->f_path.mnt) : "/")
90424+
90425+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
90426+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
90427+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90428+
90429+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
90430+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
90431+ (tsk)->exec_file->f_path.mnt) : "/")
90432+
90433+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
90434+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
90435+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90436+
90437+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
90438+
90439+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
90440+
90441+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
90442+{
90443+ if (file1 && file2) {
90444+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
90445+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
90446+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
90447+ return true;
90448+ }
90449+
90450+ return false;
90451+}
90452+
90453+#define GR_CHROOT_CAPS {{ \
90454+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
90455+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
90456+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
90457+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
90458+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
90459+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
90460+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
90461+
90462+#define security_learn(normal_msg,args...) \
90463+({ \
90464+ read_lock(&grsec_exec_file_lock); \
90465+ gr_add_learn_entry(normal_msg "\n", ## args); \
90466+ read_unlock(&grsec_exec_file_lock); \
90467+})
90468+
90469+enum {
90470+ GR_DO_AUDIT,
90471+ GR_DONT_AUDIT,
90472+ /* used for non-audit messages that we shouldn't kill the task on */
90473+ GR_DONT_AUDIT_GOOD
90474+};
90475+
90476+enum {
90477+ GR_TTYSNIFF,
90478+ GR_RBAC,
90479+ GR_RBAC_STR,
90480+ GR_STR_RBAC,
90481+ GR_RBAC_MODE2,
90482+ GR_RBAC_MODE3,
90483+ GR_FILENAME,
90484+ GR_SYSCTL_HIDDEN,
90485+ GR_NOARGS,
90486+ GR_ONE_INT,
90487+ GR_ONE_INT_TWO_STR,
90488+ GR_ONE_STR,
90489+ GR_STR_INT,
90490+ GR_TWO_STR_INT,
90491+ GR_TWO_INT,
90492+ GR_TWO_U64,
90493+ GR_THREE_INT,
90494+ GR_FIVE_INT_TWO_STR,
90495+ GR_TWO_STR,
90496+ GR_THREE_STR,
90497+ GR_FOUR_STR,
90498+ GR_STR_FILENAME,
90499+ GR_FILENAME_STR,
90500+ GR_FILENAME_TWO_INT,
90501+ GR_FILENAME_TWO_INT_STR,
90502+ GR_TEXTREL,
90503+ GR_PTRACE,
90504+ GR_RESOURCE,
90505+ GR_CAP,
90506+ GR_SIG,
90507+ GR_SIG2,
90508+ GR_CRASH1,
90509+ GR_CRASH2,
90510+ GR_PSACCT,
90511+ GR_RWXMAP,
90512+ GR_RWXMAPVMA
90513+};
90514+
90515+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
90516+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
90517+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
90518+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
90519+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
90520+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
90521+#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)
90522+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
90523+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
90524+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
90525+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
90526+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
90527+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
90528+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
90529+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
90530+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
90531+#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)
90532+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
90533+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
90534+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
90535+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
90536+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
90537+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
90538+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
90539+#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)
90540+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
90541+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
90542+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
90543+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
90544+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
90545+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
90546+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
90547+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
90548+#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)
90549+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
90550+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
90551+
90552+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
90553+
90554+#endif
90555+
90556+#endif
90557diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
90558new file mode 100644
90559index 0000000..26ef560
90560--- /dev/null
90561+++ b/include/linux/grmsg.h
90562@@ -0,0 +1,118 @@
90563+#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"
90564+#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"
90565+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
90566+#define GR_STOPMOD_MSG "denied modification of module state by "
90567+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
90568+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
90569+#define GR_IOPERM_MSG "denied use of ioperm() by "
90570+#define GR_IOPL_MSG "denied use of iopl() by "
90571+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
90572+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
90573+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
90574+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
90575+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
90576+#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"
90577+#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"
90578+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
90579+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
90580+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
90581+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
90582+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
90583+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
90584+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
90585+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
90586+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
90587+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
90588+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
90589+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
90590+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
90591+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
90592+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
90593+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
90594+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
90595+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
90596+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
90597+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
90598+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
90599+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
90600+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
90601+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
90602+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
90603+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
90604+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
90605+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
90606+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
90607+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
90608+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
90609+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
90610+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
90611+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
90612+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
90613+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
90614+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
90615+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
90616+#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"
90617+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
90618+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
90619+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
90620+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
90621+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
90622+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
90623+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
90624+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
90625+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
90626+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
90627+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
90628+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
90629+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
90630+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
90631+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
90632+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
90633+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
90634+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
90635+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
90636+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
90637+#define GR_FAILFORK_MSG "failed fork with errno %s by "
90638+#define GR_NICE_CHROOT_MSG "denied priority change by "
90639+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
90640+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
90641+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
90642+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
90643+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
90644+#define GR_TIME_MSG "time set by "
90645+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
90646+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
90647+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
90648+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
90649+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
90650+#define GR_BIND_MSG "denied bind() by "
90651+#define GR_CONNECT_MSG "denied connect() by "
90652+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
90653+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
90654+#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"
90655+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
90656+#define GR_CAP_ACL_MSG "use of %s denied for "
90657+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
90658+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
90659+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
90660+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
90661+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
90662+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
90663+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
90664+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
90665+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
90666+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
90667+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
90668+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
90669+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
90670+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
90671+#define GR_VM86_MSG "denied use of vm86 by "
90672+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
90673+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
90674+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
90675+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
90676+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
90677+#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 "
90678+#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 "
90679+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
90680+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
90681diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
90682new file mode 100644
90683index 0000000..63c1850
90684--- /dev/null
90685+++ b/include/linux/grsecurity.h
90686@@ -0,0 +1,250 @@
90687+#ifndef GR_SECURITY_H
90688+#define GR_SECURITY_H
90689+#include <linux/fs.h>
90690+#include <linux/fs_struct.h>
90691+#include <linux/binfmts.h>
90692+#include <linux/gracl.h>
90693+
90694+/* notify of brain-dead configs */
90695+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90696+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
90697+#endif
90698+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90699+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
90700+#endif
90701+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
90702+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
90703+#endif
90704+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
90705+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
90706+#endif
90707+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
90708+#error "CONFIG_PAX enabled, but no PaX options are enabled."
90709+#endif
90710+
90711+int gr_handle_new_usb(void);
90712+
90713+void gr_handle_brute_attach(int dumpable);
90714+void gr_handle_brute_check(void);
90715+void gr_handle_kernel_exploit(void);
90716+
90717+char gr_roletype_to_char(void);
90718+
90719+int gr_proc_is_restricted(void);
90720+
90721+int gr_acl_enable_at_secure(void);
90722+
90723+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
90724+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
90725+
90726+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
90727+
90728+void gr_del_task_from_ip_table(struct task_struct *p);
90729+
90730+int gr_pid_is_chrooted(struct task_struct *p);
90731+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
90732+int gr_handle_chroot_nice(void);
90733+int gr_handle_chroot_sysctl(const int op);
90734+int gr_handle_chroot_setpriority(struct task_struct *p,
90735+ const int niceval);
90736+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
90737+int gr_chroot_fhandle(void);
90738+int gr_handle_chroot_chroot(const struct dentry *dentry,
90739+ const struct vfsmount *mnt);
90740+void gr_handle_chroot_chdir(const struct path *path);
90741+int gr_handle_chroot_chmod(const struct dentry *dentry,
90742+ const struct vfsmount *mnt, const int mode);
90743+int gr_handle_chroot_mknod(const struct dentry *dentry,
90744+ const struct vfsmount *mnt, const int mode);
90745+int gr_handle_chroot_mount(const struct dentry *dentry,
90746+ const struct vfsmount *mnt,
90747+ const char *dev_name);
90748+int gr_handle_chroot_pivot(void);
90749+int gr_handle_chroot_unix(const pid_t pid);
90750+
90751+int gr_handle_rawio(const struct inode *inode);
90752+
90753+void gr_handle_ioperm(void);
90754+void gr_handle_iopl(void);
90755+void gr_handle_msr_write(void);
90756+
90757+umode_t gr_acl_umask(void);
90758+
90759+int gr_tpe_allow(const struct file *file);
90760+
90761+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
90762+void gr_clear_chroot_entries(struct task_struct *task);
90763+
90764+void gr_log_forkfail(const int retval);
90765+void gr_log_timechange(void);
90766+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
90767+void gr_log_chdir(const struct dentry *dentry,
90768+ const struct vfsmount *mnt);
90769+void gr_log_chroot_exec(const struct dentry *dentry,
90770+ const struct vfsmount *mnt);
90771+void gr_log_remount(const char *devname, const int retval);
90772+void gr_log_unmount(const char *devname, const int retval);
90773+void gr_log_mount(const char *from, struct path *to, const int retval);
90774+void gr_log_textrel(struct vm_area_struct *vma);
90775+void gr_log_ptgnustack(struct file *file);
90776+void gr_log_rwxmmap(struct file *file);
90777+void gr_log_rwxmprotect(struct vm_area_struct *vma);
90778+
90779+int gr_handle_follow_link(const struct inode *parent,
90780+ const struct inode *inode,
90781+ const struct dentry *dentry,
90782+ const struct vfsmount *mnt);
90783+int gr_handle_fifo(const struct dentry *dentry,
90784+ const struct vfsmount *mnt,
90785+ const struct dentry *dir, const int flag,
90786+ const int acc_mode);
90787+int gr_handle_hardlink(const struct dentry *dentry,
90788+ const struct vfsmount *mnt,
90789+ struct inode *inode,
90790+ const int mode, const struct filename *to);
90791+
90792+int gr_is_capable(const int cap);
90793+int gr_is_capable_nolog(const int cap);
90794+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
90795+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
90796+
90797+void gr_copy_label(struct task_struct *tsk);
90798+void gr_handle_crash(struct task_struct *task, const int sig);
90799+int gr_handle_signal(const struct task_struct *p, const int sig);
90800+int gr_check_crash_uid(const kuid_t uid);
90801+int gr_check_protected_task(const struct task_struct *task);
90802+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
90803+int gr_acl_handle_mmap(const struct file *file,
90804+ const unsigned long prot);
90805+int gr_acl_handle_mprotect(const struct file *file,
90806+ const unsigned long prot);
90807+int gr_check_hidden_task(const struct task_struct *tsk);
90808+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
90809+ const struct vfsmount *mnt);
90810+__u32 gr_acl_handle_utime(const struct dentry *dentry,
90811+ const struct vfsmount *mnt);
90812+__u32 gr_acl_handle_access(const struct dentry *dentry,
90813+ const struct vfsmount *mnt, const int fmode);
90814+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
90815+ const struct vfsmount *mnt, umode_t *mode);
90816+__u32 gr_acl_handle_chown(const struct dentry *dentry,
90817+ const struct vfsmount *mnt);
90818+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
90819+ const struct vfsmount *mnt);
90820+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
90821+ const struct vfsmount *mnt);
90822+int gr_handle_ptrace(struct task_struct *task, const long request);
90823+int gr_handle_proc_ptrace(struct task_struct *task);
90824+__u32 gr_acl_handle_execve(const struct dentry *dentry,
90825+ const struct vfsmount *mnt);
90826+int gr_check_crash_exec(const struct file *filp);
90827+int gr_acl_is_enabled(void);
90828+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
90829+ const kgid_t gid);
90830+int gr_set_proc_label(const struct dentry *dentry,
90831+ const struct vfsmount *mnt,
90832+ const int unsafe_flags);
90833+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
90834+ const struct vfsmount *mnt);
90835+__u32 gr_acl_handle_open(const struct dentry *dentry,
90836+ const struct vfsmount *mnt, int acc_mode);
90837+__u32 gr_acl_handle_creat(const struct dentry *dentry,
90838+ const struct dentry *p_dentry,
90839+ const struct vfsmount *p_mnt,
90840+ int open_flags, int acc_mode, const int imode);
90841+void gr_handle_create(const struct dentry *dentry,
90842+ const struct vfsmount *mnt);
90843+void gr_handle_proc_create(const struct dentry *dentry,
90844+ const struct inode *inode);
90845+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
90846+ const struct dentry *parent_dentry,
90847+ const struct vfsmount *parent_mnt,
90848+ const int mode);
90849+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
90850+ const struct dentry *parent_dentry,
90851+ const struct vfsmount *parent_mnt);
90852+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
90853+ const struct vfsmount *mnt);
90854+void gr_handle_delete(const u64 ino, const dev_t dev);
90855+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
90856+ const struct vfsmount *mnt);
90857+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
90858+ const struct dentry *parent_dentry,
90859+ const struct vfsmount *parent_mnt,
90860+ const struct filename *from);
90861+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
90862+ const struct dentry *parent_dentry,
90863+ const struct vfsmount *parent_mnt,
90864+ const struct dentry *old_dentry,
90865+ const struct vfsmount *old_mnt, const struct filename *to);
90866+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
90867+int gr_acl_handle_rename(struct dentry *new_dentry,
90868+ struct dentry *parent_dentry,
90869+ const struct vfsmount *parent_mnt,
90870+ struct dentry *old_dentry,
90871+ struct inode *old_parent_inode,
90872+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
90873+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
90874+ struct dentry *old_dentry,
90875+ struct dentry *new_dentry,
90876+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
90877+__u32 gr_check_link(const struct dentry *new_dentry,
90878+ const struct dentry *parent_dentry,
90879+ const struct vfsmount *parent_mnt,
90880+ const struct dentry *old_dentry,
90881+ const struct vfsmount *old_mnt);
90882+int gr_acl_handle_filldir(const struct file *file, const char *name,
90883+ const unsigned int namelen, const u64 ino);
90884+
90885+__u32 gr_acl_handle_unix(const struct dentry *dentry,
90886+ const struct vfsmount *mnt);
90887+void gr_acl_handle_exit(void);
90888+void gr_acl_handle_psacct(struct task_struct *task, const long code);
90889+int gr_acl_handle_procpidmem(const struct task_struct *task);
90890+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
90891+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
90892+void gr_audit_ptrace(struct task_struct *task);
90893+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
90894+u64 gr_get_ino_from_dentry(struct dentry *dentry);
90895+void gr_put_exec_file(struct task_struct *task);
90896+
90897+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
90898+
90899+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
90900+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
90901+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90902+ struct dentry *newdentry, struct vfsmount *newmnt);
90903+
90904+#ifdef CONFIG_GRKERNSEC_RESLOG
90905+extern void gr_log_resource(const struct task_struct *task, const int res,
90906+ const unsigned long wanted, const int gt);
90907+#else
90908+static inline void gr_log_resource(const struct task_struct *task, const int res,
90909+ const unsigned long wanted, const int gt)
90910+{
90911+}
90912+#endif
90913+
90914+#ifdef CONFIG_GRKERNSEC
90915+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
90916+void gr_handle_vm86(void);
90917+void gr_handle_mem_readwrite(u64 from, u64 to);
90918+
90919+void gr_log_badprocpid(const char *entry);
90920+
90921+extern int grsec_enable_dmesg;
90922+extern int grsec_disable_privio;
90923+
90924+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
90925+extern kgid_t grsec_proc_gid;
90926+#endif
90927+
90928+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90929+extern int grsec_enable_chroot_findtask;
90930+#endif
90931+#ifdef CONFIG_GRKERNSEC_SETXID
90932+extern int grsec_enable_setxid;
90933+#endif
90934+#endif
90935+
90936+#endif
90937diff --git a/include/linux/grsock.h b/include/linux/grsock.h
90938new file mode 100644
90939index 0000000..e7ffaaf
90940--- /dev/null
90941+++ b/include/linux/grsock.h
90942@@ -0,0 +1,19 @@
90943+#ifndef __GRSOCK_H
90944+#define __GRSOCK_H
90945+
90946+extern void gr_attach_curr_ip(const struct sock *sk);
90947+extern int gr_handle_sock_all(const int family, const int type,
90948+ const int protocol);
90949+extern int gr_handle_sock_server(const struct sockaddr *sck);
90950+extern int gr_handle_sock_server_other(const struct sock *sck);
90951+extern int gr_handle_sock_client(const struct sockaddr *sck);
90952+extern int gr_search_connect(struct socket * sock,
90953+ struct sockaddr_in * addr);
90954+extern int gr_search_bind(struct socket * sock,
90955+ struct sockaddr_in * addr);
90956+extern int gr_search_listen(struct socket * sock);
90957+extern int gr_search_accept(struct socket * sock);
90958+extern int gr_search_socket(const int domain, const int type,
90959+ const int protocol);
90960+
90961+#endif
90962diff --git a/include/linux/highmem.h b/include/linux/highmem.h
90963index 9286a46..373f27f 100644
90964--- a/include/linux/highmem.h
90965+++ b/include/linux/highmem.h
90966@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
90967 kunmap_atomic(kaddr);
90968 }
90969
90970+static inline void sanitize_highpage(struct page *page)
90971+{
90972+ void *kaddr;
90973+ unsigned long flags;
90974+
90975+ local_irq_save(flags);
90976+ kaddr = kmap_atomic(page);
90977+ clear_page(kaddr);
90978+ kunmap_atomic(kaddr);
90979+ local_irq_restore(flags);
90980+}
90981+
90982 static inline void zero_user_segments(struct page *page,
90983 unsigned start1, unsigned end1,
90984 unsigned start2, unsigned end2)
90985diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
90986index 1c7b89a..7dda400 100644
90987--- a/include/linux/hwmon-sysfs.h
90988+++ b/include/linux/hwmon-sysfs.h
90989@@ -25,7 +25,8 @@
90990 struct sensor_device_attribute{
90991 struct device_attribute dev_attr;
90992 int index;
90993-};
90994+} __do_const;
90995+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
90996 #define to_sensor_dev_attr(_dev_attr) \
90997 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
90998
90999@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
91000 struct device_attribute dev_attr;
91001 u8 index;
91002 u8 nr;
91003-};
91004+} __do_const;
91005+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
91006 #define to_sensor_dev_attr_2(_dev_attr) \
91007 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
91008
91009diff --git a/include/linux/i2c.h b/include/linux/i2c.h
91010index f17da50..2f8b203 100644
91011--- a/include/linux/i2c.h
91012+++ b/include/linux/i2c.h
91013@@ -409,6 +409,7 @@ struct i2c_algorithm {
91014 int (*unreg_slave)(struct i2c_client *client);
91015 #endif
91016 };
91017+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
91018
91019 /**
91020 * struct i2c_bus_recovery_info - I2C bus recovery information
91021diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
91022index aff7ad8..3942bbd 100644
91023--- a/include/linux/if_pppox.h
91024+++ b/include/linux/if_pppox.h
91025@@ -76,7 +76,7 @@ struct pppox_proto {
91026 int (*ioctl)(struct socket *sock, unsigned int cmd,
91027 unsigned long arg);
91028 struct module *owner;
91029-};
91030+} __do_const;
91031
91032 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
91033 extern void unregister_pppox_proto(int proto_num);
91034diff --git a/include/linux/init.h b/include/linux/init.h
91035index 2df8e8d..3e1280d 100644
91036--- a/include/linux/init.h
91037+++ b/include/linux/init.h
91038@@ -37,9 +37,17 @@
91039 * section.
91040 */
91041
91042+#define add_init_latent_entropy __latent_entropy
91043+
91044+#ifdef CONFIG_MEMORY_HOTPLUG
91045+#define add_meminit_latent_entropy
91046+#else
91047+#define add_meminit_latent_entropy __latent_entropy
91048+#endif
91049+
91050 /* These are for everybody (although not all archs will actually
91051 discard it in modules) */
91052-#define __init __section(.init.text) __cold notrace
91053+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
91054 #define __initdata __section(.init.data)
91055 #define __initconst __constsection(.init.rodata)
91056 #define __exitdata __section(.exit.data)
91057@@ -100,7 +108,7 @@
91058 #define __cpuexitconst
91059
91060 /* Used for MEMORY_HOTPLUG */
91061-#define __meminit __section(.meminit.text) __cold notrace
91062+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
91063 #define __meminitdata __section(.meminit.data)
91064 #define __meminitconst __constsection(.meminit.rodata)
91065 #define __memexit __section(.memexit.text) __exitused __cold notrace
91066diff --git a/include/linux/init_task.h b/include/linux/init_task.h
91067index 696d223..6d6b39f 100644
91068--- a/include/linux/init_task.h
91069+++ b/include/linux/init_task.h
91070@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
91071
91072 #define INIT_TASK_COMM "swapper"
91073
91074+#ifdef CONFIG_X86
91075+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
91076+#else
91077+#define INIT_TASK_THREAD_INFO
91078+#endif
91079+
91080 #ifdef CONFIG_RT_MUTEXES
91081 # define INIT_RT_MUTEXES(tsk) \
91082 .pi_waiters = RB_ROOT, \
91083@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
91084 RCU_POINTER_INITIALIZER(cred, &init_cred), \
91085 .comm = INIT_TASK_COMM, \
91086 .thread = INIT_THREAD, \
91087+ INIT_TASK_THREAD_INFO \
91088 .fs = &init_fs, \
91089 .files = &init_files, \
91090 .signal = &init_signals, \
91091diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
91092index 2e88580..f6a99a0 100644
91093--- a/include/linux/interrupt.h
91094+++ b/include/linux/interrupt.h
91095@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
91096
91097 struct softirq_action
91098 {
91099- void (*action)(struct softirq_action *);
91100-};
91101+ void (*action)(void);
91102+} __no_const;
91103
91104 asmlinkage void do_softirq(void);
91105 asmlinkage void __do_softirq(void);
91106@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
91107 }
91108 #endif
91109
91110-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
91111+extern void open_softirq(int nr, void (*action)(void));
91112 extern void softirq_init(void);
91113 extern void __raise_softirq_irqoff(unsigned int nr);
91114
91115diff --git a/include/linux/iommu.h b/include/linux/iommu.h
91116index 38daa45..4de4317 100644
91117--- a/include/linux/iommu.h
91118+++ b/include/linux/iommu.h
91119@@ -147,7 +147,7 @@ struct iommu_ops {
91120
91121 unsigned long pgsize_bitmap;
91122 void *priv;
91123-};
91124+} __do_const;
91125
91126 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
91127 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
91128diff --git a/include/linux/ioport.h b/include/linux/ioport.h
91129index 2c525022..345b106 100644
91130--- a/include/linux/ioport.h
91131+++ b/include/linux/ioport.h
91132@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
91133 int adjust_resource(struct resource *res, resource_size_t start,
91134 resource_size_t size);
91135 resource_size_t resource_alignment(struct resource *res);
91136-static inline resource_size_t resource_size(const struct resource *res)
91137+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
91138 {
91139 return res->end - res->start + 1;
91140 }
91141diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
91142index 1eee6bc..9cf4912 100644
91143--- a/include/linux/ipc_namespace.h
91144+++ b/include/linux/ipc_namespace.h
91145@@ -60,7 +60,7 @@ struct ipc_namespace {
91146 struct user_namespace *user_ns;
91147
91148 struct ns_common ns;
91149-};
91150+} __randomize_layout;
91151
91152 extern struct ipc_namespace init_ipc_ns;
91153 extern atomic_t nr_ipc_ns;
91154diff --git a/include/linux/irq.h b/include/linux/irq.h
91155index d09ec7a..f373eb5 100644
91156--- a/include/linux/irq.h
91157+++ b/include/linux/irq.h
91158@@ -364,7 +364,8 @@ struct irq_chip {
91159 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
91160
91161 unsigned long flags;
91162-};
91163+} __do_const;
91164+typedef struct irq_chip __no_const irq_chip_no_const;
91165
91166 /*
91167 * irq_chip specific flags
91168diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
91169index 71d706d..817cdec 100644
91170--- a/include/linux/irqchip/arm-gic.h
91171+++ b/include/linux/irqchip/arm-gic.h
91172@@ -95,7 +95,7 @@
91173
91174 struct device_node;
91175
91176-extern struct irq_chip gic_arch_extn;
91177+extern irq_chip_no_const gic_arch_extn;
91178
91179 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
91180 u32 offset, struct device_node *);
91181diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
91182index dd1109f..4f4fdda 100644
91183--- a/include/linux/irqdesc.h
91184+++ b/include/linux/irqdesc.h
91185@@ -61,7 +61,7 @@ struct irq_desc {
91186 unsigned int irq_count; /* For detecting broken IRQs */
91187 unsigned long last_unhandled; /* Aging timer for unhandled count */
91188 unsigned int irqs_unhandled;
91189- atomic_t threads_handled;
91190+ atomic_unchecked_t threads_handled;
91191 int threads_handled_last;
91192 raw_spinlock_t lock;
91193 struct cpumask *percpu_enabled;
91194diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
91195index 676d730..8d3a1ad 100644
91196--- a/include/linux/irqdomain.h
91197+++ b/include/linux/irqdomain.h
91198@@ -40,6 +40,7 @@ struct device_node;
91199 struct irq_domain;
91200 struct of_device_id;
91201 struct irq_chip;
91202+typedef struct irq_chip __no_const irq_chip_no_const;
91203 struct irq_data;
91204
91205 /* Number of irqs reserved for a legacy isa controller */
91206diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
91207index c367cbd..c9b79e6 100644
91208--- a/include/linux/jiffies.h
91209+++ b/include/linux/jiffies.h
91210@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
91211 /*
91212 * Convert various time units to each other:
91213 */
91214-extern unsigned int jiffies_to_msecs(const unsigned long j);
91215-extern unsigned int jiffies_to_usecs(const unsigned long j);
91216+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
91217+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
91218
91219-static inline u64 jiffies_to_nsecs(const unsigned long j)
91220+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
91221 {
91222 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
91223 }
91224
91225-extern unsigned long msecs_to_jiffies(const unsigned int m);
91226-extern unsigned long usecs_to_jiffies(const unsigned int u);
91227+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
91228+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
91229 extern unsigned long timespec_to_jiffies(const struct timespec *value);
91230 extern void jiffies_to_timespec(const unsigned long jiffies,
91231- struct timespec *value);
91232-extern unsigned long timeval_to_jiffies(const struct timeval *value);
91233+ struct timespec *value) __intentional_overflow(-1);
91234+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
91235 extern void jiffies_to_timeval(const unsigned long jiffies,
91236 struct timeval *value);
91237
91238diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
91239index 6883e19..e854fcb 100644
91240--- a/include/linux/kallsyms.h
91241+++ b/include/linux/kallsyms.h
91242@@ -15,7 +15,8 @@
91243
91244 struct module;
91245
91246-#ifdef CONFIG_KALLSYMS
91247+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
91248+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
91249 /* Lookup the address for a symbol. Returns 0 if not found. */
91250 unsigned long kallsyms_lookup_name(const char *name);
91251
91252@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
91253 /* Stupid that this does nothing, but I didn't create this mess. */
91254 #define __print_symbol(fmt, addr)
91255 #endif /*CONFIG_KALLSYMS*/
91256+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
91257+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
91258+extern unsigned long kallsyms_lookup_name(const char *name);
91259+extern void __print_symbol(const char *fmt, unsigned long address);
91260+extern int sprint_backtrace(char *buffer, unsigned long address);
91261+extern int sprint_symbol(char *buffer, unsigned long address);
91262+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
91263+const char *kallsyms_lookup(unsigned long addr,
91264+ unsigned long *symbolsize,
91265+ unsigned long *offset,
91266+ char **modname, char *namebuf);
91267+extern int kallsyms_lookup_size_offset(unsigned long addr,
91268+ unsigned long *symbolsize,
91269+ unsigned long *offset);
91270+#endif
91271
91272 /* This macro allows us to keep printk typechecking */
91273 static __printf(1, 2)
91274diff --git a/include/linux/kernel.h b/include/linux/kernel.h
91275index d6d630d..feea1f5 100644
91276--- a/include/linux/kernel.h
91277+++ b/include/linux/kernel.h
91278@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
91279 /* Obsolete, do not use. Use kstrto<foo> instead */
91280
91281 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
91282-extern long simple_strtol(const char *,char **,unsigned int);
91283+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
91284 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
91285 extern long long simple_strtoll(const char *,char **,unsigned int);
91286
91287diff --git a/include/linux/key-type.h b/include/linux/key-type.h
91288index ff9f1d3..6712be5 100644
91289--- a/include/linux/key-type.h
91290+++ b/include/linux/key-type.h
91291@@ -152,7 +152,7 @@ struct key_type {
91292 /* internal fields */
91293 struct list_head link; /* link in types list */
91294 struct lock_class_key lock_class; /* key->sem lock class */
91295-};
91296+} __do_const;
91297
91298 extern struct key_type key_type_keyring;
91299
91300diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
91301index e465bb1..19f605fd 100644
91302--- a/include/linux/kgdb.h
91303+++ b/include/linux/kgdb.h
91304@@ -52,7 +52,7 @@ extern int kgdb_connected;
91305 extern int kgdb_io_module_registered;
91306
91307 extern atomic_t kgdb_setting_breakpoint;
91308-extern atomic_t kgdb_cpu_doing_single_step;
91309+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
91310
91311 extern struct task_struct *kgdb_usethread;
91312 extern struct task_struct *kgdb_contthread;
91313@@ -254,7 +254,7 @@ struct kgdb_arch {
91314 void (*correct_hw_break)(void);
91315
91316 void (*enable_nmi)(bool on);
91317-};
91318+} __do_const;
91319
91320 /**
91321 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
91322@@ -279,7 +279,7 @@ struct kgdb_io {
91323 void (*pre_exception) (void);
91324 void (*post_exception) (void);
91325 int is_console;
91326-};
91327+} __do_const;
91328
91329 extern struct kgdb_arch arch_kgdb_ops;
91330
91331diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
91332index e705467..a92471d 100644
91333--- a/include/linux/kmemleak.h
91334+++ b/include/linux/kmemleak.h
91335@@ -27,7 +27,7 @@
91336
91337 extern void kmemleak_init(void) __ref;
91338 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91339- gfp_t gfp) __ref;
91340+ gfp_t gfp) __ref __size_overflow(2);
91341 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
91342 extern void kmemleak_free(const void *ptr) __ref;
91343 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
91344@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
91345 static inline void kmemleak_init(void)
91346 {
91347 }
91348-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91349+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
91350 gfp_t gfp)
91351 {
91352 }
91353diff --git a/include/linux/kmod.h b/include/linux/kmod.h
91354index 0555cc6..40116ce 100644
91355--- a/include/linux/kmod.h
91356+++ b/include/linux/kmod.h
91357@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
91358 * usually useless though. */
91359 extern __printf(2, 3)
91360 int __request_module(bool wait, const char *name, ...);
91361+extern __printf(3, 4)
91362+int ___request_module(bool wait, char *param_name, const char *name, ...);
91363 #define request_module(mod...) __request_module(true, mod)
91364 #define request_module_nowait(mod...) __request_module(false, mod)
91365 #define try_then_request_module(x, mod...) \
91366@@ -57,6 +59,9 @@ struct subprocess_info {
91367 struct work_struct work;
91368 struct completion *complete;
91369 char *path;
91370+#ifdef CONFIG_GRKERNSEC
91371+ char *origpath;
91372+#endif
91373 char **argv;
91374 char **envp;
91375 int wait;
91376diff --git a/include/linux/kobject.h b/include/linux/kobject.h
91377index 2d61b90..a1d0a13 100644
91378--- a/include/linux/kobject.h
91379+++ b/include/linux/kobject.h
91380@@ -118,7 +118,7 @@ struct kobj_type {
91381 struct attribute **default_attrs;
91382 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
91383 const void *(*namespace)(struct kobject *kobj);
91384-};
91385+} __do_const;
91386
91387 struct kobj_uevent_env {
91388 char *argv[3];
91389@@ -142,6 +142,7 @@ struct kobj_attribute {
91390 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
91391 const char *buf, size_t count);
91392 };
91393+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
91394
91395 extern const struct sysfs_ops kobj_sysfs_ops;
91396
91397@@ -169,7 +170,7 @@ struct kset {
91398 spinlock_t list_lock;
91399 struct kobject kobj;
91400 const struct kset_uevent_ops *uevent_ops;
91401-};
91402+} __randomize_layout;
91403
91404 extern void kset_init(struct kset *kset);
91405 extern int __must_check kset_register(struct kset *kset);
91406diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
91407index df32d25..fb52e27 100644
91408--- a/include/linux/kobject_ns.h
91409+++ b/include/linux/kobject_ns.h
91410@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
91411 const void *(*netlink_ns)(struct sock *sk);
91412 const void *(*initial_ns)(void);
91413 void (*drop_ns)(void *);
91414-};
91415+} __do_const;
91416
91417 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
91418 int kobj_ns_type_registered(enum kobj_ns_type type);
91419diff --git a/include/linux/kref.h b/include/linux/kref.h
91420index 484604d..0f6c5b6 100644
91421--- a/include/linux/kref.h
91422+++ b/include/linux/kref.h
91423@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
91424 static inline int kref_sub(struct kref *kref, unsigned int count,
91425 void (*release)(struct kref *kref))
91426 {
91427- WARN_ON(release == NULL);
91428+ BUG_ON(release == NULL);
91429
91430 if (atomic_sub_and_test((int) count, &kref->refcount)) {
91431 release(kref);
91432diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
91433index d12b210..d91fd76 100644
91434--- a/include/linux/kvm_host.h
91435+++ b/include/linux/kvm_host.h
91436@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
91437 {
91438 }
91439 #endif
91440-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91441+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91442 struct module *module);
91443 void kvm_exit(void);
91444
91445@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
91446 struct kvm_guest_debug *dbg);
91447 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
91448
91449-int kvm_arch_init(void *opaque);
91450+int kvm_arch_init(const void *opaque);
91451 void kvm_arch_exit(void);
91452
91453 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
91454diff --git a/include/linux/libata.h b/include/linux/libata.h
91455index f8994b4..c1dec7a 100644
91456--- a/include/linux/libata.h
91457+++ b/include/linux/libata.h
91458@@ -989,7 +989,7 @@ struct ata_port_operations {
91459 * fields must be pointers.
91460 */
91461 const struct ata_port_operations *inherits;
91462-};
91463+} __do_const;
91464
91465 struct ata_port_info {
91466 unsigned long flags;
91467diff --git a/include/linux/linkage.h b/include/linux/linkage.h
91468index a6a42dd..6c5ebce 100644
91469--- a/include/linux/linkage.h
91470+++ b/include/linux/linkage.h
91471@@ -36,6 +36,7 @@
91472 #endif
91473
91474 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
91475+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
91476 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
91477
91478 /*
91479diff --git a/include/linux/list.h b/include/linux/list.h
91480index feb773c..98f3075 100644
91481--- a/include/linux/list.h
91482+++ b/include/linux/list.h
91483@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
91484 extern void list_del(struct list_head *entry);
91485 #endif
91486
91487+extern void __pax_list_add(struct list_head *new,
91488+ struct list_head *prev,
91489+ struct list_head *next);
91490+static inline void pax_list_add(struct list_head *new, struct list_head *head)
91491+{
91492+ __pax_list_add(new, head, head->next);
91493+}
91494+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
91495+{
91496+ __pax_list_add(new, head->prev, head);
91497+}
91498+extern void pax_list_del(struct list_head *entry);
91499+
91500 /**
91501 * list_replace - replace old entry by new one
91502 * @old : the element to be replaced
91503@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
91504 INIT_LIST_HEAD(entry);
91505 }
91506
91507+extern void pax_list_del_init(struct list_head *entry);
91508+
91509 /**
91510 * list_move - delete from one list and add as another's head
91511 * @list: the entry to move
91512diff --git a/include/linux/lockref.h b/include/linux/lockref.h
91513index b10b122..d37b3de 100644
91514--- a/include/linux/lockref.h
91515+++ b/include/linux/lockref.h
91516@@ -28,7 +28,7 @@ struct lockref {
91517 #endif
91518 struct {
91519 spinlock_t lock;
91520- int count;
91521+ atomic_t count;
91522 };
91523 };
91524 };
91525@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
91526 extern int lockref_get_not_dead(struct lockref *);
91527
91528 /* Must be called under spinlock for reliable results */
91529-static inline int __lockref_is_dead(const struct lockref *l)
91530+static inline int __lockref_is_dead(const struct lockref *lockref)
91531 {
91532- return ((int)l->count < 0);
91533+ return atomic_read(&lockref->count) < 0;
91534+}
91535+
91536+static inline int __lockref_read(const struct lockref *lockref)
91537+{
91538+ return atomic_read(&lockref->count);
91539+}
91540+
91541+static inline void __lockref_set(struct lockref *lockref, int count)
91542+{
91543+ atomic_set(&lockref->count, count);
91544+}
91545+
91546+static inline void __lockref_inc(struct lockref *lockref)
91547+{
91548+ atomic_inc(&lockref->count);
91549+}
91550+
91551+static inline void __lockref_dec(struct lockref *lockref)
91552+{
91553+ atomic_dec(&lockref->count);
91554 }
91555
91556 #endif /* __LINUX_LOCKREF_H */
91557diff --git a/include/linux/math64.h b/include/linux/math64.h
91558index c45c089..298841c 100644
91559--- a/include/linux/math64.h
91560+++ b/include/linux/math64.h
91561@@ -15,7 +15,7 @@
91562 * This is commonly provided by 32bit archs to provide an optimized 64bit
91563 * divide.
91564 */
91565-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91566+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91567 {
91568 *remainder = dividend % divisor;
91569 return dividend / divisor;
91570@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
91571 /**
91572 * div64_u64 - unsigned 64bit divide with 64bit divisor
91573 */
91574-static inline u64 div64_u64(u64 dividend, u64 divisor)
91575+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91576 {
91577 return dividend / divisor;
91578 }
91579@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
91580 #define div64_ul(x, y) div_u64((x), (y))
91581
91582 #ifndef div_u64_rem
91583-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91584+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91585 {
91586 *remainder = do_div(dividend, divisor);
91587 return dividend;
91588@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
91589 #endif
91590
91591 #ifndef div64_u64
91592-extern u64 div64_u64(u64 dividend, u64 divisor);
91593+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
91594 #endif
91595
91596 #ifndef div64_s64
91597@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
91598 * divide.
91599 */
91600 #ifndef div_u64
91601-static inline u64 div_u64(u64 dividend, u32 divisor)
91602+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
91603 {
91604 u32 remainder;
91605 return div_u64_rem(dividend, divisor, &remainder);
91606diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
91607index 3d385c8..deacb6a 100644
91608--- a/include/linux/mempolicy.h
91609+++ b/include/linux/mempolicy.h
91610@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
91611 }
91612
91613 #define vma_policy(vma) ((vma)->vm_policy)
91614+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91615+{
91616+ vma->vm_policy = pol;
91617+}
91618
91619 static inline void mpol_get(struct mempolicy *pol)
91620 {
91621@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
91622 }
91623
91624 #define vma_policy(vma) NULL
91625+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91626+{
91627+}
91628
91629 static inline int
91630 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
91631diff --git a/include/linux/mm.h b/include/linux/mm.h
91632index 47a9392..ef645bc 100644
91633--- a/include/linux/mm.h
91634+++ b/include/linux/mm.h
91635@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
91636
91637 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
91638 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
91639+
91640+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
91641+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
91642+#endif
91643+
91644 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
91645 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
91646 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
91647@@ -254,8 +259,8 @@ struct vm_operations_struct {
91648 /* called by access_process_vm when get_user_pages() fails, typically
91649 * for use by special VMAs that can switch between memory and hardware
91650 */
91651- int (*access)(struct vm_area_struct *vma, unsigned long addr,
91652- void *buf, int len, int write);
91653+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
91654+ void *buf, size_t len, int write);
91655
91656 /* Called by the /proc/PID/maps code to ask the vma whether it
91657 * has a special name. Returning non-NULL will also cause this
91658@@ -293,6 +298,7 @@ struct vm_operations_struct {
91659 struct page *(*find_special_page)(struct vm_area_struct *vma,
91660 unsigned long addr);
91661 };
91662+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
91663
91664 struct mmu_gather;
91665 struct inode;
91666@@ -1213,8 +1219,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
91667 unsigned long *pfn);
91668 int follow_phys(struct vm_area_struct *vma, unsigned long address,
91669 unsigned int flags, unsigned long *prot, resource_size_t *phys);
91670-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91671- void *buf, int len, int write);
91672+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91673+ void *buf, size_t len, int write);
91674
91675 static inline void unmap_shared_mapping_range(struct address_space *mapping,
91676 loff_t const holebegin, loff_t const holelen)
91677@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
91678 }
91679 #endif
91680
91681-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
91682-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91683- void *buf, int len, int write);
91684+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
91685+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91686+ void *buf, size_t len, int write);
91687
91688 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
91689 unsigned long start, unsigned long nr_pages,
91690@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
91691 int clear_page_dirty_for_io(struct page *page);
91692 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
91693
91694-/* Is the vma a continuation of the stack vma above it? */
91695-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
91696-{
91697- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
91698-}
91699-
91700-static inline int stack_guard_page_start(struct vm_area_struct *vma,
91701- unsigned long addr)
91702-{
91703- return (vma->vm_flags & VM_GROWSDOWN) &&
91704- (vma->vm_start == addr) &&
91705- !vma_growsdown(vma->vm_prev, addr);
91706-}
91707-
91708-/* Is the vma a continuation of the stack vma below it? */
91709-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
91710-{
91711- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
91712-}
91713-
91714-static inline int stack_guard_page_end(struct vm_area_struct *vma,
91715- unsigned long addr)
91716-{
91717- return (vma->vm_flags & VM_GROWSUP) &&
91718- (vma->vm_end == addr) &&
91719- !vma_growsup(vma->vm_next, addr);
91720-}
91721-
91722 extern struct task_struct *task_of_stack(struct task_struct *task,
91723 struct vm_area_struct *vma, bool in_group);
91724
91725@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
91726 {
91727 return 0;
91728 }
91729+
91730+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
91731+ unsigned long address)
91732+{
91733+ return 0;
91734+}
91735 #else
91736 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91737+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91738 #endif
91739
91740 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
91741@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
91742 return 0;
91743 }
91744
91745+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
91746+ unsigned long address)
91747+{
91748+ return 0;
91749+}
91750+
91751 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
91752
91753 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
91754@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
91755
91756 #else
91757 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
91758+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
91759
91760 static inline void mm_nr_pmds_init(struct mm_struct *mm)
91761 {
91762@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
91763 NULL: pud_offset(pgd, address);
91764 }
91765
91766+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
91767+{
91768+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
91769+ NULL: pud_offset(pgd, address);
91770+}
91771+
91772 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
91773 {
91774 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
91775 NULL: pmd_offset(pud, address);
91776 }
91777+
91778+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
91779+{
91780+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
91781+ NULL: pmd_offset(pud, address);
91782+}
91783 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
91784
91785 #if USE_SPLIT_PTE_PTLOCKS
91786@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
91787 bool *need_rmap_locks);
91788 extern void exit_mmap(struct mm_struct *);
91789
91790+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
91791+extern void gr_learn_resource(const struct task_struct *task, const int res,
91792+ const unsigned long wanted, const int gt);
91793+#else
91794+static inline void gr_learn_resource(const struct task_struct *task, const int res,
91795+ const unsigned long wanted, const int gt)
91796+{
91797+}
91798+#endif
91799+
91800 static inline int check_data_rlimit(unsigned long rlim,
91801 unsigned long new,
91802 unsigned long start,
91803 unsigned long end_data,
91804 unsigned long start_data)
91805 {
91806+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
91807 if (rlim < RLIM_INFINITY) {
91808 if (((new - start) + (end_data - start_data)) > rlim)
91809 return -ENOSPC;
91810@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
91811 unsigned long addr, unsigned long len,
91812 unsigned long flags, struct page **pages);
91813
91814-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
91815+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
91816
91817 extern unsigned long mmap_region(struct file *file, unsigned long addr,
91818 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
91819@@ -1928,6 +1943,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
91820 unsigned long len, unsigned long prot, unsigned long flags,
91821 unsigned long pgoff, unsigned long *populate);
91822 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
91823+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
91824
91825 #ifdef CONFIG_MMU
91826 extern int __mm_populate(unsigned long addr, unsigned long len,
91827@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
91828 unsigned long high_limit;
91829 unsigned long align_mask;
91830 unsigned long align_offset;
91831+ unsigned long threadstack_offset;
91832 };
91833
91834-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
91835-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
91836+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
91837+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
91838
91839 /*
91840 * Search for an unmapped address range.
91841@@ -1971,7 +1988,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
91842 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
91843 */
91844 static inline unsigned long
91845-vm_unmapped_area(struct vm_unmapped_area_info *info)
91846+vm_unmapped_area(const struct vm_unmapped_area_info *info)
91847 {
91848 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
91849 return unmapped_area(info);
91850@@ -2033,6 +2050,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
91851 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
91852 struct vm_area_struct **pprev);
91853
91854+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
91855+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
91856+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
91857+
91858 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
91859 NULL if none. Assume start_addr < end_addr. */
91860 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
91861@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
91862 }
91863
91864 #ifdef CONFIG_MMU
91865-pgprot_t vm_get_page_prot(unsigned long vm_flags);
91866+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
91867 void vma_set_page_prot(struct vm_area_struct *vma);
91868 #else
91869-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
91870+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
91871 {
91872 return __pgprot(0);
91873 }
91874@@ -2127,6 +2148,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
91875 static inline void vm_stat_account(struct mm_struct *mm,
91876 unsigned long flags, struct file *file, long pages)
91877 {
91878+
91879+#ifdef CONFIG_PAX_RANDMMAP
91880+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
91881+#endif
91882+
91883 mm->total_vm += pages;
91884 }
91885 #endif /* CONFIG_PROC_FS */
91886@@ -2229,7 +2255,7 @@ extern int unpoison_memory(unsigned long pfn);
91887 extern int sysctl_memory_failure_early_kill;
91888 extern int sysctl_memory_failure_recovery;
91889 extern void shake_page(struct page *p, int access);
91890-extern atomic_long_t num_poisoned_pages;
91891+extern atomic_long_unchecked_t num_poisoned_pages;
91892 extern int soft_offline_page(struct page *page, int flags);
91893
91894 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
91895@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
91896 static inline void setup_nr_node_ids(void) {}
91897 #endif
91898
91899+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
91900+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
91901+#else
91902+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
91903+#endif
91904+
91905 #endif /* __KERNEL__ */
91906 #endif /* _LINUX_MM_H */
91907diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
91908index 199a03a..7328440 100644
91909--- a/include/linux/mm_types.h
91910+++ b/include/linux/mm_types.h
91911@@ -313,7 +313,9 @@ struct vm_area_struct {
91912 #ifdef CONFIG_NUMA
91913 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
91914 #endif
91915-};
91916+
91917+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
91918+} __randomize_layout;
91919
91920 struct core_thread {
91921 struct task_struct *task;
91922@@ -464,7 +466,25 @@ struct mm_struct {
91923 /* address of the bounds directory */
91924 void __user *bd_addr;
91925 #endif
91926-};
91927+
91928+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
91929+ unsigned long pax_flags;
91930+#endif
91931+
91932+#ifdef CONFIG_PAX_DLRESOLVE
91933+ unsigned long call_dl_resolve;
91934+#endif
91935+
91936+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
91937+ unsigned long call_syscall;
91938+#endif
91939+
91940+#ifdef CONFIG_PAX_ASLR
91941+ unsigned long delta_mmap; /* randomized offset */
91942+ unsigned long delta_stack; /* randomized offset */
91943+#endif
91944+
91945+} __randomize_layout;
91946
91947 static inline void mm_init_cpumask(struct mm_struct *mm)
91948 {
91949diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
91950index 160448f..7b332b7 100644
91951--- a/include/linux/mmc/core.h
91952+++ b/include/linux/mmc/core.h
91953@@ -79,7 +79,7 @@ struct mmc_command {
91954 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
91955
91956 unsigned int retries; /* max number of retries */
91957- unsigned int error; /* command error */
91958+ int error; /* command error */
91959
91960 /*
91961 * Standard errno values are used for errors, but some have specific
91962diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
91963index c5d5278..f0b68c8 100644
91964--- a/include/linux/mmiotrace.h
91965+++ b/include/linux/mmiotrace.h
91966@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
91967 /* Called from ioremap.c */
91968 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
91969 void __iomem *addr);
91970-extern void mmiotrace_iounmap(volatile void __iomem *addr);
91971+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
91972
91973 /* For anyone to insert markers. Remember trailing newline. */
91974 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
91975@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
91976 {
91977 }
91978
91979-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
91980+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
91981 {
91982 }
91983
91984diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
91985index 2782df4..abe756e 100644
91986--- a/include/linux/mmzone.h
91987+++ b/include/linux/mmzone.h
91988@@ -526,7 +526,7 @@ struct zone {
91989
91990 ZONE_PADDING(_pad3_)
91991 /* Zone statistics */
91992- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
91993+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
91994 } ____cacheline_internodealigned_in_smp;
91995
91996 enum zone_flags {
91997diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
91998index e530533..c9620c7 100644
91999--- a/include/linux/mod_devicetable.h
92000+++ b/include/linux/mod_devicetable.h
92001@@ -139,7 +139,7 @@ struct usb_device_id {
92002 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
92003 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
92004
92005-#define HID_ANY_ID (~0)
92006+#define HID_ANY_ID (~0U)
92007 #define HID_BUS_ANY 0xffff
92008 #define HID_GROUP_ANY 0x0000
92009
92010@@ -470,7 +470,7 @@ struct dmi_system_id {
92011 const char *ident;
92012 struct dmi_strmatch matches[4];
92013 void *driver_data;
92014-};
92015+} __do_const;
92016 /*
92017 * struct dmi_device_id appears during expansion of
92018 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
92019diff --git a/include/linux/module.h b/include/linux/module.h
92020index b03485b..a26974f 100644
92021--- a/include/linux/module.h
92022+++ b/include/linux/module.h
92023@@ -17,9 +17,11 @@
92024 #include <linux/moduleparam.h>
92025 #include <linux/jump_label.h>
92026 #include <linux/export.h>
92027+#include <linux/fs.h>
92028
92029 #include <linux/percpu.h>
92030 #include <asm/module.h>
92031+#include <asm/pgtable.h>
92032
92033 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
92034 #define MODULE_SIG_STRING "~Module signature appended~\n"
92035@@ -42,7 +44,7 @@ struct module_kobject {
92036 struct kobject *drivers_dir;
92037 struct module_param_attrs *mp;
92038 struct completion *kobj_completion;
92039-};
92040+} __randomize_layout;
92041
92042 struct module_attribute {
92043 struct attribute attr;
92044@@ -54,12 +56,13 @@ struct module_attribute {
92045 int (*test)(struct module *);
92046 void (*free)(struct module *);
92047 };
92048+typedef struct module_attribute __no_const module_attribute_no_const;
92049
92050 struct module_version_attribute {
92051 struct module_attribute mattr;
92052 const char *module_name;
92053 const char *version;
92054-} __attribute__ ((__aligned__(sizeof(void *))));
92055+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
92056
92057 extern ssize_t __modver_version_show(struct module_attribute *,
92058 struct module_kobject *, char *);
92059@@ -221,7 +224,7 @@ struct module {
92060
92061 /* Sysfs stuff. */
92062 struct module_kobject mkobj;
92063- struct module_attribute *modinfo_attrs;
92064+ module_attribute_no_const *modinfo_attrs;
92065 const char *version;
92066 const char *srcversion;
92067 struct kobject *holders_dir;
92068@@ -270,19 +273,16 @@ struct module {
92069 int (*init)(void);
92070
92071 /* If this is non-NULL, vfree after init() returns */
92072- void *module_init;
92073+ void *module_init_rx, *module_init_rw;
92074
92075 /* Here is the actual code + data, vfree'd on unload. */
92076- void *module_core;
92077+ void *module_core_rx, *module_core_rw;
92078
92079 /* Here are the sizes of the init and core sections */
92080- unsigned int init_size, core_size;
92081+ unsigned int init_size_rw, core_size_rw;
92082
92083 /* The size of the executable code in each section. */
92084- unsigned int init_text_size, core_text_size;
92085-
92086- /* Size of RO sections of the module (text+rodata) */
92087- unsigned int init_ro_size, core_ro_size;
92088+ unsigned int init_size_rx, core_size_rx;
92089
92090 /* Arch-specific module values */
92091 struct mod_arch_specific arch;
92092@@ -338,6 +338,10 @@ struct module {
92093 #ifdef CONFIG_EVENT_TRACING
92094 struct ftrace_event_call **trace_events;
92095 unsigned int num_trace_events;
92096+ struct file_operations trace_id;
92097+ struct file_operations trace_enable;
92098+ struct file_operations trace_format;
92099+ struct file_operations trace_filter;
92100 #endif
92101 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
92102 unsigned int num_ftrace_callsites;
92103@@ -365,7 +369,7 @@ struct module {
92104 ctor_fn_t *ctors;
92105 unsigned int num_ctors;
92106 #endif
92107-};
92108+} __randomize_layout;
92109 #ifndef MODULE_ARCH_INIT
92110 #define MODULE_ARCH_INIT {}
92111 #endif
92112@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
92113 bool is_module_percpu_address(unsigned long addr);
92114 bool is_module_text_address(unsigned long addr);
92115
92116+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
92117+{
92118+
92119+#ifdef CONFIG_PAX_KERNEXEC
92120+ if (ktla_ktva(addr) >= (unsigned long)start &&
92121+ ktla_ktva(addr) < (unsigned long)start + size)
92122+ return 1;
92123+#endif
92124+
92125+ return ((void *)addr >= start && (void *)addr < start + size);
92126+}
92127+
92128+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
92129+{
92130+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
92131+}
92132+
92133+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
92134+{
92135+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
92136+}
92137+
92138+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
92139+{
92140+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
92141+}
92142+
92143+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
92144+{
92145+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
92146+}
92147+
92148 static inline bool within_module_core(unsigned long addr,
92149 const struct module *mod)
92150 {
92151- return (unsigned long)mod->module_core <= addr &&
92152- addr < (unsigned long)mod->module_core + mod->core_size;
92153+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
92154 }
92155
92156 static inline bool within_module_init(unsigned long addr,
92157 const struct module *mod)
92158 {
92159- return (unsigned long)mod->module_init <= addr &&
92160- addr < (unsigned long)mod->module_init + mod->init_size;
92161+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
92162 }
92163
92164 static inline bool within_module(unsigned long addr, const struct module *mod)
92165diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
92166index 4d0cb9b..3169ac7 100644
92167--- a/include/linux/moduleloader.h
92168+++ b/include/linux/moduleloader.h
92169@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
92170 sections. Returns NULL on failure. */
92171 void *module_alloc(unsigned long size);
92172
92173+#ifdef CONFIG_PAX_KERNEXEC
92174+void *module_alloc_exec(unsigned long size);
92175+#else
92176+#define module_alloc_exec(x) module_alloc(x)
92177+#endif
92178+
92179 /* Free memory returned from module_alloc. */
92180 void module_memfree(void *module_region);
92181
92182+#ifdef CONFIG_PAX_KERNEXEC
92183+void module_memfree_exec(void *module_region);
92184+#else
92185+#define module_memfree_exec(x) module_memfree((x))
92186+#endif
92187+
92188 /*
92189 * Apply the given relocation to the (simplified) ELF. Return -error
92190 * or 0.
92191@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
92192 unsigned int relsec,
92193 struct module *me)
92194 {
92195+#ifdef CONFIG_MODULES
92196 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92197 module_name(me));
92198+#endif
92199 return -ENOEXEC;
92200 }
92201 #endif
92202@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
92203 unsigned int relsec,
92204 struct module *me)
92205 {
92206+#ifdef CONFIG_MODULES
92207 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92208 module_name(me));
92209+#endif
92210 return -ENOEXEC;
92211 }
92212 #endif
92213diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
92214index 1c9effa..1160bdd 100644
92215--- a/include/linux/moduleparam.h
92216+++ b/include/linux/moduleparam.h
92217@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
92218 * @len is usually just sizeof(string).
92219 */
92220 #define module_param_string(name, string, len, perm) \
92221- static const struct kparam_string __param_string_##name \
92222+ static const struct kparam_string __param_string_##name __used \
92223 = { len, string }; \
92224 __module_param_call(MODULE_PARAM_PREFIX, name, \
92225 &param_ops_string, \
92226@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
92227 */
92228 #define module_param_array_named(name, array, type, nump, perm) \
92229 param_check_##type(name, &(array)[0]); \
92230- static const struct kparam_array __param_arr_##name \
92231+ static const struct kparam_array __param_arr_##name __used \
92232 = { .max = ARRAY_SIZE(array), .num = nump, \
92233 .ops = &param_ops_##type, \
92234 .elemsize = sizeof(array[0]), .elem = array }; \
92235diff --git a/include/linux/mount.h b/include/linux/mount.h
92236index 564beee..653be6f 100644
92237--- a/include/linux/mount.h
92238+++ b/include/linux/mount.h
92239@@ -67,7 +67,7 @@ struct vfsmount {
92240 struct dentry *mnt_root; /* root of the mounted tree */
92241 struct super_block *mnt_sb; /* pointer to superblock */
92242 int mnt_flags;
92243-};
92244+} __randomize_layout;
92245
92246 struct file; /* forward dec */
92247 struct path;
92248diff --git a/include/linux/namei.h b/include/linux/namei.h
92249index c899077..b9a2010 100644
92250--- a/include/linux/namei.h
92251+++ b/include/linux/namei.h
92252@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
92253 extern void unlock_rename(struct dentry *, struct dentry *);
92254
92255 extern void nd_jump_link(struct nameidata *nd, struct path *path);
92256-extern void nd_set_link(struct nameidata *nd, char *path);
92257-extern char *nd_get_link(struct nameidata *nd);
92258+extern void nd_set_link(struct nameidata *nd, const char *path);
92259+extern const char *nd_get_link(const struct nameidata *nd);
92260
92261 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
92262 {
92263diff --git a/include/linux/net.h b/include/linux/net.h
92264index 17d8339..81656c0 100644
92265--- a/include/linux/net.h
92266+++ b/include/linux/net.h
92267@@ -192,7 +192,7 @@ struct net_proto_family {
92268 int (*create)(struct net *net, struct socket *sock,
92269 int protocol, int kern);
92270 struct module *owner;
92271-};
92272+} __do_const;
92273
92274 struct iovec;
92275 struct kvec;
92276diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
92277index 2787388..1dd8e88 100644
92278--- a/include/linux/netdevice.h
92279+++ b/include/linux/netdevice.h
92280@@ -1198,6 +1198,7 @@ struct net_device_ops {
92281 u8 state);
92282 #endif
92283 };
92284+typedef struct net_device_ops __no_const net_device_ops_no_const;
92285
92286 /**
92287 * enum net_device_priv_flags - &struct net_device priv_flags
92288@@ -1546,10 +1547,10 @@ struct net_device {
92289
92290 struct net_device_stats stats;
92291
92292- atomic_long_t rx_dropped;
92293- atomic_long_t tx_dropped;
92294+ atomic_long_unchecked_t rx_dropped;
92295+ atomic_long_unchecked_t tx_dropped;
92296
92297- atomic_t carrier_changes;
92298+ atomic_unchecked_t carrier_changes;
92299
92300 #ifdef CONFIG_WIRELESS_EXT
92301 const struct iw_handler_def * wireless_handlers;
92302diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
92303index 2517ece..0bbfcfb 100644
92304--- a/include/linux/netfilter.h
92305+++ b/include/linux/netfilter.h
92306@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
92307 #endif
92308 /* Use the module struct to lock set/get code in place */
92309 struct module *owner;
92310-};
92311+} __do_const;
92312
92313 /* Function to register/unregister hook points. */
92314 int nf_register_hook(struct nf_hook_ops *reg);
92315diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
92316index e955d47..04a5338 100644
92317--- a/include/linux/netfilter/nfnetlink.h
92318+++ b/include/linux/netfilter/nfnetlink.h
92319@@ -19,7 +19,7 @@ struct nfnl_callback {
92320 const struct nlattr * const cda[]);
92321 const struct nla_policy *policy; /* netlink attribute policy */
92322 const u_int16_t attr_count; /* number of nlattr's */
92323-};
92324+} __do_const;
92325
92326 struct nfnetlink_subsystem {
92327 const char *name;
92328diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
92329new file mode 100644
92330index 0000000..33f4af8
92331--- /dev/null
92332+++ b/include/linux/netfilter/xt_gradm.h
92333@@ -0,0 +1,9 @@
92334+#ifndef _LINUX_NETFILTER_XT_GRADM_H
92335+#define _LINUX_NETFILTER_XT_GRADM_H 1
92336+
92337+struct xt_gradm_mtinfo {
92338+ __u16 flags;
92339+ __u16 invflags;
92340+};
92341+
92342+#endif
92343diff --git a/include/linux/nls.h b/include/linux/nls.h
92344index 520681b..2b7fabb 100644
92345--- a/include/linux/nls.h
92346+++ b/include/linux/nls.h
92347@@ -31,7 +31,7 @@ struct nls_table {
92348 const unsigned char *charset2upper;
92349 struct module *owner;
92350 struct nls_table *next;
92351-};
92352+} __do_const;
92353
92354 /* this value hold the maximum octet of charset */
92355 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
92356@@ -46,7 +46,7 @@ enum utf16_endian {
92357 /* nls_base.c */
92358 extern int __register_nls(struct nls_table *, struct module *);
92359 extern int unregister_nls(struct nls_table *);
92360-extern struct nls_table *load_nls(char *);
92361+extern struct nls_table *load_nls(const char *);
92362 extern void unload_nls(struct nls_table *);
92363 extern struct nls_table *load_nls_default(void);
92364 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
92365diff --git a/include/linux/notifier.h b/include/linux/notifier.h
92366index d14a4c3..a078786 100644
92367--- a/include/linux/notifier.h
92368+++ b/include/linux/notifier.h
92369@@ -54,7 +54,8 @@ struct notifier_block {
92370 notifier_fn_t notifier_call;
92371 struct notifier_block __rcu *next;
92372 int priority;
92373-};
92374+} __do_const;
92375+typedef struct notifier_block __no_const notifier_block_no_const;
92376
92377 struct atomic_notifier_head {
92378 spinlock_t lock;
92379diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
92380index b2a0f15..4d7da32 100644
92381--- a/include/linux/oprofile.h
92382+++ b/include/linux/oprofile.h
92383@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
92384 int oprofilefs_create_ro_ulong(struct dentry * root,
92385 char const * name, ulong * val);
92386
92387-/** Create a file for read-only access to an atomic_t. */
92388+/** Create a file for read-only access to an atomic_unchecked_t. */
92389 int oprofilefs_create_ro_atomic(struct dentry * root,
92390- char const * name, atomic_t * val);
92391+ char const * name, atomic_unchecked_t * val);
92392
92393 /** create a directory */
92394 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
92395diff --git a/include/linux/padata.h b/include/linux/padata.h
92396index 4386946..f50c615 100644
92397--- a/include/linux/padata.h
92398+++ b/include/linux/padata.h
92399@@ -129,7 +129,7 @@ struct parallel_data {
92400 struct padata_serial_queue __percpu *squeue;
92401 atomic_t reorder_objects;
92402 atomic_t refcnt;
92403- atomic_t seq_nr;
92404+ atomic_unchecked_t seq_nr;
92405 struct padata_cpumask cpumask;
92406 spinlock_t lock ____cacheline_aligned;
92407 unsigned int processed;
92408diff --git a/include/linux/path.h b/include/linux/path.h
92409index d137218..be0c176 100644
92410--- a/include/linux/path.h
92411+++ b/include/linux/path.h
92412@@ -1,13 +1,15 @@
92413 #ifndef _LINUX_PATH_H
92414 #define _LINUX_PATH_H
92415
92416+#include <linux/compiler.h>
92417+
92418 struct dentry;
92419 struct vfsmount;
92420
92421 struct path {
92422 struct vfsmount *mnt;
92423 struct dentry *dentry;
92424-};
92425+} __randomize_layout;
92426
92427 extern void path_get(const struct path *);
92428 extern void path_put(const struct path *);
92429diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
92430index 8c78950..0d74ed9 100644
92431--- a/include/linux/pci_hotplug.h
92432+++ b/include/linux/pci_hotplug.h
92433@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
92434 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
92435 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
92436 int (*reset_slot) (struct hotplug_slot *slot, int probe);
92437-};
92438+} __do_const;
92439+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
92440
92441 /**
92442 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
92443diff --git a/include/linux/percpu.h b/include/linux/percpu.h
92444index caebf2a..4c3ae9d 100644
92445--- a/include/linux/percpu.h
92446+++ b/include/linux/percpu.h
92447@@ -34,7 +34,7 @@
92448 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
92449 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
92450 */
92451-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
92452+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
92453 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
92454
92455 /*
92456diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
92457index 2b62198..2b74233 100644
92458--- a/include/linux/perf_event.h
92459+++ b/include/linux/perf_event.h
92460@@ -343,8 +343,8 @@ struct perf_event {
92461
92462 enum perf_event_active_state state;
92463 unsigned int attach_state;
92464- local64_t count;
92465- atomic64_t child_count;
92466+ local64_t count; /* PaX: fix it one day */
92467+ atomic64_unchecked_t child_count;
92468
92469 /*
92470 * These are the total time in nanoseconds that the event
92471@@ -395,8 +395,8 @@ struct perf_event {
92472 * These accumulate total time (in nanoseconds) that children
92473 * events have been enabled and running, respectively.
92474 */
92475- atomic64_t child_total_time_enabled;
92476- atomic64_t child_total_time_running;
92477+ atomic64_unchecked_t child_total_time_enabled;
92478+ atomic64_unchecked_t child_total_time_running;
92479
92480 /*
92481 * Protect attach/detach and child_list:
92482@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
92483 entry->ip[entry->nr++] = ip;
92484 }
92485
92486-extern int sysctl_perf_event_paranoid;
92487+extern int sysctl_perf_event_legitimately_concerned;
92488 extern int sysctl_perf_event_mlock;
92489 extern int sysctl_perf_event_sample_rate;
92490 extern int sysctl_perf_cpu_time_max_percent;
92491@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
92492 loff_t *ppos);
92493
92494
92495+static inline bool perf_paranoid_any(void)
92496+{
92497+ return sysctl_perf_event_legitimately_concerned > 2;
92498+}
92499+
92500 static inline bool perf_paranoid_tracepoint_raw(void)
92501 {
92502- return sysctl_perf_event_paranoid > -1;
92503+ return sysctl_perf_event_legitimately_concerned > -1;
92504 }
92505
92506 static inline bool perf_paranoid_cpu(void)
92507 {
92508- return sysctl_perf_event_paranoid > 0;
92509+ return sysctl_perf_event_legitimately_concerned > 0;
92510 }
92511
92512 static inline bool perf_paranoid_kernel(void)
92513 {
92514- return sysctl_perf_event_paranoid > 1;
92515+ return sysctl_perf_event_legitimately_concerned > 1;
92516 }
92517
92518 extern void perf_event_init(void);
92519@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
92520 struct device_attribute attr;
92521 u64 id;
92522 const char *event_str;
92523-};
92524+} __do_const;
92525
92526 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
92527 char *page);
92528diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
92529index 918b117..7af374b7 100644
92530--- a/include/linux/pid_namespace.h
92531+++ b/include/linux/pid_namespace.h
92532@@ -45,7 +45,7 @@ struct pid_namespace {
92533 int hide_pid;
92534 int reboot; /* group exit code if this pidns was rebooted */
92535 struct ns_common ns;
92536-};
92537+} __randomize_layout;
92538
92539 extern struct pid_namespace init_pid_ns;
92540
92541diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
92542index eb8b8ac..62649e1 100644
92543--- a/include/linux/pipe_fs_i.h
92544+++ b/include/linux/pipe_fs_i.h
92545@@ -47,10 +47,10 @@ struct pipe_inode_info {
92546 struct mutex mutex;
92547 wait_queue_head_t wait;
92548 unsigned int nrbufs, curbuf, buffers;
92549- unsigned int readers;
92550- unsigned int writers;
92551- unsigned int files;
92552- unsigned int waiting_writers;
92553+ atomic_t readers;
92554+ atomic_t writers;
92555+ atomic_t files;
92556+ atomic_t waiting_writers;
92557 unsigned int r_counter;
92558 unsigned int w_counter;
92559 struct page *tmp_page;
92560diff --git a/include/linux/pm.h b/include/linux/pm.h
92561index e2f1be6..78a0506 100644
92562--- a/include/linux/pm.h
92563+++ b/include/linux/pm.h
92564@@ -608,6 +608,7 @@ struct dev_pm_domain {
92565 struct dev_pm_ops ops;
92566 void (*detach)(struct device *dev, bool power_off);
92567 };
92568+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
92569
92570 /*
92571 * The PM_EVENT_ messages are also used by drivers implementing the legacy
92572diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
92573index 080e778..cbdaef7 100644
92574--- a/include/linux/pm_domain.h
92575+++ b/include/linux/pm_domain.h
92576@@ -39,11 +39,11 @@ struct gpd_dev_ops {
92577 int (*save_state)(struct device *dev);
92578 int (*restore_state)(struct device *dev);
92579 bool (*active_wakeup)(struct device *dev);
92580-};
92581+} __no_const;
92582
92583 struct gpd_cpuidle_data {
92584 unsigned int saved_exit_latency;
92585- struct cpuidle_state *idle_state;
92586+ cpuidle_state_no_const *idle_state;
92587 };
92588
92589 struct generic_pm_domain {
92590diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
92591index 30e84d4..22278b4 100644
92592--- a/include/linux/pm_runtime.h
92593+++ b/include/linux/pm_runtime.h
92594@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
92595
92596 static inline void pm_runtime_mark_last_busy(struct device *dev)
92597 {
92598- ACCESS_ONCE(dev->power.last_busy) = jiffies;
92599+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
92600 }
92601
92602 static inline bool pm_runtime_is_irq_safe(struct device *dev)
92603diff --git a/include/linux/pnp.h b/include/linux/pnp.h
92604index 6512e9c..ec27fa2 100644
92605--- a/include/linux/pnp.h
92606+++ b/include/linux/pnp.h
92607@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
92608 struct pnp_fixup {
92609 char id[7];
92610 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
92611-};
92612+} __do_const;
92613
92614 /* config parameters */
92615 #define PNP_CONFIG_NORMAL 0x0001
92616diff --git a/include/linux/poison.h b/include/linux/poison.h
92617index 2110a81..13a11bb 100644
92618--- a/include/linux/poison.h
92619+++ b/include/linux/poison.h
92620@@ -19,8 +19,8 @@
92621 * under normal circumstances, used to verify that nobody uses
92622 * non-initialized list entries.
92623 */
92624-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
92625-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
92626+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
92627+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
92628
92629 /********** include/linux/timer.h **********/
92630 /*
92631diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
92632index d8b187c3..9a9257a 100644
92633--- a/include/linux/power/smartreflex.h
92634+++ b/include/linux/power/smartreflex.h
92635@@ -238,7 +238,7 @@ struct omap_sr_class_data {
92636 int (*notify)(struct omap_sr *sr, u32 status);
92637 u8 notify_flags;
92638 u8 class_type;
92639-};
92640+} __do_const;
92641
92642 /**
92643 * struct omap_sr_nvalue_table - Smartreflex n-target value info
92644diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
92645index 4ea1d37..80f4b33 100644
92646--- a/include/linux/ppp-comp.h
92647+++ b/include/linux/ppp-comp.h
92648@@ -84,7 +84,7 @@ struct compressor {
92649 struct module *owner;
92650 /* Extra skb space needed by the compressor algorithm */
92651 unsigned int comp_extra;
92652-};
92653+} __do_const;
92654
92655 /*
92656 * The return value from decompress routine is the length of the
92657diff --git a/include/linux/preempt.h b/include/linux/preempt.h
92658index de83b4e..c4b997d 100644
92659--- a/include/linux/preempt.h
92660+++ b/include/linux/preempt.h
92661@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
92662 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
92663 #endif
92664
92665+#define raw_preempt_count_add(val) __preempt_count_add(val)
92666+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
92667+
92668 #define __preempt_count_inc() __preempt_count_add(1)
92669 #define __preempt_count_dec() __preempt_count_sub(1)
92670
92671 #define preempt_count_inc() preempt_count_add(1)
92672+#define raw_preempt_count_inc() raw_preempt_count_add(1)
92673 #define preempt_count_dec() preempt_count_sub(1)
92674+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
92675
92676 #ifdef CONFIG_PREEMPT_COUNT
92677
92678@@ -41,6 +46,12 @@ do { \
92679 barrier(); \
92680 } while (0)
92681
92682+#define raw_preempt_disable() \
92683+do { \
92684+ raw_preempt_count_inc(); \
92685+ barrier(); \
92686+} while (0)
92687+
92688 #define sched_preempt_enable_no_resched() \
92689 do { \
92690 barrier(); \
92691@@ -49,6 +60,12 @@ do { \
92692
92693 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
92694
92695+#define raw_preempt_enable_no_resched() \
92696+do { \
92697+ barrier(); \
92698+ raw_preempt_count_dec(); \
92699+} while (0)
92700+
92701 #ifdef CONFIG_PREEMPT
92702 #define preempt_enable() \
92703 do { \
92704@@ -113,8 +130,10 @@ do { \
92705 * region.
92706 */
92707 #define preempt_disable() barrier()
92708+#define raw_preempt_disable() barrier()
92709 #define sched_preempt_enable_no_resched() barrier()
92710 #define preempt_enable_no_resched() barrier()
92711+#define raw_preempt_enable_no_resched() barrier()
92712 #define preempt_enable() barrier()
92713 #define preempt_check_resched() do { } while (0)
92714
92715@@ -128,11 +147,13 @@ do { \
92716 /*
92717 * Modules have no business playing preemption tricks.
92718 */
92719+#ifndef CONFIG_PAX_KERNEXEC
92720 #undef sched_preempt_enable_no_resched
92721 #undef preempt_enable_no_resched
92722 #undef preempt_enable_no_resched_notrace
92723 #undef preempt_check_resched
92724 #endif
92725+#endif
92726
92727 #define preempt_set_need_resched() \
92728 do { \
92729diff --git a/include/linux/printk.h b/include/linux/printk.h
92730index baa3f97..168cff1 100644
92731--- a/include/linux/printk.h
92732+++ b/include/linux/printk.h
92733@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
92734 #endif
92735
92736 typedef int(*printk_func_t)(const char *fmt, va_list args);
92737+extern int kptr_restrict;
92738
92739 #ifdef CONFIG_PRINTK
92740 asmlinkage __printf(5, 0)
92741@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
92742
92743 extern int printk_delay_msec;
92744 extern int dmesg_restrict;
92745-extern int kptr_restrict;
92746
92747 extern void wake_up_klogd(void);
92748
92749diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
92750index b97bf2e..f14c92d4 100644
92751--- a/include/linux/proc_fs.h
92752+++ b/include/linux/proc_fs.h
92753@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
92754 extern struct proc_dir_entry *proc_symlink(const char *,
92755 struct proc_dir_entry *, const char *);
92756 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
92757+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
92758 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
92759 struct proc_dir_entry *, void *);
92760+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
92761+ struct proc_dir_entry *, void *);
92762 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
92763 struct proc_dir_entry *);
92764
92765@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
92766 return proc_create_data(name, mode, parent, proc_fops, NULL);
92767 }
92768
92769+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
92770+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
92771+{
92772+#ifdef CONFIG_GRKERNSEC_PROC_USER
92773+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
92774+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92775+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
92776+#else
92777+ return proc_create_data(name, mode, parent, proc_fops, NULL);
92778+#endif
92779+}
92780+
92781+
92782 extern void proc_set_size(struct proc_dir_entry *, loff_t);
92783 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
92784 extern void *PDE_DATA(const struct inode *);
92785@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
92786 struct proc_dir_entry *parent,const char *dest) { return NULL;}
92787 static inline struct proc_dir_entry *proc_mkdir(const char *name,
92788 struct proc_dir_entry *parent) {return NULL;}
92789+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
92790+ struct proc_dir_entry *parent) { return NULL; }
92791 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
92792 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92793+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
92794+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92795 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
92796 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
92797 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
92798@@ -79,7 +99,7 @@ struct net;
92799 static inline struct proc_dir_entry *proc_net_mkdir(
92800 struct net *net, const char *name, struct proc_dir_entry *parent)
92801 {
92802- return proc_mkdir_data(name, 0, parent, net);
92803+ return proc_mkdir_data_restrict(name, 0, parent, net);
92804 }
92805
92806 #endif /* _LINUX_PROC_FS_H */
92807diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
92808index 42dfc61..8113a99 100644
92809--- a/include/linux/proc_ns.h
92810+++ b/include/linux/proc_ns.h
92811@@ -16,7 +16,7 @@ struct proc_ns_operations {
92812 struct ns_common *(*get)(struct task_struct *task);
92813 void (*put)(struct ns_common *ns);
92814 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
92815-};
92816+} __do_const __randomize_layout;
92817
92818 extern const struct proc_ns_operations netns_operations;
92819 extern const struct proc_ns_operations utsns_operations;
92820diff --git a/include/linux/quota.h b/include/linux/quota.h
92821index d534e8e..782e604 100644
92822--- a/include/linux/quota.h
92823+++ b/include/linux/quota.h
92824@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
92825
92826 extern bool qid_eq(struct kqid left, struct kqid right);
92827 extern bool qid_lt(struct kqid left, struct kqid right);
92828-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
92829+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
92830 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
92831 extern bool qid_valid(struct kqid qid);
92832
92833diff --git a/include/linux/random.h b/include/linux/random.h
92834index b05856e..0a9f14e 100644
92835--- a/include/linux/random.h
92836+++ b/include/linux/random.h
92837@@ -9,9 +9,19 @@
92838 #include <uapi/linux/random.h>
92839
92840 extern void add_device_randomness(const void *, unsigned int);
92841+
92842+static inline void add_latent_entropy(void)
92843+{
92844+
92845+#ifdef LATENT_ENTROPY_PLUGIN
92846+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
92847+#endif
92848+
92849+}
92850+
92851 extern void add_input_randomness(unsigned int type, unsigned int code,
92852- unsigned int value);
92853-extern void add_interrupt_randomness(int irq, int irq_flags);
92854+ unsigned int value) __latent_entropy;
92855+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
92856
92857 extern void get_random_bytes(void *buf, int nbytes);
92858 extern void get_random_bytes_arch(void *buf, int nbytes);
92859@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
92860 extern const struct file_operations random_fops, urandom_fops;
92861 #endif
92862
92863-unsigned int get_random_int(void);
92864+unsigned int __intentional_overflow(-1) get_random_int(void);
92865 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
92866
92867-u32 prandom_u32(void);
92868+u32 prandom_u32(void) __intentional_overflow(-1);
92869 void prandom_bytes(void *buf, size_t nbytes);
92870 void prandom_seed(u32 seed);
92871 void prandom_reseed_late(void);
92872@@ -37,6 +47,11 @@ struct rnd_state {
92873 u32 prandom_u32_state(struct rnd_state *state);
92874 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
92875
92876+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
92877+{
92878+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
92879+}
92880+
92881 /**
92882 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
92883 * @ep_ro: right open interval endpoint
92884@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
92885 *
92886 * Returns: pseudo-random number in interval [0, ep_ro)
92887 */
92888-static inline u32 prandom_u32_max(u32 ep_ro)
92889+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
92890 {
92891 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
92892 }
92893diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
92894index 378c5ee..aa84a47 100644
92895--- a/include/linux/rbtree_augmented.h
92896+++ b/include/linux/rbtree_augmented.h
92897@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
92898 old->rbaugmented = rbcompute(old); \
92899 } \
92900 rbstatic const struct rb_augment_callbacks rbname = { \
92901- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
92902+ .propagate = rbname ## _propagate, \
92903+ .copy = rbname ## _copy, \
92904+ .rotate = rbname ## _rotate \
92905 };
92906
92907
92908diff --git a/include/linux/rculist.h b/include/linux/rculist.h
92909index a18b16f..2683096 100644
92910--- a/include/linux/rculist.h
92911+++ b/include/linux/rculist.h
92912@@ -29,8 +29,8 @@
92913 */
92914 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
92915 {
92916- ACCESS_ONCE(list->next) = list;
92917- ACCESS_ONCE(list->prev) = list;
92918+ ACCESS_ONCE_RW(list->next) = list;
92919+ ACCESS_ONCE_RW(list->prev) = list;
92920 }
92921
92922 /*
92923@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
92924 struct list_head *prev, struct list_head *next);
92925 #endif
92926
92927+void __pax_list_add_rcu(struct list_head *new,
92928+ struct list_head *prev, struct list_head *next);
92929+
92930 /**
92931 * list_add_rcu - add a new entry to rcu-protected list
92932 * @new: new entry to be added
92933@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
92934 __list_add_rcu(new, head, head->next);
92935 }
92936
92937+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
92938+{
92939+ __pax_list_add_rcu(new, head, head->next);
92940+}
92941+
92942 /**
92943 * list_add_tail_rcu - add a new entry to rcu-protected list
92944 * @new: new entry to be added
92945@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
92946 __list_add_rcu(new, head->prev, head);
92947 }
92948
92949+static inline void pax_list_add_tail_rcu(struct list_head *new,
92950+ struct list_head *head)
92951+{
92952+ __pax_list_add_rcu(new, head->prev, head);
92953+}
92954+
92955 /**
92956 * list_del_rcu - deletes entry from list without re-initialization
92957 * @entry: the element to delete from the list.
92958@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
92959 entry->prev = LIST_POISON2;
92960 }
92961
92962+extern void pax_list_del_rcu(struct list_head *entry);
92963+
92964 /**
92965 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
92966 * @n: the element to delete from the hash list.
92967diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
92968index 7809749..1cd9315 100644
92969--- a/include/linux/rcupdate.h
92970+++ b/include/linux/rcupdate.h
92971@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
92972 do { \
92973 rcu_all_qs(); \
92974 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
92975- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
92976+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
92977 } while (0)
92978 #else /* #ifdef CONFIG_TASKS_RCU */
92979 #define TASKS_RCU(x) do { } while (0)
92980diff --git a/include/linux/reboot.h b/include/linux/reboot.h
92981index 67fc8fc..a90f7d8 100644
92982--- a/include/linux/reboot.h
92983+++ b/include/linux/reboot.h
92984@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
92985 */
92986
92987 extern void migrate_to_reboot_cpu(void);
92988-extern void machine_restart(char *cmd);
92989-extern void machine_halt(void);
92990-extern void machine_power_off(void);
92991+extern void machine_restart(char *cmd) __noreturn;
92992+extern void machine_halt(void) __noreturn;
92993+extern void machine_power_off(void) __noreturn;
92994
92995 extern void machine_shutdown(void);
92996 struct pt_regs;
92997@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
92998 */
92999
93000 extern void kernel_restart_prepare(char *cmd);
93001-extern void kernel_restart(char *cmd);
93002-extern void kernel_halt(void);
93003-extern void kernel_power_off(void);
93004+extern void kernel_restart(char *cmd) __noreturn;
93005+extern void kernel_halt(void) __noreturn;
93006+extern void kernel_power_off(void) __noreturn;
93007
93008 extern int C_A_D; /* for sysctl */
93009 void ctrl_alt_del(void);
93010@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
93011 * Emergency restart, callable from an interrupt handler.
93012 */
93013
93014-extern void emergency_restart(void);
93015+extern void emergency_restart(void) __noreturn;
93016 #include <asm/emergency-restart.h>
93017
93018 #endif /* _LINUX_REBOOT_H */
93019diff --git a/include/linux/regset.h b/include/linux/regset.h
93020index 8e0c9fe..ac4d221 100644
93021--- a/include/linux/regset.h
93022+++ b/include/linux/regset.h
93023@@ -161,7 +161,8 @@ struct user_regset {
93024 unsigned int align;
93025 unsigned int bias;
93026 unsigned int core_note_type;
93027-};
93028+} __do_const;
93029+typedef struct user_regset __no_const user_regset_no_const;
93030
93031 /**
93032 * struct user_regset_view - available regsets
93033diff --git a/include/linux/relay.h b/include/linux/relay.h
93034index d7c8359..818daf5 100644
93035--- a/include/linux/relay.h
93036+++ b/include/linux/relay.h
93037@@ -157,7 +157,7 @@ struct rchan_callbacks
93038 * The callback should return 0 if successful, negative if not.
93039 */
93040 int (*remove_buf_file)(struct dentry *dentry);
93041-};
93042+} __no_const;
93043
93044 /*
93045 * CONFIG_RELAY kernel API, kernel/relay.c
93046diff --git a/include/linux/rio.h b/include/linux/rio.h
93047index 6bda06f..bf39a9b 100644
93048--- a/include/linux/rio.h
93049+++ b/include/linux/rio.h
93050@@ -358,7 +358,7 @@ struct rio_ops {
93051 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
93052 u64 rstart, u32 size, u32 flags);
93053 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
93054-};
93055+} __no_const;
93056
93057 #define RIO_RESOURCE_MEM 0x00000100
93058 #define RIO_RESOURCE_DOORBELL 0x00000200
93059diff --git a/include/linux/rmap.h b/include/linux/rmap.h
93060index c4c559a..6ba9a26 100644
93061--- a/include/linux/rmap.h
93062+++ b/include/linux/rmap.h
93063@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
93064 void anon_vma_init(void); /* create anon_vma_cachep */
93065 int anon_vma_prepare(struct vm_area_struct *);
93066 void unlink_anon_vmas(struct vm_area_struct *);
93067-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
93068-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
93069+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
93070+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
93071
93072 static inline void anon_vma_merge(struct vm_area_struct *vma,
93073 struct vm_area_struct *next)
93074diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
93075index ed8f9e70..999bc96 100644
93076--- a/include/linux/scatterlist.h
93077+++ b/include/linux/scatterlist.h
93078@@ -1,6 +1,7 @@
93079 #ifndef _LINUX_SCATTERLIST_H
93080 #define _LINUX_SCATTERLIST_H
93081
93082+#include <linux/sched.h>
93083 #include <linux/string.h>
93084 #include <linux/bug.h>
93085 #include <linux/mm.h>
93086@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
93087 #ifdef CONFIG_DEBUG_SG
93088 BUG_ON(!virt_addr_valid(buf));
93089 #endif
93090+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93091+ if (object_starts_on_stack(buf)) {
93092+ void *adjbuf = buf - current->stack + current->lowmem_stack;
93093+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
93094+ } else
93095+#endif
93096 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
93097 }
93098
93099diff --git a/include/linux/sched.h b/include/linux/sched.h
93100index 51348f7..8c8b0ba 100644
93101--- a/include/linux/sched.h
93102+++ b/include/linux/sched.h
93103@@ -133,6 +133,7 @@ struct fs_struct;
93104 struct perf_event_context;
93105 struct blk_plug;
93106 struct filename;
93107+struct linux_binprm;
93108
93109 #define VMACACHE_BITS 2
93110 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
93111@@ -420,7 +421,7 @@ extern char __sched_text_start[], __sched_text_end[];
93112 extern int in_sched_functions(unsigned long addr);
93113
93114 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
93115-extern signed long schedule_timeout(signed long timeout);
93116+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
93117 extern signed long schedule_timeout_interruptible(signed long timeout);
93118 extern signed long schedule_timeout_killable(signed long timeout);
93119 extern signed long schedule_timeout_uninterruptible(signed long timeout);
93120@@ -438,6 +439,19 @@ struct nsproxy;
93121 struct user_namespace;
93122
93123 #ifdef CONFIG_MMU
93124+
93125+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
93126+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
93127+#else
93128+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
93129+{
93130+ return 0;
93131+}
93132+#endif
93133+
93134+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
93135+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
93136+
93137 extern void arch_pick_mmap_layout(struct mm_struct *mm);
93138 extern unsigned long
93139 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
93140@@ -736,6 +750,17 @@ struct signal_struct {
93141 #ifdef CONFIG_TASKSTATS
93142 struct taskstats *stats;
93143 #endif
93144+
93145+#ifdef CONFIG_GRKERNSEC
93146+ u32 curr_ip;
93147+ u32 saved_ip;
93148+ u32 gr_saddr;
93149+ u32 gr_daddr;
93150+ u16 gr_sport;
93151+ u16 gr_dport;
93152+ u8 used_accept:1;
93153+#endif
93154+
93155 #ifdef CONFIG_AUDIT
93156 unsigned audit_tty;
93157 unsigned audit_tty_log_passwd;
93158@@ -762,7 +787,7 @@ struct signal_struct {
93159 struct mutex cred_guard_mutex; /* guard against foreign influences on
93160 * credential calculations
93161 * (notably. ptrace) */
93162-};
93163+} __randomize_layout;
93164
93165 /*
93166 * Bits in flags field of signal_struct.
93167@@ -815,6 +840,14 @@ struct user_struct {
93168 struct key *session_keyring; /* UID's default session keyring */
93169 #endif
93170
93171+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
93172+ unsigned char kernel_banned;
93173+#endif
93174+#ifdef CONFIG_GRKERNSEC_BRUTE
93175+ unsigned char suid_banned;
93176+ unsigned long suid_ban_expires;
93177+#endif
93178+
93179 /* Hash table maintenance information */
93180 struct hlist_node uidhash_node;
93181 kuid_t uid;
93182@@ -822,7 +855,7 @@ struct user_struct {
93183 #ifdef CONFIG_PERF_EVENTS
93184 atomic_long_t locked_vm;
93185 #endif
93186-};
93187+} __randomize_layout;
93188
93189 extern int uids_sysfs_init(void);
93190
93191@@ -1286,6 +1319,9 @@ enum perf_event_task_context {
93192 struct task_struct {
93193 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
93194 void *stack;
93195+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93196+ void *lowmem_stack;
93197+#endif
93198 atomic_t usage;
93199 unsigned int flags; /* per process flags, defined below */
93200 unsigned int ptrace;
93201@@ -1419,8 +1455,8 @@ struct task_struct {
93202 struct list_head thread_node;
93203
93204 struct completion *vfork_done; /* for vfork() */
93205- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
93206- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93207+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
93208+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93209
93210 cputime_t utime, stime, utimescaled, stimescaled;
93211 cputime_t gtime;
93212@@ -1445,11 +1481,6 @@ struct task_struct {
93213 struct task_cputime cputime_expires;
93214 struct list_head cpu_timers[3];
93215
93216-/* process credentials */
93217- const struct cred __rcu *real_cred; /* objective and real subjective task
93218- * credentials (COW) */
93219- const struct cred __rcu *cred; /* effective (overridable) subjective task
93220- * credentials (COW) */
93221 char comm[TASK_COMM_LEN]; /* executable name excluding path
93222 - access with [gs]et_task_comm (which lock
93223 it with task_lock())
93224@@ -1467,6 +1498,10 @@ struct task_struct {
93225 #endif
93226 /* CPU-specific state of this task */
93227 struct thread_struct thread;
93228+/* thread_info moved to task_struct */
93229+#ifdef CONFIG_X86
93230+ struct thread_info tinfo;
93231+#endif
93232 /* filesystem information */
93233 struct fs_struct *fs;
93234 /* open file information */
93235@@ -1541,6 +1576,10 @@ struct task_struct {
93236 gfp_t lockdep_reclaim_gfp;
93237 #endif
93238
93239+/* process credentials */
93240+ const struct cred __rcu *real_cred; /* objective and real subjective task
93241+ * credentials (COW) */
93242+
93243 /* journalling filesystem info */
93244 void *journal_info;
93245
93246@@ -1579,6 +1618,10 @@ struct task_struct {
93247 /* cg_list protected by css_set_lock and tsk->alloc_lock */
93248 struct list_head cg_list;
93249 #endif
93250+
93251+ const struct cred __rcu *cred; /* effective (overridable) subjective task
93252+ * credentials (COW) */
93253+
93254 #ifdef CONFIG_FUTEX
93255 struct robust_list_head __user *robust_list;
93256 #ifdef CONFIG_COMPAT
93257@@ -1690,7 +1733,7 @@ struct task_struct {
93258 * Number of functions that haven't been traced
93259 * because of depth overrun.
93260 */
93261- atomic_t trace_overrun;
93262+ atomic_unchecked_t trace_overrun;
93263 /* Pause for the tracing */
93264 atomic_t tracing_graph_pause;
93265 #endif
93266@@ -1718,7 +1761,78 @@ struct task_struct {
93267 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
93268 unsigned long task_state_change;
93269 #endif
93270-};
93271+
93272+#ifdef CONFIG_GRKERNSEC
93273+ /* grsecurity */
93274+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93275+ u64 exec_id;
93276+#endif
93277+#ifdef CONFIG_GRKERNSEC_SETXID
93278+ const struct cred *delayed_cred;
93279+#endif
93280+ struct dentry *gr_chroot_dentry;
93281+ struct acl_subject_label *acl;
93282+ struct acl_subject_label *tmpacl;
93283+ struct acl_role_label *role;
93284+ struct file *exec_file;
93285+ unsigned long brute_expires;
93286+ u16 acl_role_id;
93287+ u8 inherited;
93288+ /* is this the task that authenticated to the special role */
93289+ u8 acl_sp_role;
93290+ u8 is_writable;
93291+ u8 brute;
93292+ u8 gr_is_chrooted;
93293+#endif
93294+
93295+} __randomize_layout;
93296+
93297+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
93298+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
93299+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
93300+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
93301+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
93302+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
93303+
93304+#ifdef CONFIG_PAX_SOFTMODE
93305+extern int pax_softmode;
93306+#endif
93307+
93308+extern int pax_check_flags(unsigned long *);
93309+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
93310+
93311+/* if tsk != current then task_lock must be held on it */
93312+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
93313+static inline unsigned long pax_get_flags(struct task_struct *tsk)
93314+{
93315+ if (likely(tsk->mm))
93316+ return tsk->mm->pax_flags;
93317+ else
93318+ return 0UL;
93319+}
93320+
93321+/* if tsk != current then task_lock must be held on it */
93322+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
93323+{
93324+ if (likely(tsk->mm)) {
93325+ tsk->mm->pax_flags = flags;
93326+ return 0;
93327+ }
93328+ return -EINVAL;
93329+}
93330+#endif
93331+
93332+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
93333+extern void pax_set_initial_flags(struct linux_binprm *bprm);
93334+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
93335+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
93336+#endif
93337+
93338+struct path;
93339+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
93340+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
93341+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
93342+extern void pax_report_refcount_overflow(struct pt_regs *regs);
93343
93344 /* Future-safe accessor for struct task_struct's cpus_allowed. */
93345 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
93346@@ -1801,7 +1915,7 @@ struct pid_namespace;
93347 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
93348 struct pid_namespace *ns);
93349
93350-static inline pid_t task_pid_nr(struct task_struct *tsk)
93351+static inline pid_t task_pid_nr(const struct task_struct *tsk)
93352 {
93353 return tsk->pid;
93354 }
93355@@ -2169,6 +2283,25 @@ extern u64 sched_clock_cpu(int cpu);
93356
93357 extern void sched_clock_init(void);
93358
93359+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93360+static inline void populate_stack(void)
93361+{
93362+ struct task_struct *curtask = current;
93363+ int c;
93364+ int *ptr = curtask->stack;
93365+ int *end = curtask->stack + THREAD_SIZE;
93366+
93367+ while (ptr < end) {
93368+ c = *(volatile int *)ptr;
93369+ ptr += PAGE_SIZE/sizeof(int);
93370+ }
93371+}
93372+#else
93373+static inline void populate_stack(void)
93374+{
93375+}
93376+#endif
93377+
93378 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
93379 static inline void sched_clock_tick(void)
93380 {
93381@@ -2302,7 +2435,9 @@ void yield(void);
93382 extern struct exec_domain default_exec_domain;
93383
93384 union thread_union {
93385+#ifndef CONFIG_X86
93386 struct thread_info thread_info;
93387+#endif
93388 unsigned long stack[THREAD_SIZE/sizeof(long)];
93389 };
93390
93391@@ -2335,6 +2470,7 @@ extern struct pid_namespace init_pid_ns;
93392 */
93393
93394 extern struct task_struct *find_task_by_vpid(pid_t nr);
93395+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
93396 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
93397 struct pid_namespace *ns);
93398
93399@@ -2499,7 +2635,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
93400 extern void exit_itimers(struct signal_struct *);
93401 extern void flush_itimer_signals(void);
93402
93403-extern void do_group_exit(int);
93404+extern __noreturn void do_group_exit(int);
93405
93406 extern int do_execve(struct filename *,
93407 const char __user * const __user *,
93408@@ -2720,9 +2856,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
93409 #define task_stack_end_corrupted(task) \
93410 (*(end_of_stack(task)) != STACK_END_MAGIC)
93411
93412-static inline int object_is_on_stack(void *obj)
93413+static inline int object_starts_on_stack(const void *obj)
93414 {
93415- void *stack = task_stack_page(current);
93416+ const void *stack = task_stack_page(current);
93417
93418 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
93419 }
93420diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
93421index 596a0e0..bea77ec 100644
93422--- a/include/linux/sched/sysctl.h
93423+++ b/include/linux/sched/sysctl.h
93424@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
93425 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
93426
93427 extern int sysctl_max_map_count;
93428+extern unsigned long sysctl_heap_stack_gap;
93429
93430 extern unsigned int sysctl_sched_latency;
93431 extern unsigned int sysctl_sched_min_granularity;
93432diff --git a/include/linux/security.h b/include/linux/security.h
93433index a1b7dbd..036f47f 100644
93434--- a/include/linux/security.h
93435+++ b/include/linux/security.h
93436@@ -27,6 +27,7 @@
93437 #include <linux/slab.h>
93438 #include <linux/err.h>
93439 #include <linux/string.h>
93440+#include <linux/grsecurity.h>
93441
93442 struct linux_binprm;
93443 struct cred;
93444@@ -116,8 +117,6 @@ struct seq_file;
93445
93446 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
93447
93448-void reset_security_ops(void);
93449-
93450 #ifdef CONFIG_MMU
93451 extern unsigned long mmap_min_addr;
93452 extern unsigned long dac_mmap_min_addr;
93453@@ -1756,7 +1755,7 @@ struct security_operations {
93454 struct audit_context *actx);
93455 void (*audit_rule_free) (void *lsmrule);
93456 #endif /* CONFIG_AUDIT */
93457-};
93458+} __randomize_layout;
93459
93460 /* prototypes */
93461 extern int security_init(void);
93462diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
93463index dc368b8..e895209 100644
93464--- a/include/linux/semaphore.h
93465+++ b/include/linux/semaphore.h
93466@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
93467 }
93468
93469 extern void down(struct semaphore *sem);
93470-extern int __must_check down_interruptible(struct semaphore *sem);
93471+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
93472 extern int __must_check down_killable(struct semaphore *sem);
93473 extern int __must_check down_trylock(struct semaphore *sem);
93474 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
93475diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
93476index afbb1fd..e1d205d 100644
93477--- a/include/linux/seq_file.h
93478+++ b/include/linux/seq_file.h
93479@@ -27,6 +27,9 @@ struct seq_file {
93480 struct mutex lock;
93481 const struct seq_operations *op;
93482 int poll_event;
93483+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93484+ u64 exec_id;
93485+#endif
93486 #ifdef CONFIG_USER_NS
93487 struct user_namespace *user_ns;
93488 #endif
93489@@ -39,6 +42,7 @@ struct seq_operations {
93490 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
93491 int (*show) (struct seq_file *m, void *v);
93492 };
93493+typedef struct seq_operations __no_const seq_operations_no_const;
93494
93495 #define SEQ_SKIP 1
93496
93497@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
93498
93499 char *mangle_path(char *s, const char *p, const char *esc);
93500 int seq_open(struct file *, const struct seq_operations *);
93501+int seq_open_restrict(struct file *, const struct seq_operations *);
93502 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
93503 loff_t seq_lseek(struct file *, loff_t, int);
93504 int seq_release(struct inode *, struct file *);
93505@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
93506 const struct path *root, const char *esc);
93507
93508 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
93509+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
93510 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
93511 int single_release(struct inode *, struct file *);
93512 void *__seq_open_private(struct file *, const struct seq_operations *, int);
93513diff --git a/include/linux/shm.h b/include/linux/shm.h
93514index 6fb8016..ab4465e 100644
93515--- a/include/linux/shm.h
93516+++ b/include/linux/shm.h
93517@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
93518 /* The task created the shm object. NULL if the task is dead. */
93519 struct task_struct *shm_creator;
93520 struct list_head shm_clist; /* list by creator */
93521+#ifdef CONFIG_GRKERNSEC
93522+ u64 shm_createtime;
93523+ pid_t shm_lapid;
93524+#endif
93525 };
93526
93527 /* shm_mode upper byte flags */
93528diff --git a/include/linux/signal.h b/include/linux/signal.h
93529index ab1e039..ad4229e 100644
93530--- a/include/linux/signal.h
93531+++ b/include/linux/signal.h
93532@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
93533 * know it'll be handled, so that they don't get converted to
93534 * SIGKILL or just silently dropped.
93535 */
93536- kernel_sigaction(sig, (__force __sighandler_t)2);
93537+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
93538 }
93539
93540 static inline void disallow_signal(int sig)
93541diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
93542index bdccc4b..e9f8670 100644
93543--- a/include/linux/skbuff.h
93544+++ b/include/linux/skbuff.h
93545@@ -771,7 +771,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
93546 int node);
93547 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
93548 struct sk_buff *build_skb(void *data, unsigned int frag_size);
93549-static inline struct sk_buff *alloc_skb(unsigned int size,
93550+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
93551 gfp_t priority)
93552 {
93553 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
93554@@ -1967,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
93555 return skb->inner_transport_header - skb->inner_network_header;
93556 }
93557
93558-static inline int skb_network_offset(const struct sk_buff *skb)
93559+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
93560 {
93561 return skb_network_header(skb) - skb->data;
93562 }
93563@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
93564 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
93565 */
93566 #ifndef NET_SKB_PAD
93567-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
93568+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
93569 #endif
93570
93571 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
93572@@ -2669,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
93573 int *err);
93574 unsigned int datagram_poll(struct file *file, struct socket *sock,
93575 struct poll_table_struct *wait);
93576-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93577+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93578 struct iov_iter *to, int size);
93579-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93580+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93581 struct msghdr *msg, int size)
93582 {
93583 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
93584@@ -3193,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
93585 nf_bridge_put(skb->nf_bridge);
93586 skb->nf_bridge = NULL;
93587 #endif
93588+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
93589+ skb->nf_trace = 0;
93590+#endif
93591 }
93592
93593 static inline void nf_reset_trace(struct sk_buff *skb)
93594diff --git a/include/linux/slab.h b/include/linux/slab.h
93595index 76f1fee..d95e6d2 100644
93596--- a/include/linux/slab.h
93597+++ b/include/linux/slab.h
93598@@ -14,15 +14,29 @@
93599 #include <linux/gfp.h>
93600 #include <linux/types.h>
93601 #include <linux/workqueue.h>
93602-
93603+#include <linux/err.h>
93604
93605 /*
93606 * Flags to pass to kmem_cache_create().
93607 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
93608 */
93609 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
93610+
93611+#ifdef CONFIG_PAX_USERCOPY_SLABS
93612+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
93613+#else
93614+#define SLAB_USERCOPY 0x00000000UL
93615+#endif
93616+
93617 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
93618 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
93619+
93620+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93621+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
93622+#else
93623+#define SLAB_NO_SANITIZE 0x00000000UL
93624+#endif
93625+
93626 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
93627 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
93628 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
93629@@ -98,10 +112,13 @@
93630 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
93631 * Both make kfree a no-op.
93632 */
93633-#define ZERO_SIZE_PTR ((void *)16)
93634+#define ZERO_SIZE_PTR \
93635+({ \
93636+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
93637+ (void *)(-MAX_ERRNO-1L); \
93638+})
93639
93640-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
93641- (unsigned long)ZERO_SIZE_PTR)
93642+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
93643
93644 #include <linux/kmemleak.h>
93645 #include <linux/kasan.h>
93646@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
93647 void kfree(const void *);
93648 void kzfree(const void *);
93649 size_t ksize(const void *);
93650+const char *check_heap_object(const void *ptr, unsigned long n);
93651+bool is_usercopy_object(const void *ptr);
93652
93653 /*
93654 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
93655@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
93656 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93657 #endif
93658
93659+#ifdef CONFIG_PAX_USERCOPY_SLABS
93660+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
93661+#endif
93662+
93663 /*
93664 * Figure out which kmalloc slab an allocation of a certain size
93665 * belongs to.
93666@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93667 * 2 = 120 .. 192 bytes
93668 * n = 2^(n-1) .. 2^n -1
93669 */
93670-static __always_inline int kmalloc_index(size_t size)
93671+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
93672 {
93673 if (!size)
93674 return 0;
93675@@ -286,15 +309,15 @@ static __always_inline int kmalloc_index(size_t size)
93676 }
93677 #endif /* !CONFIG_SLOB */
93678
93679-void *__kmalloc(size_t size, gfp_t flags);
93680+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
93681 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
93682 void kmem_cache_free(struct kmem_cache *, void *);
93683
93684 #ifdef CONFIG_NUMA
93685-void *__kmalloc_node(size_t size, gfp_t flags, int node);
93686+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
93687 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
93688 #else
93689-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
93690+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
93691 {
93692 return __kmalloc(size, flags);
93693 }
93694diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
93695index 33d0490..70a6313 100644
93696--- a/include/linux/slab_def.h
93697+++ b/include/linux/slab_def.h
93698@@ -40,7 +40,7 @@ struct kmem_cache {
93699 /* 4) cache creation/removal */
93700 const char *name;
93701 struct list_head list;
93702- int refcount;
93703+ atomic_t refcount;
93704 int object_size;
93705 int align;
93706
93707@@ -56,10 +56,14 @@ struct kmem_cache {
93708 unsigned long node_allocs;
93709 unsigned long node_frees;
93710 unsigned long node_overflow;
93711- atomic_t allochit;
93712- atomic_t allocmiss;
93713- atomic_t freehit;
93714- atomic_t freemiss;
93715+ atomic_unchecked_t allochit;
93716+ atomic_unchecked_t allocmiss;
93717+ atomic_unchecked_t freehit;
93718+ atomic_unchecked_t freemiss;
93719+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93720+ atomic_unchecked_t sanitized;
93721+ atomic_unchecked_t not_sanitized;
93722+#endif
93723
93724 /*
93725 * If debugging is enabled, then the allocator can add additional
93726diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
93727index 3388511..6252f90 100644
93728--- a/include/linux/slub_def.h
93729+++ b/include/linux/slub_def.h
93730@@ -74,7 +74,7 @@ struct kmem_cache {
93731 struct kmem_cache_order_objects max;
93732 struct kmem_cache_order_objects min;
93733 gfp_t allocflags; /* gfp flags to use on each alloc */
93734- int refcount; /* Refcount for slab cache destroy */
93735+ atomic_t refcount; /* Refcount for slab cache destroy */
93736 void (*ctor)(void *);
93737 int inuse; /* Offset to metadata */
93738 int align; /* Alignment */
93739diff --git a/include/linux/smp.h b/include/linux/smp.h
93740index be91db2..3f23232 100644
93741--- a/include/linux/smp.h
93742+++ b/include/linux/smp.h
93743@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
93744 #endif
93745
93746 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
93747+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
93748 #define put_cpu() preempt_enable()
93749+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
93750
93751 /*
93752 * Callback to arch code if there's nosmp or maxcpus=0 on the
93753diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
93754index 46cca4c..3323536 100644
93755--- a/include/linux/sock_diag.h
93756+++ b/include/linux/sock_diag.h
93757@@ -11,7 +11,7 @@ struct sock;
93758 struct sock_diag_handler {
93759 __u8 family;
93760 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
93761-};
93762+} __do_const;
93763
93764 int sock_diag_register(const struct sock_diag_handler *h);
93765 void sock_diag_unregister(const struct sock_diag_handler *h);
93766diff --git a/include/linux/sonet.h b/include/linux/sonet.h
93767index 680f9a3..f13aeb0 100644
93768--- a/include/linux/sonet.h
93769+++ b/include/linux/sonet.h
93770@@ -7,7 +7,7 @@
93771 #include <uapi/linux/sonet.h>
93772
93773 struct k_sonet_stats {
93774-#define __HANDLE_ITEM(i) atomic_t i
93775+#define __HANDLE_ITEM(i) atomic_unchecked_t i
93776 __SONET_ITEMS
93777 #undef __HANDLE_ITEM
93778 };
93779diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
93780index 07d8e53..dc934c9 100644
93781--- a/include/linux/sunrpc/addr.h
93782+++ b/include/linux/sunrpc/addr.h
93783@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
93784 {
93785 switch (sap->sa_family) {
93786 case AF_INET:
93787- return ntohs(((struct sockaddr_in *)sap)->sin_port);
93788+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
93789 case AF_INET6:
93790- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
93791+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
93792 }
93793 return 0;
93794 }
93795@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
93796 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
93797 const struct sockaddr *src)
93798 {
93799- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
93800+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
93801 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
93802
93803 dsin->sin_family = ssin->sin_family;
93804@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
93805 if (sa->sa_family != AF_INET6)
93806 return 0;
93807
93808- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
93809+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
93810 }
93811
93812 #endif /* _LINUX_SUNRPC_ADDR_H */
93813diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
93814index 598ba80..d90cba6 100644
93815--- a/include/linux/sunrpc/clnt.h
93816+++ b/include/linux/sunrpc/clnt.h
93817@@ -100,7 +100,7 @@ struct rpc_procinfo {
93818 unsigned int p_timer; /* Which RTT timer to use */
93819 u32 p_statidx; /* Which procedure to account */
93820 const char * p_name; /* name of procedure */
93821-};
93822+} __do_const;
93823
93824 #ifdef __KERNEL__
93825
93826diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
93827index fae6fb9..023fbcd 100644
93828--- a/include/linux/sunrpc/svc.h
93829+++ b/include/linux/sunrpc/svc.h
93830@@ -420,7 +420,7 @@ struct svc_procedure {
93831 unsigned int pc_count; /* call count */
93832 unsigned int pc_cachetype; /* cache info (NFS) */
93833 unsigned int pc_xdrressize; /* maximum size of XDR reply */
93834-};
93835+} __do_const;
93836
93837 /*
93838 * Function prototypes.
93839diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
93840index df8edf8..d140fec 100644
93841--- a/include/linux/sunrpc/svc_rdma.h
93842+++ b/include/linux/sunrpc/svc_rdma.h
93843@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
93844 extern unsigned int svcrdma_max_requests;
93845 extern unsigned int svcrdma_max_req_size;
93846
93847-extern atomic_t rdma_stat_recv;
93848-extern atomic_t rdma_stat_read;
93849-extern atomic_t rdma_stat_write;
93850-extern atomic_t rdma_stat_sq_starve;
93851-extern atomic_t rdma_stat_rq_starve;
93852-extern atomic_t rdma_stat_rq_poll;
93853-extern atomic_t rdma_stat_rq_prod;
93854-extern atomic_t rdma_stat_sq_poll;
93855-extern atomic_t rdma_stat_sq_prod;
93856+extern atomic_unchecked_t rdma_stat_recv;
93857+extern atomic_unchecked_t rdma_stat_read;
93858+extern atomic_unchecked_t rdma_stat_write;
93859+extern atomic_unchecked_t rdma_stat_sq_starve;
93860+extern atomic_unchecked_t rdma_stat_rq_starve;
93861+extern atomic_unchecked_t rdma_stat_rq_poll;
93862+extern atomic_unchecked_t rdma_stat_rq_prod;
93863+extern atomic_unchecked_t rdma_stat_sq_poll;
93864+extern atomic_unchecked_t rdma_stat_sq_prod;
93865
93866 /*
93867 * Contexts are built when an RDMA request is created and are a
93868diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
93869index 8d71d65..f79586e 100644
93870--- a/include/linux/sunrpc/svcauth.h
93871+++ b/include/linux/sunrpc/svcauth.h
93872@@ -120,7 +120,7 @@ struct auth_ops {
93873 int (*release)(struct svc_rqst *rq);
93874 void (*domain_release)(struct auth_domain *);
93875 int (*set_client)(struct svc_rqst *rq);
93876-};
93877+} __do_const;
93878
93879 #define SVC_GARBAGE 1
93880 #define SVC_SYSERR 2
93881diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
93882index e7a018e..49f8b17 100644
93883--- a/include/linux/swiotlb.h
93884+++ b/include/linux/swiotlb.h
93885@@ -60,7 +60,8 @@ extern void
93886
93887 extern void
93888 swiotlb_free_coherent(struct device *hwdev, size_t size,
93889- void *vaddr, dma_addr_t dma_handle);
93890+ void *vaddr, dma_addr_t dma_handle,
93891+ struct dma_attrs *attrs);
93892
93893 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
93894 unsigned long offset, size_t size,
93895diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
93896index 76d1e38..200776e 100644
93897--- a/include/linux/syscalls.h
93898+++ b/include/linux/syscalls.h
93899@@ -102,7 +102,12 @@ union bpf_attr;
93900 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
93901 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
93902 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
93903-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
93904+#define __SC_LONG(t, a) __typeof__( \
93905+ __builtin_choose_expr( \
93906+ sizeof(t) > sizeof(int), \
93907+ (t) 0, \
93908+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
93909+ )) a
93910 #define __SC_CAST(t, a) (t) a
93911 #define __SC_ARGS(t, a) a
93912 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
93913@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
93914 asmlinkage long sys_fsync(unsigned int fd);
93915 asmlinkage long sys_fdatasync(unsigned int fd);
93916 asmlinkage long sys_bdflush(int func, long data);
93917-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
93918- char __user *type, unsigned long flags,
93919+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
93920+ const char __user *type, unsigned long flags,
93921 void __user *data);
93922-asmlinkage long sys_umount(char __user *name, int flags);
93923-asmlinkage long sys_oldumount(char __user *name);
93924+asmlinkage long sys_umount(const char __user *name, int flags);
93925+asmlinkage long sys_oldumount(const char __user *name);
93926 asmlinkage long sys_truncate(const char __user *path, long length);
93927 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
93928 asmlinkage long sys_stat(const char __user *filename,
93929@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
93930 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
93931 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
93932 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
93933- struct sockaddr __user *, int);
93934+ struct sockaddr __user *, int) __intentional_overflow(0);
93935 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
93936 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
93937 unsigned int vlen, unsigned flags);
93938@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
93939
93940 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
93941 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
93942- unsigned nsops);
93943+ long nsops);
93944 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
93945 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
93946- unsigned nsops,
93947+ long nsops,
93948 const struct timespec __user *timeout);
93949 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
93950 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
93951diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
93952index 27b3b0b..e093dd9 100644
93953--- a/include/linux/syscore_ops.h
93954+++ b/include/linux/syscore_ops.h
93955@@ -16,7 +16,7 @@ struct syscore_ops {
93956 int (*suspend)(void);
93957 void (*resume)(void);
93958 void (*shutdown)(void);
93959-};
93960+} __do_const;
93961
93962 extern void register_syscore_ops(struct syscore_ops *ops);
93963 extern void unregister_syscore_ops(struct syscore_ops *ops);
93964diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
93965index b7361f8..341a15a 100644
93966--- a/include/linux/sysctl.h
93967+++ b/include/linux/sysctl.h
93968@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
93969
93970 extern int proc_dostring(struct ctl_table *, int,
93971 void __user *, size_t *, loff_t *);
93972+extern int proc_dostring_modpriv(struct ctl_table *, int,
93973+ void __user *, size_t *, loff_t *);
93974 extern int proc_dointvec(struct ctl_table *, int,
93975 void __user *, size_t *, loff_t *);
93976 extern int proc_dointvec_minmax(struct ctl_table *, int,
93977@@ -113,7 +115,8 @@ struct ctl_table
93978 struct ctl_table_poll *poll;
93979 void *extra1;
93980 void *extra2;
93981-};
93982+} __do_const __randomize_layout;
93983+typedef struct ctl_table __no_const ctl_table_no_const;
93984
93985 struct ctl_node {
93986 struct rb_node node;
93987diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
93988index ddad161..a3efd26 100644
93989--- a/include/linux/sysfs.h
93990+++ b/include/linux/sysfs.h
93991@@ -34,7 +34,8 @@ struct attribute {
93992 struct lock_class_key *key;
93993 struct lock_class_key skey;
93994 #endif
93995-};
93996+} __do_const;
93997+typedef struct attribute __no_const attribute_no_const;
93998
93999 /**
94000 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
94001@@ -63,7 +64,8 @@ struct attribute_group {
94002 struct attribute *, int);
94003 struct attribute **attrs;
94004 struct bin_attribute **bin_attrs;
94005-};
94006+} __do_const;
94007+typedef struct attribute_group __no_const attribute_group_no_const;
94008
94009 /**
94010 * Use these macros to make defining attributes easier. See include/linux/device.h
94011@@ -137,7 +139,8 @@ struct bin_attribute {
94012 char *, loff_t, size_t);
94013 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
94014 struct vm_area_struct *vma);
94015-};
94016+} __do_const;
94017+typedef struct bin_attribute __no_const bin_attribute_no_const;
94018
94019 /**
94020 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
94021diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
94022index 387fa7d..3fcde6b 100644
94023--- a/include/linux/sysrq.h
94024+++ b/include/linux/sysrq.h
94025@@ -16,6 +16,7 @@
94026
94027 #include <linux/errno.h>
94028 #include <linux/types.h>
94029+#include <linux/compiler.h>
94030
94031 /* Possible values of bitmask for enabling sysrq functions */
94032 /* 0x0001 is reserved for enable everything */
94033@@ -33,7 +34,7 @@ struct sysrq_key_op {
94034 char *help_msg;
94035 char *action_msg;
94036 int enable_mask;
94037-};
94038+} __do_const;
94039
94040 #ifdef CONFIG_MAGIC_SYSRQ
94041
94042diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
94043index ff307b5..f1a4468 100644
94044--- a/include/linux/thread_info.h
94045+++ b/include/linux/thread_info.h
94046@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
94047 #error "no set_restore_sigmask() provided and default one won't work"
94048 #endif
94049
94050+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
94051+
94052+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
94053+{
94054+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
94055+}
94056+
94057 #endif /* __KERNEL__ */
94058
94059 #endif /* _LINUX_THREAD_INFO_H */
94060diff --git a/include/linux/tty.h b/include/linux/tty.h
94061index 790752a..36d9b54 100644
94062--- a/include/linux/tty.h
94063+++ b/include/linux/tty.h
94064@@ -225,7 +225,7 @@ struct tty_port {
94065 const struct tty_port_operations *ops; /* Port operations */
94066 spinlock_t lock; /* Lock protecting tty field */
94067 int blocked_open; /* Waiting to open */
94068- int count; /* Usage count */
94069+ atomic_t count; /* Usage count */
94070 wait_queue_head_t open_wait; /* Open waiters */
94071 wait_queue_head_t close_wait; /* Close waiters */
94072 wait_queue_head_t delta_msr_wait; /* Modem status change */
94073@@ -313,7 +313,7 @@ struct tty_struct {
94074 /* If the tty has a pending do_SAK, queue it here - akpm */
94075 struct work_struct SAK_work;
94076 struct tty_port *port;
94077-};
94078+} __randomize_layout;
94079
94080 /* Each of a tty's open files has private_data pointing to tty_file_private */
94081 struct tty_file_private {
94082@@ -572,7 +572,7 @@ extern int tty_port_open(struct tty_port *port,
94083 struct tty_struct *tty, struct file *filp);
94084 static inline int tty_port_users(struct tty_port *port)
94085 {
94086- return port->count + port->blocked_open;
94087+ return atomic_read(&port->count) + port->blocked_open;
94088 }
94089
94090 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
94091diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
94092index 92e337c..f46757b 100644
94093--- a/include/linux/tty_driver.h
94094+++ b/include/linux/tty_driver.h
94095@@ -291,7 +291,7 @@ struct tty_operations {
94096 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
94097 #endif
94098 const struct file_operations *proc_fops;
94099-};
94100+} __do_const __randomize_layout;
94101
94102 struct tty_driver {
94103 int magic; /* magic number for this structure */
94104@@ -325,7 +325,7 @@ struct tty_driver {
94105
94106 const struct tty_operations *ops;
94107 struct list_head tty_drivers;
94108-};
94109+} __randomize_layout;
94110
94111 extern struct list_head tty_drivers;
94112
94113diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
94114index 00c9d68..bc0188b 100644
94115--- a/include/linux/tty_ldisc.h
94116+++ b/include/linux/tty_ldisc.h
94117@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
94118
94119 struct module *owner;
94120
94121- int refcount;
94122+ atomic_t refcount;
94123 };
94124
94125 struct tty_ldisc {
94126diff --git a/include/linux/types.h b/include/linux/types.h
94127index 6747247..fc7ec8b 100644
94128--- a/include/linux/types.h
94129+++ b/include/linux/types.h
94130@@ -174,10 +174,26 @@ typedef struct {
94131 int counter;
94132 } atomic_t;
94133
94134+#ifdef CONFIG_PAX_REFCOUNT
94135+typedef struct {
94136+ int counter;
94137+} atomic_unchecked_t;
94138+#else
94139+typedef atomic_t atomic_unchecked_t;
94140+#endif
94141+
94142 #ifdef CONFIG_64BIT
94143 typedef struct {
94144 long counter;
94145 } atomic64_t;
94146+
94147+#ifdef CONFIG_PAX_REFCOUNT
94148+typedef struct {
94149+ long counter;
94150+} atomic64_unchecked_t;
94151+#else
94152+typedef atomic64_t atomic64_unchecked_t;
94153+#endif
94154 #endif
94155
94156 struct list_head {
94157diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
94158index ecd3319..8a36ded 100644
94159--- a/include/linux/uaccess.h
94160+++ b/include/linux/uaccess.h
94161@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
94162 long ret; \
94163 mm_segment_t old_fs = get_fs(); \
94164 \
94165- set_fs(KERNEL_DS); \
94166 pagefault_disable(); \
94167- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
94168- pagefault_enable(); \
94169+ set_fs(KERNEL_DS); \
94170+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
94171 set_fs(old_fs); \
94172+ pagefault_enable(); \
94173 ret; \
94174 })
94175
94176diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
94177index 2d1f9b6..d7a9fce 100644
94178--- a/include/linux/uidgid.h
94179+++ b/include/linux/uidgid.h
94180@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
94181
94182 #endif /* CONFIG_USER_NS */
94183
94184+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
94185+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
94186+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
94187+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
94188+
94189 #endif /* _LINUX_UIDGID_H */
94190diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
94191index 32c0e83..671eb35 100644
94192--- a/include/linux/uio_driver.h
94193+++ b/include/linux/uio_driver.h
94194@@ -67,7 +67,7 @@ struct uio_device {
94195 struct module *owner;
94196 struct device *dev;
94197 int minor;
94198- atomic_t event;
94199+ atomic_unchecked_t event;
94200 struct fasync_struct *async_queue;
94201 wait_queue_head_t wait;
94202 struct uio_info *info;
94203diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
94204index 99c1b4d..562e6f3 100644
94205--- a/include/linux/unaligned/access_ok.h
94206+++ b/include/linux/unaligned/access_ok.h
94207@@ -4,34 +4,34 @@
94208 #include <linux/kernel.h>
94209 #include <asm/byteorder.h>
94210
94211-static inline u16 get_unaligned_le16(const void *p)
94212+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
94213 {
94214- return le16_to_cpup((__le16 *)p);
94215+ return le16_to_cpup((const __le16 *)p);
94216 }
94217
94218-static inline u32 get_unaligned_le32(const void *p)
94219+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
94220 {
94221- return le32_to_cpup((__le32 *)p);
94222+ return le32_to_cpup((const __le32 *)p);
94223 }
94224
94225-static inline u64 get_unaligned_le64(const void *p)
94226+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
94227 {
94228- return le64_to_cpup((__le64 *)p);
94229+ return le64_to_cpup((const __le64 *)p);
94230 }
94231
94232-static inline u16 get_unaligned_be16(const void *p)
94233+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
94234 {
94235- return be16_to_cpup((__be16 *)p);
94236+ return be16_to_cpup((const __be16 *)p);
94237 }
94238
94239-static inline u32 get_unaligned_be32(const void *p)
94240+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
94241 {
94242- return be32_to_cpup((__be32 *)p);
94243+ return be32_to_cpup((const __be32 *)p);
94244 }
94245
94246-static inline u64 get_unaligned_be64(const void *p)
94247+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
94248 {
94249- return be64_to_cpup((__be64 *)p);
94250+ return be64_to_cpup((const __be64 *)p);
94251 }
94252
94253 static inline void put_unaligned_le16(u16 val, void *p)
94254diff --git a/include/linux/usb.h b/include/linux/usb.h
94255index 447fe29..9fc875f 100644
94256--- a/include/linux/usb.h
94257+++ b/include/linux/usb.h
94258@@ -592,7 +592,7 @@ struct usb_device {
94259 int maxchild;
94260
94261 u32 quirks;
94262- atomic_t urbnum;
94263+ atomic_unchecked_t urbnum;
94264
94265 unsigned long active_duration;
94266
94267@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
94268
94269 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
94270 __u8 request, __u8 requesttype, __u16 value, __u16 index,
94271- void *data, __u16 size, int timeout);
94272+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
94273 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
94274 void *data, int len, int *actual_length, int timeout);
94275 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
94276diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
94277index 9fd9e48..e2c5f35 100644
94278--- a/include/linux/usb/renesas_usbhs.h
94279+++ b/include/linux/usb/renesas_usbhs.h
94280@@ -39,7 +39,7 @@ enum {
94281 */
94282 struct renesas_usbhs_driver_callback {
94283 int (*notify_hotplug)(struct platform_device *pdev);
94284-};
94285+} __no_const;
94286
94287 /*
94288 * callback functions for platform
94289diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
94290index 8297e5b..0dfae27 100644
94291--- a/include/linux/user_namespace.h
94292+++ b/include/linux/user_namespace.h
94293@@ -39,7 +39,7 @@ struct user_namespace {
94294 struct key *persistent_keyring_register;
94295 struct rw_semaphore persistent_keyring_register_sem;
94296 #endif
94297-};
94298+} __randomize_layout;
94299
94300 extern struct user_namespace init_user_ns;
94301
94302diff --git a/include/linux/utsname.h b/include/linux/utsname.h
94303index 5093f58..c103e58 100644
94304--- a/include/linux/utsname.h
94305+++ b/include/linux/utsname.h
94306@@ -25,7 +25,7 @@ struct uts_namespace {
94307 struct new_utsname name;
94308 struct user_namespace *user_ns;
94309 struct ns_common ns;
94310-};
94311+} __randomize_layout;
94312 extern struct uts_namespace init_uts_ns;
94313
94314 #ifdef CONFIG_UTS_NS
94315diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
94316index 6f8fbcf..4efc177 100644
94317--- a/include/linux/vermagic.h
94318+++ b/include/linux/vermagic.h
94319@@ -25,9 +25,42 @@
94320 #define MODULE_ARCH_VERMAGIC ""
94321 #endif
94322
94323+#ifdef CONFIG_PAX_REFCOUNT
94324+#define MODULE_PAX_REFCOUNT "REFCOUNT "
94325+#else
94326+#define MODULE_PAX_REFCOUNT ""
94327+#endif
94328+
94329+#ifdef CONSTIFY_PLUGIN
94330+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
94331+#else
94332+#define MODULE_CONSTIFY_PLUGIN ""
94333+#endif
94334+
94335+#ifdef STACKLEAK_PLUGIN
94336+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
94337+#else
94338+#define MODULE_STACKLEAK_PLUGIN ""
94339+#endif
94340+
94341+#ifdef RANDSTRUCT_PLUGIN
94342+#include <generated/randomize_layout_hash.h>
94343+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
94344+#else
94345+#define MODULE_RANDSTRUCT_PLUGIN
94346+#endif
94347+
94348+#ifdef CONFIG_GRKERNSEC
94349+#define MODULE_GRSEC "GRSEC "
94350+#else
94351+#define MODULE_GRSEC ""
94352+#endif
94353+
94354 #define VERMAGIC_STRING \
94355 UTS_RELEASE " " \
94356 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
94357 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
94358- MODULE_ARCH_VERMAGIC
94359+ MODULE_ARCH_VERMAGIC \
94360+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
94361+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
94362
94363diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
94364index b483abd..af305ad 100644
94365--- a/include/linux/vga_switcheroo.h
94366+++ b/include/linux/vga_switcheroo.h
94367@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
94368
94369 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
94370
94371-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
94372+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
94373 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
94374-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
94375+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
94376 #else
94377
94378 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
94379@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
94380
94381 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
94382
94383-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94384+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94385 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
94386-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94387+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94388
94389 #endif
94390 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
94391diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
94392index 0ec5983..cc61051 100644
94393--- a/include/linux/vmalloc.h
94394+++ b/include/linux/vmalloc.h
94395@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
94396 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
94397 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
94398 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
94399+
94400+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
94401+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
94402+#endif
94403+
94404 /* bits [20..32] reserved for arch specific ioremap internals */
94405
94406 /*
94407@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
94408 unsigned long flags, pgprot_t prot);
94409 extern void vunmap(const void *addr);
94410
94411+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
94412+extern void unmap_process_stacks(struct task_struct *task);
94413+#endif
94414+
94415 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
94416 unsigned long uaddr, void *kaddr,
94417 unsigned long size);
94418@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
94419
94420 /* for /dev/kmem */
94421 extern long vread(char *buf, char *addr, unsigned long count);
94422-extern long vwrite(char *buf, char *addr, unsigned long count);
94423+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
94424
94425 /*
94426 * Internals. Dont't use..
94427diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
94428index 82e7db7..f8ce3d0 100644
94429--- a/include/linux/vmstat.h
94430+++ b/include/linux/vmstat.h
94431@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
94432 /*
94433 * Zone based page accounting with per cpu differentials.
94434 */
94435-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94436+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94437
94438 static inline void zone_page_state_add(long x, struct zone *zone,
94439 enum zone_stat_item item)
94440 {
94441- atomic_long_add(x, &zone->vm_stat[item]);
94442- atomic_long_add(x, &vm_stat[item]);
94443+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
94444+ atomic_long_add_unchecked(x, &vm_stat[item]);
94445 }
94446
94447-static inline unsigned long global_page_state(enum zone_stat_item item)
94448+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
94449 {
94450- long x = atomic_long_read(&vm_stat[item]);
94451+ long x = atomic_long_read_unchecked(&vm_stat[item]);
94452 #ifdef CONFIG_SMP
94453 if (x < 0)
94454 x = 0;
94455@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
94456 return x;
94457 }
94458
94459-static inline unsigned long zone_page_state(struct zone *zone,
94460+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
94461 enum zone_stat_item item)
94462 {
94463- long x = atomic_long_read(&zone->vm_stat[item]);
94464+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94465 #ifdef CONFIG_SMP
94466 if (x < 0)
94467 x = 0;
94468@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
94469 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
94470 enum zone_stat_item item)
94471 {
94472- long x = atomic_long_read(&zone->vm_stat[item]);
94473+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94474
94475 #ifdef CONFIG_SMP
94476 int cpu;
94477@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
94478
94479 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
94480 {
94481- atomic_long_inc(&zone->vm_stat[item]);
94482- atomic_long_inc(&vm_stat[item]);
94483+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
94484+ atomic_long_inc_unchecked(&vm_stat[item]);
94485 }
94486
94487 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
94488 {
94489- atomic_long_dec(&zone->vm_stat[item]);
94490- atomic_long_dec(&vm_stat[item]);
94491+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
94492+ atomic_long_dec_unchecked(&vm_stat[item]);
94493 }
94494
94495 static inline void __inc_zone_page_state(struct page *page,
94496diff --git a/include/linux/xattr.h b/include/linux/xattr.h
94497index 91b0a68..0e9adf6 100644
94498--- a/include/linux/xattr.h
94499+++ b/include/linux/xattr.h
94500@@ -28,7 +28,7 @@ struct xattr_handler {
94501 size_t size, int handler_flags);
94502 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
94503 size_t size, int flags, int handler_flags);
94504-};
94505+} __do_const;
94506
94507 struct xattr {
94508 const char *name;
94509@@ -37,6 +37,9 @@ struct xattr {
94510 };
94511
94512 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
94513+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
94514+ssize_t pax_getxattr(struct dentry *, void *, size_t);
94515+#endif
94516 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
94517 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
94518 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
94519diff --git a/include/linux/zlib.h b/include/linux/zlib.h
94520index 92dbbd3..13ab0b3 100644
94521--- a/include/linux/zlib.h
94522+++ b/include/linux/zlib.h
94523@@ -31,6 +31,7 @@
94524 #define _ZLIB_H
94525
94526 #include <linux/zconf.h>
94527+#include <linux/compiler.h>
94528
94529 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
94530 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
94531@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
94532
94533 /* basic functions */
94534
94535-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
94536+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
94537 /*
94538 Returns the number of bytes that needs to be allocated for a per-
94539 stream workspace with the specified parameters. A pointer to this
94540diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
94541index 3e4fddf..5ec9104 100644
94542--- a/include/media/v4l2-dev.h
94543+++ b/include/media/v4l2-dev.h
94544@@ -75,7 +75,7 @@ struct v4l2_file_operations {
94545 int (*mmap) (struct file *, struct vm_area_struct *);
94546 int (*open) (struct file *);
94547 int (*release) (struct file *);
94548-};
94549+} __do_const;
94550
94551 /*
94552 * Newer version of video_device, handled by videodev2.c
94553diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
94554index ffb69da..040393e 100644
94555--- a/include/media/v4l2-device.h
94556+++ b/include/media/v4l2-device.h
94557@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
94558 this function returns 0. If the name ends with a digit (e.g. cx18),
94559 then the name will be set to cx18-0 since cx180 looks really odd. */
94560 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
94561- atomic_t *instance);
94562+ atomic_unchecked_t *instance);
94563
94564 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
94565 Since the parent disappears this ensures that v4l2_dev doesn't have an
94566diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
94567index 2a25dec..bf6dd8a 100644
94568--- a/include/net/9p/transport.h
94569+++ b/include/net/9p/transport.h
94570@@ -62,7 +62,7 @@ struct p9_trans_module {
94571 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
94572 int (*zc_request)(struct p9_client *, struct p9_req_t *,
94573 char *, char *, int , int, int, int);
94574-};
94575+} __do_const;
94576
94577 void v9fs_register_trans(struct p9_trans_module *m);
94578 void v9fs_unregister_trans(struct p9_trans_module *m);
94579diff --git a/include/net/af_unix.h b/include/net/af_unix.h
94580index a175ba4..196eb8242 100644
94581--- a/include/net/af_unix.h
94582+++ b/include/net/af_unix.h
94583@@ -36,7 +36,7 @@ struct unix_skb_parms {
94584 u32 secid; /* Security ID */
94585 #endif
94586 u32 consumed;
94587-};
94588+} __randomize_layout;
94589
94590 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
94591 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
94592diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
94593index 2239a37..a83461f 100644
94594--- a/include/net/bluetooth/l2cap.h
94595+++ b/include/net/bluetooth/l2cap.h
94596@@ -609,7 +609,7 @@ struct l2cap_ops {
94597 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
94598 unsigned long hdr_len,
94599 unsigned long len, int nb);
94600-};
94601+} __do_const;
94602
94603 struct l2cap_conn {
94604 struct hci_conn *hcon;
94605diff --git a/include/net/bonding.h b/include/net/bonding.h
94606index fda6fee..dbdf83c 100644
94607--- a/include/net/bonding.h
94608+++ b/include/net/bonding.h
94609@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
94610
94611 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
94612 {
94613- atomic_long_inc(&dev->tx_dropped);
94614+ atomic_long_inc_unchecked(&dev->tx_dropped);
94615 dev_kfree_skb_any(skb);
94616 }
94617
94618diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
94619index f2ae33d..c457cf0 100644
94620--- a/include/net/caif/cfctrl.h
94621+++ b/include/net/caif/cfctrl.h
94622@@ -52,7 +52,7 @@ struct cfctrl_rsp {
94623 void (*radioset_rsp)(void);
94624 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
94625 struct cflayer *client_layer);
94626-};
94627+} __no_const;
94628
94629 /* Link Setup Parameters for CAIF-Links. */
94630 struct cfctrl_link_param {
94631@@ -101,8 +101,8 @@ struct cfctrl_request_info {
94632 struct cfctrl {
94633 struct cfsrvl serv;
94634 struct cfctrl_rsp res;
94635- atomic_t req_seq_no;
94636- atomic_t rsp_seq_no;
94637+ atomic_unchecked_t req_seq_no;
94638+ atomic_unchecked_t rsp_seq_no;
94639 struct list_head list;
94640 /* Protects from simultaneous access to first_req list */
94641 spinlock_t info_list_lock;
94642diff --git a/include/net/flow.h b/include/net/flow.h
94643index 8109a15..504466d 100644
94644--- a/include/net/flow.h
94645+++ b/include/net/flow.h
94646@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
94647
94648 void flow_cache_flush(struct net *net);
94649 void flow_cache_flush_deferred(struct net *net);
94650-extern atomic_t flow_cache_genid;
94651+extern atomic_unchecked_t flow_cache_genid;
94652
94653 #endif
94654diff --git a/include/net/genetlink.h b/include/net/genetlink.h
94655index 0574abd..0f16881 100644
94656--- a/include/net/genetlink.h
94657+++ b/include/net/genetlink.h
94658@@ -130,7 +130,7 @@ struct genl_ops {
94659 u8 cmd;
94660 u8 internal_flags;
94661 u8 flags;
94662-};
94663+} __do_const;
94664
94665 int __genl_register_family(struct genl_family *family);
94666
94667diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
94668index 0f712c0..cd762c4 100644
94669--- a/include/net/gro_cells.h
94670+++ b/include/net/gro_cells.h
94671@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
94672 cell = this_cpu_ptr(gcells->cells);
94673
94674 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
94675- atomic_long_inc(&dev->rx_dropped);
94676+ atomic_long_inc_unchecked(&dev->rx_dropped);
94677 kfree_skb(skb);
94678 return;
94679 }
94680diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
94681index 5976bde..3a81660 100644
94682--- a/include/net/inet_connection_sock.h
94683+++ b/include/net/inet_connection_sock.h
94684@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
94685 int (*bind_conflict)(const struct sock *sk,
94686 const struct inet_bind_bucket *tb, bool relax);
94687 void (*mtu_reduced)(struct sock *sk);
94688-};
94689+} __do_const;
94690
94691 /** inet_connection_sock - INET connection oriented sock
94692 *
94693diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
94694index 80479ab..0c3f647 100644
94695--- a/include/net/inetpeer.h
94696+++ b/include/net/inetpeer.h
94697@@ -47,7 +47,7 @@ struct inet_peer {
94698 */
94699 union {
94700 struct {
94701- atomic_t rid; /* Frag reception counter */
94702+ atomic_unchecked_t rid; /* Frag reception counter */
94703 };
94704 struct rcu_head rcu;
94705 struct inet_peer *gc_next;
94706diff --git a/include/net/ip.h b/include/net/ip.h
94707index 6cc1eaf..14059b0 100644
94708--- a/include/net/ip.h
94709+++ b/include/net/ip.h
94710@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
94711 }
94712 }
94713
94714-u32 ip_idents_reserve(u32 hash, int segs);
94715+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
94716 void __ip_select_ident(struct iphdr *iph, int segs);
94717
94718 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
94719diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
94720index 5bd120e4..03fb812 100644
94721--- a/include/net/ip_fib.h
94722+++ b/include/net/ip_fib.h
94723@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
94724
94725 #define FIB_RES_SADDR(net, res) \
94726 ((FIB_RES_NH(res).nh_saddr_genid == \
94727- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
94728+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
94729 FIB_RES_NH(res).nh_saddr : \
94730 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
94731 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
94732diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
94733index 615b20b..fd4cbd8 100644
94734--- a/include/net/ip_vs.h
94735+++ b/include/net/ip_vs.h
94736@@ -534,7 +534,7 @@ struct ip_vs_conn {
94737 struct ip_vs_conn *control; /* Master control connection */
94738 atomic_t n_control; /* Number of controlled ones */
94739 struct ip_vs_dest *dest; /* real server */
94740- atomic_t in_pkts; /* incoming packet counter */
94741+ atomic_unchecked_t in_pkts; /* incoming packet counter */
94742
94743 /* Packet transmitter for different forwarding methods. If it
94744 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
94745@@ -682,7 +682,7 @@ struct ip_vs_dest {
94746 __be16 port; /* port number of the server */
94747 union nf_inet_addr addr; /* IP address of the server */
94748 volatile unsigned int flags; /* dest status flags */
94749- atomic_t conn_flags; /* flags to copy to conn */
94750+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
94751 atomic_t weight; /* server weight */
94752
94753 atomic_t refcnt; /* reference counter */
94754@@ -928,11 +928,11 @@ struct netns_ipvs {
94755 /* ip_vs_lblc */
94756 int sysctl_lblc_expiration;
94757 struct ctl_table_header *lblc_ctl_header;
94758- struct ctl_table *lblc_ctl_table;
94759+ ctl_table_no_const *lblc_ctl_table;
94760 /* ip_vs_lblcr */
94761 int sysctl_lblcr_expiration;
94762 struct ctl_table_header *lblcr_ctl_header;
94763- struct ctl_table *lblcr_ctl_table;
94764+ ctl_table_no_const *lblcr_ctl_table;
94765 /* ip_vs_est */
94766 struct list_head est_list; /* estimator list */
94767 spinlock_t est_lock;
94768diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
94769index 8d4f588..2e37ad2 100644
94770--- a/include/net/irda/ircomm_tty.h
94771+++ b/include/net/irda/ircomm_tty.h
94772@@ -33,6 +33,7 @@
94773 #include <linux/termios.h>
94774 #include <linux/timer.h>
94775 #include <linux/tty.h> /* struct tty_struct */
94776+#include <asm/local.h>
94777
94778 #include <net/irda/irias_object.h>
94779 #include <net/irda/ircomm_core.h>
94780diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
94781index 714cc9a..ea05f3e 100644
94782--- a/include/net/iucv/af_iucv.h
94783+++ b/include/net/iucv/af_iucv.h
94784@@ -149,7 +149,7 @@ struct iucv_skb_cb {
94785 struct iucv_sock_list {
94786 struct hlist_head head;
94787 rwlock_t lock;
94788- atomic_t autobind_name;
94789+ atomic_unchecked_t autobind_name;
94790 };
94791
94792 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
94793diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
94794index f3be818..bf46196 100644
94795--- a/include/net/llc_c_ac.h
94796+++ b/include/net/llc_c_ac.h
94797@@ -87,7 +87,7 @@
94798 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
94799 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
94800
94801-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94802+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94803
94804 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
94805 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
94806diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
94807index 3948cf1..83b28c4 100644
94808--- a/include/net/llc_c_ev.h
94809+++ b/include/net/llc_c_ev.h
94810@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
94811 return (struct llc_conn_state_ev *)skb->cb;
94812 }
94813
94814-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94815-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94816+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94817+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94818
94819 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
94820 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
94821diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
94822index 48f3f89..0e92c50 100644
94823--- a/include/net/llc_c_st.h
94824+++ b/include/net/llc_c_st.h
94825@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
94826 u8 next_state;
94827 const llc_conn_ev_qfyr_t *ev_qualifiers;
94828 const llc_conn_action_t *ev_actions;
94829-};
94830+} __do_const;
94831
94832 struct llc_conn_state {
94833 u8 current_state;
94834diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
94835index a61b98c..aade1eb 100644
94836--- a/include/net/llc_s_ac.h
94837+++ b/include/net/llc_s_ac.h
94838@@ -23,7 +23,7 @@
94839 #define SAP_ACT_TEST_IND 9
94840
94841 /* All action functions must look like this */
94842-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
94843+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
94844
94845 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
94846 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
94847diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
94848index c4359e2..76dbc4a 100644
94849--- a/include/net/llc_s_st.h
94850+++ b/include/net/llc_s_st.h
94851@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
94852 llc_sap_ev_t ev;
94853 u8 next_state;
94854 const llc_sap_action_t *ev_actions;
94855-};
94856+} __do_const;
94857
94858 struct llc_sap_state {
94859 u8 curr_state;
94860diff --git a/include/net/mac80211.h b/include/net/mac80211.h
94861index d52914b..2b13cec 100644
94862--- a/include/net/mac80211.h
94863+++ b/include/net/mac80211.h
94864@@ -4915,7 +4915,7 @@ struct rate_control_ops {
94865 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
94866
94867 u32 (*get_expected_throughput)(void *priv_sta);
94868-};
94869+} __do_const;
94870
94871 static inline int rate_supported(struct ieee80211_sta *sta,
94872 enum ieee80211_band band,
94873diff --git a/include/net/neighbour.h b/include/net/neighbour.h
94874index 76f7084..8f36e39 100644
94875--- a/include/net/neighbour.h
94876+++ b/include/net/neighbour.h
94877@@ -163,7 +163,7 @@ struct neigh_ops {
94878 void (*error_report)(struct neighbour *, struct sk_buff *);
94879 int (*output)(struct neighbour *, struct sk_buff *);
94880 int (*connected_output)(struct neighbour *, struct sk_buff *);
94881-};
94882+} __do_const;
94883
94884 struct pneigh_entry {
94885 struct pneigh_entry *next;
94886@@ -217,7 +217,7 @@ struct neigh_table {
94887 struct neigh_statistics __percpu *stats;
94888 struct neigh_hash_table __rcu *nht;
94889 struct pneigh_entry **phash_buckets;
94890-};
94891+} __randomize_layout;
94892
94893 enum {
94894 NEIGH_ARP_TABLE = 0,
94895diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
94896index 36faf49..6927638 100644
94897--- a/include/net/net_namespace.h
94898+++ b/include/net/net_namespace.h
94899@@ -131,8 +131,8 @@ struct net {
94900 struct netns_ipvs *ipvs;
94901 #endif
94902 struct sock *diag_nlsk;
94903- atomic_t fnhe_genid;
94904-};
94905+ atomic_unchecked_t fnhe_genid;
94906+} __randomize_layout;
94907
94908 #include <linux/seq_file_net.h>
94909
94910@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
94911 #define __net_init __init
94912 #define __net_exit __exit_refok
94913 #define __net_initdata __initdata
94914+#ifdef CONSTIFY_PLUGIN
94915 #define __net_initconst __initconst
94916+#else
94917+#define __net_initconst __initdata
94918+#endif
94919 #endif
94920
94921 int peernet2id(struct net *net, struct net *peer);
94922@@ -301,7 +305,7 @@ struct pernet_operations {
94923 void (*exit_batch)(struct list_head *net_exit_list);
94924 int *id;
94925 size_t size;
94926-};
94927+} __do_const;
94928
94929 /*
94930 * Use these carefully. If you implement a network device and it
94931@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
94932
94933 static inline int rt_genid_ipv4(struct net *net)
94934 {
94935- return atomic_read(&net->ipv4.rt_genid);
94936+ return atomic_read_unchecked(&net->ipv4.rt_genid);
94937 }
94938
94939 static inline void rt_genid_bump_ipv4(struct net *net)
94940 {
94941- atomic_inc(&net->ipv4.rt_genid);
94942+ atomic_inc_unchecked(&net->ipv4.rt_genid);
94943 }
94944
94945 extern void (*__fib6_flush_trees)(struct net *net);
94946@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
94947
94948 static inline int fnhe_genid(struct net *net)
94949 {
94950- return atomic_read(&net->fnhe_genid);
94951+ return atomic_read_unchecked(&net->fnhe_genid);
94952 }
94953
94954 static inline void fnhe_genid_bump(struct net *net)
94955 {
94956- atomic_inc(&net->fnhe_genid);
94957+ atomic_inc_unchecked(&net->fnhe_genid);
94958 }
94959
94960 #endif /* __NET_NET_NAMESPACE_H */
94961diff --git a/include/net/netlink.h b/include/net/netlink.h
94962index e010ee8..405b9f4 100644
94963--- a/include/net/netlink.h
94964+++ b/include/net/netlink.h
94965@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
94966 {
94967 if (mark) {
94968 WARN_ON((unsigned char *) mark < skb->data);
94969- skb_trim(skb, (unsigned char *) mark - skb->data);
94970+ skb_trim(skb, (const unsigned char *) mark - skb->data);
94971 }
94972 }
94973
94974diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
94975index 29d6a94..235d3d84 100644
94976--- a/include/net/netns/conntrack.h
94977+++ b/include/net/netns/conntrack.h
94978@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
94979 struct nf_proto_net {
94980 #ifdef CONFIG_SYSCTL
94981 struct ctl_table_header *ctl_table_header;
94982- struct ctl_table *ctl_table;
94983+ ctl_table_no_const *ctl_table;
94984 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
94985 struct ctl_table_header *ctl_compat_header;
94986- struct ctl_table *ctl_compat_table;
94987+ ctl_table_no_const *ctl_compat_table;
94988 #endif
94989 #endif
94990 unsigned int users;
94991@@ -60,7 +60,7 @@ struct nf_ip_net {
94992 struct nf_icmp_net icmpv6;
94993 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
94994 struct ctl_table_header *ctl_table_header;
94995- struct ctl_table *ctl_table;
94996+ ctl_table_no_const *ctl_table;
94997 #endif
94998 };
94999
95000diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
95001index dbe2254..ed0c151 100644
95002--- a/include/net/netns/ipv4.h
95003+++ b/include/net/netns/ipv4.h
95004@@ -87,7 +87,7 @@ struct netns_ipv4 {
95005
95006 struct ping_group_range ping_group_range;
95007
95008- atomic_t dev_addr_genid;
95009+ atomic_unchecked_t dev_addr_genid;
95010
95011 #ifdef CONFIG_SYSCTL
95012 unsigned long *sysctl_local_reserved_ports;
95013@@ -101,6 +101,6 @@ struct netns_ipv4 {
95014 struct fib_rules_ops *mr_rules_ops;
95015 #endif
95016 #endif
95017- atomic_t rt_genid;
95018+ atomic_unchecked_t rt_genid;
95019 };
95020 #endif
95021diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
95022index 69ae41f..4f94868 100644
95023--- a/include/net/netns/ipv6.h
95024+++ b/include/net/netns/ipv6.h
95025@@ -75,8 +75,8 @@ struct netns_ipv6 {
95026 struct fib_rules_ops *mr6_rules_ops;
95027 #endif
95028 #endif
95029- atomic_t dev_addr_genid;
95030- atomic_t fib6_sernum;
95031+ atomic_unchecked_t dev_addr_genid;
95032+ atomic_unchecked_t fib6_sernum;
95033 };
95034
95035 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
95036diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
95037index 730d82a..045f2c4 100644
95038--- a/include/net/netns/xfrm.h
95039+++ b/include/net/netns/xfrm.h
95040@@ -78,7 +78,7 @@ struct netns_xfrm {
95041
95042 /* flow cache part */
95043 struct flow_cache flow_cache_global;
95044- atomic_t flow_cache_genid;
95045+ atomic_unchecked_t flow_cache_genid;
95046 struct list_head flow_cache_gc_list;
95047 spinlock_t flow_cache_gc_lock;
95048 struct work_struct flow_cache_gc_work;
95049diff --git a/include/net/ping.h b/include/net/ping.h
95050index cc16d41..664f40b 100644
95051--- a/include/net/ping.h
95052+++ b/include/net/ping.h
95053@@ -54,7 +54,7 @@ struct ping_iter_state {
95054
95055 extern struct proto ping_prot;
95056 #if IS_ENABLED(CONFIG_IPV6)
95057-extern struct pingv6_ops pingv6_ops;
95058+extern struct pingv6_ops *pingv6_ops;
95059 #endif
95060
95061 struct pingfakehdr {
95062diff --git a/include/net/protocol.h b/include/net/protocol.h
95063index d6fcc1f..ca277058 100644
95064--- a/include/net/protocol.h
95065+++ b/include/net/protocol.h
95066@@ -49,7 +49,7 @@ struct net_protocol {
95067 * socket lookup?
95068 */
95069 icmp_strict_tag_validation:1;
95070-};
95071+} __do_const;
95072
95073 #if IS_ENABLED(CONFIG_IPV6)
95074 struct inet6_protocol {
95075@@ -62,7 +62,7 @@ struct inet6_protocol {
95076 u8 type, u8 code, int offset,
95077 __be32 info);
95078 unsigned int flags; /* INET6_PROTO_xxx */
95079-};
95080+} __do_const;
95081
95082 #define INET6_PROTO_NOPOLICY 0x1
95083 #define INET6_PROTO_FINAL 0x2
95084diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
95085index 6c6d539..af70817 100644
95086--- a/include/net/rtnetlink.h
95087+++ b/include/net/rtnetlink.h
95088@@ -95,7 +95,7 @@ struct rtnl_link_ops {
95089 const struct net_device *dev,
95090 const struct net_device *slave_dev);
95091 struct net *(*get_link_net)(const struct net_device *dev);
95092-};
95093+} __do_const;
95094
95095 int __rtnl_link_register(struct rtnl_link_ops *ops);
95096 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
95097diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
95098index 4a5b9a3..ca27d73 100644
95099--- a/include/net/sctp/checksum.h
95100+++ b/include/net/sctp/checksum.h
95101@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
95102 unsigned int offset)
95103 {
95104 struct sctphdr *sh = sctp_hdr(skb);
95105- __le32 ret, old = sh->checksum;
95106- const struct skb_checksum_ops ops = {
95107+ __le32 ret, old = sh->checksum;
95108+ static const struct skb_checksum_ops ops = {
95109 .update = sctp_csum_update,
95110 .combine = sctp_csum_combine,
95111 };
95112diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
95113index 487ef34..d457f98 100644
95114--- a/include/net/sctp/sm.h
95115+++ b/include/net/sctp/sm.h
95116@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
95117 typedef struct {
95118 sctp_state_fn_t *fn;
95119 const char *name;
95120-} sctp_sm_table_entry_t;
95121+} __do_const sctp_sm_table_entry_t;
95122
95123 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
95124 * currently in use.
95125@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
95126 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
95127
95128 /* Extern declarations for major data structures. */
95129-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95130+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95131
95132
95133 /* Get the size of a DATA chunk payload. */
95134diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
95135index 2bb2fcf..d17c291 100644
95136--- a/include/net/sctp/structs.h
95137+++ b/include/net/sctp/structs.h
95138@@ -509,7 +509,7 @@ struct sctp_pf {
95139 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
95140 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
95141 struct sctp_af *af;
95142-};
95143+} __do_const;
95144
95145
95146 /* Structure to track chunk fragments that have been acked, but peer
95147diff --git a/include/net/sock.h b/include/net/sock.h
95148index e4079c2..79c5d3a 100644
95149--- a/include/net/sock.h
95150+++ b/include/net/sock.h
95151@@ -362,7 +362,7 @@ struct sock {
95152 unsigned int sk_napi_id;
95153 unsigned int sk_ll_usec;
95154 #endif
95155- atomic_t sk_drops;
95156+ atomic_unchecked_t sk_drops;
95157 int sk_rcvbuf;
95158
95159 struct sk_filter __rcu *sk_filter;
95160@@ -1039,7 +1039,7 @@ struct proto {
95161 void (*destroy_cgroup)(struct mem_cgroup *memcg);
95162 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
95163 #endif
95164-};
95165+} __randomize_layout;
95166
95167 /*
95168 * Bits in struct cg_proto.flags
95169@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
95170 page_counter_uncharge(&prot->memory_allocated, amt);
95171 }
95172
95173-static inline long
95174+static inline long __intentional_overflow(-1)
95175 sk_memory_allocated(const struct sock *sk)
95176 {
95177 struct proto *prot = sk->sk_prot;
95178@@ -1778,7 +1778,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
95179 }
95180
95181 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
95182- struct iov_iter *from, char *to,
95183+ struct iov_iter *from, unsigned char *to,
95184 int copy, int offset)
95185 {
95186 if (skb->ip_summed == CHECKSUM_NONE) {
95187@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
95188 }
95189 }
95190
95191-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95192+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95193
95194 /**
95195 * sk_page_frag - return an appropriate page_frag
95196diff --git a/include/net/tcp.h b/include/net/tcp.h
95197index 8d6b983..5813205 100644
95198--- a/include/net/tcp.h
95199+++ b/include/net/tcp.h
95200@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
95201 void tcp_xmit_retransmit_queue(struct sock *);
95202 void tcp_simple_retransmit(struct sock *);
95203 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
95204-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95205+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95206
95207 void tcp_send_probe0(struct sock *);
95208 void tcp_send_partial(struct sock *);
95209@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
95210 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
95211 */
95212 struct tcp_skb_cb {
95213- __u32 seq; /* Starting sequence number */
95214- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
95215+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
95216+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
95217 union {
95218 /* Note : tcp_tw_isn is used in input path only
95219 * (isn chosen by tcp_timewait_state_process())
95220@@ -720,7 +720,7 @@ struct tcp_skb_cb {
95221
95222 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
95223 /* 1 byte hole */
95224- __u32 ack_seq; /* Sequence number ACK'd */
95225+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
95226 union {
95227 struct inet_skb_parm h4;
95228 #if IS_ENABLED(CONFIG_IPV6)
95229diff --git a/include/net/xfrm.h b/include/net/xfrm.h
95230index dc4865e..152ee4c 100644
95231--- a/include/net/xfrm.h
95232+++ b/include/net/xfrm.h
95233@@ -285,7 +285,6 @@ struct xfrm_dst;
95234 struct xfrm_policy_afinfo {
95235 unsigned short family;
95236 struct dst_ops *dst_ops;
95237- void (*garbage_collect)(struct net *net);
95238 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
95239 const xfrm_address_t *saddr,
95240 const xfrm_address_t *daddr);
95241@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
95242 struct net_device *dev,
95243 const struct flowi *fl);
95244 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
95245-};
95246+} __do_const;
95247
95248 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
95249 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
95250@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
95251 int (*transport_finish)(struct sk_buff *skb,
95252 int async);
95253 void (*local_error)(struct sk_buff *skb, u32 mtu);
95254-};
95255+} __do_const;
95256
95257 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
95258 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
95259@@ -437,7 +436,7 @@ struct xfrm_mode {
95260 struct module *owner;
95261 unsigned int encap;
95262 int flags;
95263-};
95264+} __do_const;
95265
95266 /* Flags for xfrm_mode. */
95267 enum {
95268@@ -534,7 +533,7 @@ struct xfrm_policy {
95269 struct timer_list timer;
95270
95271 struct flow_cache_object flo;
95272- atomic_t genid;
95273+ atomic_unchecked_t genid;
95274 u32 priority;
95275 u32 index;
95276 struct xfrm_mark mark;
95277@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
95278 }
95279
95280 void xfrm_garbage_collect(struct net *net);
95281+void xfrm_garbage_collect_deferred(struct net *net);
95282
95283 #else
95284
95285@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
95286 static inline void xfrm_garbage_collect(struct net *net)
95287 {
95288 }
95289+static inline void xfrm_garbage_collect_deferred(struct net *net)
95290+{
95291+}
95292 #endif
95293
95294 static __inline__
95295diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
95296index 1017e0b..227aa4d 100644
95297--- a/include/rdma/iw_cm.h
95298+++ b/include/rdma/iw_cm.h
95299@@ -122,7 +122,7 @@ struct iw_cm_verbs {
95300 int backlog);
95301
95302 int (*destroy_listen)(struct iw_cm_id *cm_id);
95303-};
95304+} __no_const;
95305
95306 /**
95307 * iw_create_cm_id - Create an IW CM identifier.
95308diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
95309index 93d14da..734b3d8 100644
95310--- a/include/scsi/libfc.h
95311+++ b/include/scsi/libfc.h
95312@@ -771,6 +771,7 @@ struct libfc_function_template {
95313 */
95314 void (*disc_stop_final) (struct fc_lport *);
95315 };
95316+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
95317
95318 /**
95319 * struct fc_disc - Discovery context
95320@@ -875,7 +876,7 @@ struct fc_lport {
95321 struct fc_vport *vport;
95322
95323 /* Operational Information */
95324- struct libfc_function_template tt;
95325+ libfc_function_template_no_const tt;
95326 u8 link_up;
95327 u8 qfull;
95328 enum fc_lport_state state;
95329diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
95330index a4c9336..d6f8f34 100644
95331--- a/include/scsi/scsi_device.h
95332+++ b/include/scsi/scsi_device.h
95333@@ -185,9 +185,9 @@ struct scsi_device {
95334 unsigned int max_device_blocked; /* what device_blocked counts down from */
95335 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
95336
95337- atomic_t iorequest_cnt;
95338- atomic_t iodone_cnt;
95339- atomic_t ioerr_cnt;
95340+ atomic_unchecked_t iorequest_cnt;
95341+ atomic_unchecked_t iodone_cnt;
95342+ atomic_unchecked_t ioerr_cnt;
95343
95344 struct device sdev_gendev,
95345 sdev_dev;
95346diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
95347index 007a0bc..7188db8 100644
95348--- a/include/scsi/scsi_transport_fc.h
95349+++ b/include/scsi/scsi_transport_fc.h
95350@@ -756,7 +756,8 @@ struct fc_function_template {
95351 unsigned long show_host_system_hostname:1;
95352
95353 unsigned long disable_target_scan:1;
95354-};
95355+} __do_const;
95356+typedef struct fc_function_template __no_const fc_function_template_no_const;
95357
95358
95359 /**
95360diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
95361index f48089d..73abe48 100644
95362--- a/include/sound/compress_driver.h
95363+++ b/include/sound/compress_driver.h
95364@@ -130,7 +130,7 @@ struct snd_compr_ops {
95365 struct snd_compr_caps *caps);
95366 int (*get_codec_caps) (struct snd_compr_stream *stream,
95367 struct snd_compr_codec_caps *codec);
95368-};
95369+} __no_const;
95370
95371 /**
95372 * struct snd_compr: Compressed device
95373diff --git a/include/sound/soc.h b/include/sound/soc.h
95374index 0d1ade1..34e77d3 100644
95375--- a/include/sound/soc.h
95376+++ b/include/sound/soc.h
95377@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
95378 enum snd_soc_dapm_type, int);
95379
95380 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
95381-};
95382+} __do_const;
95383
95384 /* SoC platform interface */
95385 struct snd_soc_platform_driver {
95386@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
95387 const struct snd_compr_ops *compr_ops;
95388
95389 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
95390-};
95391+} __do_const;
95392
95393 struct snd_soc_dai_link_component {
95394 const char *name;
95395diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
95396index 985ca4c..b55b54a 100644
95397--- a/include/target/target_core_base.h
95398+++ b/include/target/target_core_base.h
95399@@ -767,7 +767,7 @@ struct se_device {
95400 atomic_long_t write_bytes;
95401 /* Active commands on this virtual SE device */
95402 atomic_t simple_cmds;
95403- atomic_t dev_ordered_id;
95404+ atomic_unchecked_t dev_ordered_id;
95405 atomic_t dev_ordered_sync;
95406 atomic_t dev_qf_count;
95407 int export_count;
95408diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
95409new file mode 100644
95410index 0000000..fb634b7
95411--- /dev/null
95412+++ b/include/trace/events/fs.h
95413@@ -0,0 +1,53 @@
95414+#undef TRACE_SYSTEM
95415+#define TRACE_SYSTEM fs
95416+
95417+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
95418+#define _TRACE_FS_H
95419+
95420+#include <linux/fs.h>
95421+#include <linux/tracepoint.h>
95422+
95423+TRACE_EVENT(do_sys_open,
95424+
95425+ TP_PROTO(const char *filename, int flags, int mode),
95426+
95427+ TP_ARGS(filename, flags, mode),
95428+
95429+ TP_STRUCT__entry(
95430+ __string( filename, filename )
95431+ __field( int, flags )
95432+ __field( int, mode )
95433+ ),
95434+
95435+ TP_fast_assign(
95436+ __assign_str(filename, filename);
95437+ __entry->flags = flags;
95438+ __entry->mode = mode;
95439+ ),
95440+
95441+ TP_printk("\"%s\" %x %o",
95442+ __get_str(filename), __entry->flags, __entry->mode)
95443+);
95444+
95445+TRACE_EVENT(open_exec,
95446+
95447+ TP_PROTO(const char *filename),
95448+
95449+ TP_ARGS(filename),
95450+
95451+ TP_STRUCT__entry(
95452+ __string( filename, filename )
95453+ ),
95454+
95455+ TP_fast_assign(
95456+ __assign_str(filename, filename);
95457+ ),
95458+
95459+ TP_printk("\"%s\"",
95460+ __get_str(filename))
95461+);
95462+
95463+#endif /* _TRACE_FS_H */
95464+
95465+/* This part must be outside protection */
95466+#include <trace/define_trace.h>
95467diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
95468index 3608beb..df39d8a 100644
95469--- a/include/trace/events/irq.h
95470+++ b/include/trace/events/irq.h
95471@@ -36,7 +36,7 @@ struct softirq_action;
95472 */
95473 TRACE_EVENT(irq_handler_entry,
95474
95475- TP_PROTO(int irq, struct irqaction *action),
95476+ TP_PROTO(int irq, const struct irqaction *action),
95477
95478 TP_ARGS(irq, action),
95479
95480@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
95481 */
95482 TRACE_EVENT(irq_handler_exit,
95483
95484- TP_PROTO(int irq, struct irqaction *action, int ret),
95485+ TP_PROTO(int irq, const struct irqaction *action, int ret),
95486
95487 TP_ARGS(irq, action, ret),
95488
95489diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
95490index 6eed16b..3e05750 100644
95491--- a/include/uapi/drm/i915_drm.h
95492+++ b/include/uapi/drm/i915_drm.h
95493@@ -347,6 +347,7 @@ typedef struct drm_i915_irq_wait {
95494 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
95495 #define I915_PARAM_MMAP_VERSION 30
95496 #define I915_PARAM_HAS_BSD2 31
95497+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
95498
95499 typedef struct drm_i915_getparam {
95500 int param;
95501diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
95502index 7caf44c..23c6f27 100644
95503--- a/include/uapi/linux/a.out.h
95504+++ b/include/uapi/linux/a.out.h
95505@@ -39,6 +39,14 @@ enum machine_type {
95506 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
95507 };
95508
95509+/* Constants for the N_FLAGS field */
95510+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95511+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
95512+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
95513+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
95514+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95515+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95516+
95517 #if !defined (N_MAGIC)
95518 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
95519 #endif
95520diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
95521index 22b6ad3..aeba37e 100644
95522--- a/include/uapi/linux/bcache.h
95523+++ b/include/uapi/linux/bcache.h
95524@@ -5,6 +5,7 @@
95525 * Bcache on disk data structures
95526 */
95527
95528+#include <linux/compiler.h>
95529 #include <asm/types.h>
95530
95531 #define BITMASK(name, type, field, offset, size) \
95532@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
95533 /* Btree keys - all units are in sectors */
95534
95535 struct bkey {
95536- __u64 high;
95537- __u64 low;
95538+ __u64 high __intentional_overflow(-1);
95539+ __u64 low __intentional_overflow(-1);
95540 __u64 ptr[];
95541 };
95542
95543diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
95544index d876736..ccce5c0 100644
95545--- a/include/uapi/linux/byteorder/little_endian.h
95546+++ b/include/uapi/linux/byteorder/little_endian.h
95547@@ -42,51 +42,51 @@
95548
95549 static inline __le64 __cpu_to_le64p(const __u64 *p)
95550 {
95551- return (__force __le64)*p;
95552+ return (__force const __le64)*p;
95553 }
95554-static inline __u64 __le64_to_cpup(const __le64 *p)
95555+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
95556 {
95557- return (__force __u64)*p;
95558+ return (__force const __u64)*p;
95559 }
95560 static inline __le32 __cpu_to_le32p(const __u32 *p)
95561 {
95562- return (__force __le32)*p;
95563+ return (__force const __le32)*p;
95564 }
95565 static inline __u32 __le32_to_cpup(const __le32 *p)
95566 {
95567- return (__force __u32)*p;
95568+ return (__force const __u32)*p;
95569 }
95570 static inline __le16 __cpu_to_le16p(const __u16 *p)
95571 {
95572- return (__force __le16)*p;
95573+ return (__force const __le16)*p;
95574 }
95575 static inline __u16 __le16_to_cpup(const __le16 *p)
95576 {
95577- return (__force __u16)*p;
95578+ return (__force const __u16)*p;
95579 }
95580 static inline __be64 __cpu_to_be64p(const __u64 *p)
95581 {
95582- return (__force __be64)__swab64p(p);
95583+ return (__force const __be64)__swab64p(p);
95584 }
95585 static inline __u64 __be64_to_cpup(const __be64 *p)
95586 {
95587- return __swab64p((__u64 *)p);
95588+ return __swab64p((const __u64 *)p);
95589 }
95590 static inline __be32 __cpu_to_be32p(const __u32 *p)
95591 {
95592- return (__force __be32)__swab32p(p);
95593+ return (__force const __be32)__swab32p(p);
95594 }
95595-static inline __u32 __be32_to_cpup(const __be32 *p)
95596+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
95597 {
95598- return __swab32p((__u32 *)p);
95599+ return __swab32p((const __u32 *)p);
95600 }
95601 static inline __be16 __cpu_to_be16p(const __u16 *p)
95602 {
95603- return (__force __be16)__swab16p(p);
95604+ return (__force const __be16)__swab16p(p);
95605 }
95606 static inline __u16 __be16_to_cpup(const __be16 *p)
95607 {
95608- return __swab16p((__u16 *)p);
95609+ return __swab16p((const __u16 *)p);
95610 }
95611 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
95612 #define __le64_to_cpus(x) do { (void)(x); } while (0)
95613diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
95614index 71e1d0e..6cc9caf 100644
95615--- a/include/uapi/linux/elf.h
95616+++ b/include/uapi/linux/elf.h
95617@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
95618 #define PT_GNU_EH_FRAME 0x6474e550
95619
95620 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
95621+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
95622+
95623+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
95624+
95625+/* Constants for the e_flags field */
95626+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95627+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
95628+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
95629+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
95630+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95631+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95632
95633 /*
95634 * Extended Numbering
95635@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
95636 #define DT_DEBUG 21
95637 #define DT_TEXTREL 22
95638 #define DT_JMPREL 23
95639+#define DT_FLAGS 30
95640+ #define DF_TEXTREL 0x00000004
95641 #define DT_ENCODING 32
95642 #define OLD_DT_LOOS 0x60000000
95643 #define DT_LOOS 0x6000000d
95644@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
95645 #define PF_W 0x2
95646 #define PF_X 0x1
95647
95648+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
95649+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
95650+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
95651+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
95652+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
95653+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
95654+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
95655+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
95656+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
95657+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
95658+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
95659+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
95660+
95661 typedef struct elf32_phdr{
95662 Elf32_Word p_type;
95663 Elf32_Off p_offset;
95664@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
95665 #define EI_OSABI 7
95666 #define EI_PAD 8
95667
95668+#define EI_PAX 14
95669+
95670 #define ELFMAG0 0x7f /* EI_MAG */
95671 #define ELFMAG1 'E'
95672 #define ELFMAG2 'L'
95673diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
95674index aa169c4..6a2771d 100644
95675--- a/include/uapi/linux/personality.h
95676+++ b/include/uapi/linux/personality.h
95677@@ -30,6 +30,7 @@ enum {
95678 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
95679 ADDR_NO_RANDOMIZE | \
95680 ADDR_COMPAT_LAYOUT | \
95681+ ADDR_LIMIT_3GB | \
95682 MMAP_PAGE_ZERO)
95683
95684 /*
95685diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
95686index 7530e74..e714828 100644
95687--- a/include/uapi/linux/screen_info.h
95688+++ b/include/uapi/linux/screen_info.h
95689@@ -43,7 +43,8 @@ struct screen_info {
95690 __u16 pages; /* 0x32 */
95691 __u16 vesa_attributes; /* 0x34 */
95692 __u32 capabilities; /* 0x36 */
95693- __u8 _reserved[6]; /* 0x3a */
95694+ __u16 vesapm_size; /* 0x3a */
95695+ __u8 _reserved[4]; /* 0x3c */
95696 } __attribute__((packed));
95697
95698 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
95699diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
95700index 0e011eb..82681b1 100644
95701--- a/include/uapi/linux/swab.h
95702+++ b/include/uapi/linux/swab.h
95703@@ -43,7 +43,7 @@
95704 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
95705 */
95706
95707-static inline __attribute_const__ __u16 __fswab16(__u16 val)
95708+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
95709 {
95710 #ifdef __HAVE_BUILTIN_BSWAP16__
95711 return __builtin_bswap16(val);
95712@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
95713 #endif
95714 }
95715
95716-static inline __attribute_const__ __u32 __fswab32(__u32 val)
95717+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
95718 {
95719 #ifdef __HAVE_BUILTIN_BSWAP32__
95720 return __builtin_bswap32(val);
95721@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
95722 #endif
95723 }
95724
95725-static inline __attribute_const__ __u64 __fswab64(__u64 val)
95726+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
95727 {
95728 #ifdef __HAVE_BUILTIN_BSWAP64__
95729 return __builtin_bswap64(val);
95730diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
95731index 1590c49..5eab462 100644
95732--- a/include/uapi/linux/xattr.h
95733+++ b/include/uapi/linux/xattr.h
95734@@ -73,5 +73,9 @@
95735 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
95736 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
95737
95738+/* User namespace */
95739+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
95740+#define XATTR_PAX_FLAGS_SUFFIX "flags"
95741+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
95742
95743 #endif /* _UAPI_LINUX_XATTR_H */
95744diff --git a/include/video/udlfb.h b/include/video/udlfb.h
95745index f9466fa..f4e2b81 100644
95746--- a/include/video/udlfb.h
95747+++ b/include/video/udlfb.h
95748@@ -53,10 +53,10 @@ struct dlfb_data {
95749 u32 pseudo_palette[256];
95750 int blank_mode; /*one of FB_BLANK_ */
95751 /* blit-only rendering path metrics, exposed through sysfs */
95752- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95753- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
95754- atomic_t bytes_sent; /* to usb, after compression including overhead */
95755- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
95756+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95757+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
95758+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
95759+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
95760 };
95761
95762 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
95763diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
95764index 30f5362..8ed8ac9 100644
95765--- a/include/video/uvesafb.h
95766+++ b/include/video/uvesafb.h
95767@@ -122,6 +122,7 @@ struct uvesafb_par {
95768 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
95769 u8 pmi_setpal; /* PMI for palette changes */
95770 u16 *pmi_base; /* protected mode interface location */
95771+ u8 *pmi_code; /* protected mode code location */
95772 void *pmi_start;
95773 void *pmi_pal;
95774 u8 *vbe_state_orig; /*
95775diff --git a/init/Kconfig b/init/Kconfig
95776index f5dbc6d..8259396 100644
95777--- a/init/Kconfig
95778+++ b/init/Kconfig
95779@@ -1136,6 +1136,7 @@ endif # CGROUPS
95780
95781 config CHECKPOINT_RESTORE
95782 bool "Checkpoint/restore support" if EXPERT
95783+ depends on !GRKERNSEC
95784 default n
95785 help
95786 Enables additional kernel features in a sake of checkpoint/restore.
95787@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
95788
95789 config COMPAT_BRK
95790 bool "Disable heap randomization"
95791- default y
95792+ default n
95793 help
95794 Randomizing heap placement makes heap exploits harder, but it
95795 also breaks ancient binaries (including anything libc5 based).
95796@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
95797 config STOP_MACHINE
95798 bool
95799 default y
95800- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
95801+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
95802 help
95803 Need stop_machine() primitive.
95804
95805diff --git a/init/Makefile b/init/Makefile
95806index 7bc47ee..6da2dc7 100644
95807--- a/init/Makefile
95808+++ b/init/Makefile
95809@@ -2,6 +2,9 @@
95810 # Makefile for the linux kernel.
95811 #
95812
95813+ccflags-y := $(GCC_PLUGINS_CFLAGS)
95814+asflags-y := $(GCC_PLUGINS_AFLAGS)
95815+
95816 obj-y := main.o version.o mounts.o
95817 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
95818 obj-y += noinitramfs.o
95819diff --git a/init/do_mounts.c b/init/do_mounts.c
95820index eb41008..f5dbbf9 100644
95821--- a/init/do_mounts.c
95822+++ b/init/do_mounts.c
95823@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
95824 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
95825 {
95826 struct super_block *s;
95827- int err = sys_mount(name, "/root", fs, flags, data);
95828+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
95829 if (err)
95830 return err;
95831
95832- sys_chdir("/root");
95833+ sys_chdir((const char __force_user *)"/root");
95834 s = current->fs->pwd.dentry->d_sb;
95835 ROOT_DEV = s->s_dev;
95836 printk(KERN_INFO
95837@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
95838 va_start(args, fmt);
95839 vsprintf(buf, fmt, args);
95840 va_end(args);
95841- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
95842+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
95843 if (fd >= 0) {
95844 sys_ioctl(fd, FDEJECT, 0);
95845 sys_close(fd);
95846 }
95847 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
95848- fd = sys_open("/dev/console", O_RDWR, 0);
95849+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
95850 if (fd >= 0) {
95851 sys_ioctl(fd, TCGETS, (long)&termios);
95852 termios.c_lflag &= ~ICANON;
95853 sys_ioctl(fd, TCSETSF, (long)&termios);
95854- sys_read(fd, &c, 1);
95855+ sys_read(fd, (char __user *)&c, 1);
95856 termios.c_lflag |= ICANON;
95857 sys_ioctl(fd, TCSETSF, (long)&termios);
95858 sys_close(fd);
95859@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
95860 mount_root();
95861 out:
95862 devtmpfs_mount("dev");
95863- sys_mount(".", "/", NULL, MS_MOVE, NULL);
95864- sys_chroot(".");
95865+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
95866+ sys_chroot((const char __force_user *)".");
95867 }
95868
95869 static bool is_tmpfs;
95870diff --git a/init/do_mounts.h b/init/do_mounts.h
95871index f5b978a..69dbfe8 100644
95872--- a/init/do_mounts.h
95873+++ b/init/do_mounts.h
95874@@ -15,15 +15,15 @@ extern int root_mountflags;
95875
95876 static inline int create_dev(char *name, dev_t dev)
95877 {
95878- sys_unlink(name);
95879- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
95880+ sys_unlink((char __force_user *)name);
95881+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
95882 }
95883
95884 #if BITS_PER_LONG == 32
95885 static inline u32 bstat(char *name)
95886 {
95887 struct stat64 stat;
95888- if (sys_stat64(name, &stat) != 0)
95889+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
95890 return 0;
95891 if (!S_ISBLK(stat.st_mode))
95892 return 0;
95893@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
95894 static inline u32 bstat(char *name)
95895 {
95896 struct stat stat;
95897- if (sys_newstat(name, &stat) != 0)
95898+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
95899 return 0;
95900 if (!S_ISBLK(stat.st_mode))
95901 return 0;
95902diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
95903index 3e0878e..8a9d7a0 100644
95904--- a/init/do_mounts_initrd.c
95905+++ b/init/do_mounts_initrd.c
95906@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
95907 {
95908 sys_unshare(CLONE_FS | CLONE_FILES);
95909 /* stdin/stdout/stderr for /linuxrc */
95910- sys_open("/dev/console", O_RDWR, 0);
95911+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
95912 sys_dup(0);
95913 sys_dup(0);
95914 /* move initrd over / and chdir/chroot in initrd root */
95915- sys_chdir("/root");
95916- sys_mount(".", "/", NULL, MS_MOVE, NULL);
95917- sys_chroot(".");
95918+ sys_chdir((const char __force_user *)"/root");
95919+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
95920+ sys_chroot((const char __force_user *)".");
95921 sys_setsid();
95922 return 0;
95923 }
95924@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
95925 create_dev("/dev/root.old", Root_RAM0);
95926 /* mount initrd on rootfs' /root */
95927 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
95928- sys_mkdir("/old", 0700);
95929- sys_chdir("/old");
95930+ sys_mkdir((const char __force_user *)"/old", 0700);
95931+ sys_chdir((const char __force_user *)"/old");
95932
95933 /* try loading default modules from initrd */
95934 load_default_modules();
95935@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
95936 current->flags &= ~PF_FREEZER_SKIP;
95937
95938 /* move initrd to rootfs' /old */
95939- sys_mount("..", ".", NULL, MS_MOVE, NULL);
95940+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
95941 /* switch root and cwd back to / of rootfs */
95942- sys_chroot("..");
95943+ sys_chroot((const char __force_user *)"..");
95944
95945 if (new_decode_dev(real_root_dev) == Root_RAM0) {
95946- sys_chdir("/old");
95947+ sys_chdir((const char __force_user *)"/old");
95948 return;
95949 }
95950
95951- sys_chdir("/");
95952+ sys_chdir((const char __force_user *)"/");
95953 ROOT_DEV = new_decode_dev(real_root_dev);
95954 mount_root();
95955
95956 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
95957- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
95958+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
95959 if (!error)
95960 printk("okay\n");
95961 else {
95962- int fd = sys_open("/dev/root.old", O_RDWR, 0);
95963+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
95964 if (error == -ENOENT)
95965 printk("/initrd does not exist. Ignored.\n");
95966 else
95967 printk("failed\n");
95968 printk(KERN_NOTICE "Unmounting old root\n");
95969- sys_umount("/old", MNT_DETACH);
95970+ sys_umount((char __force_user *)"/old", MNT_DETACH);
95971 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
95972 if (fd < 0) {
95973 error = fd;
95974@@ -127,11 +127,11 @@ int __init initrd_load(void)
95975 * mounted in the normal path.
95976 */
95977 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
95978- sys_unlink("/initrd.image");
95979+ sys_unlink((const char __force_user *)"/initrd.image");
95980 handle_initrd();
95981 return 1;
95982 }
95983 }
95984- sys_unlink("/initrd.image");
95985+ sys_unlink((const char __force_user *)"/initrd.image");
95986 return 0;
95987 }
95988diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
95989index 8cb6db5..d729f50 100644
95990--- a/init/do_mounts_md.c
95991+++ b/init/do_mounts_md.c
95992@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
95993 partitioned ? "_d" : "", minor,
95994 md_setup_args[ent].device_names);
95995
95996- fd = sys_open(name, 0, 0);
95997+ fd = sys_open((char __force_user *)name, 0, 0);
95998 if (fd < 0) {
95999 printk(KERN_ERR "md: open failed - cannot start "
96000 "array %s\n", name);
96001@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
96002 * array without it
96003 */
96004 sys_close(fd);
96005- fd = sys_open(name, 0, 0);
96006+ fd = sys_open((char __force_user *)name, 0, 0);
96007 sys_ioctl(fd, BLKRRPART, 0);
96008 }
96009 sys_close(fd);
96010@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
96011
96012 wait_for_device_probe();
96013
96014- fd = sys_open("/dev/md0", 0, 0);
96015+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
96016 if (fd >= 0) {
96017 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
96018 sys_close(fd);
96019diff --git a/init/init_task.c b/init/init_task.c
96020index ba0a7f36..2bcf1d5 100644
96021--- a/init/init_task.c
96022+++ b/init/init_task.c
96023@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
96024 * Initial thread structure. Alignment of this is handled by a special
96025 * linker map entry.
96026 */
96027+#ifdef CONFIG_X86
96028+union thread_union init_thread_union __init_task_data;
96029+#else
96030 union thread_union init_thread_union __init_task_data =
96031 { INIT_THREAD_INFO(init_task) };
96032+#endif
96033diff --git a/init/initramfs.c b/init/initramfs.c
96034index ad1bd77..dca2c1b 100644
96035--- a/init/initramfs.c
96036+++ b/init/initramfs.c
96037@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
96038
96039 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
96040 while (count) {
96041- ssize_t rv = sys_write(fd, p, count);
96042+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
96043
96044 if (rv < 0) {
96045 if (rv == -EINTR || rv == -EAGAIN)
96046@@ -107,7 +107,7 @@ static void __init free_hash(void)
96047 }
96048 }
96049
96050-static long __init do_utime(char *filename, time_t mtime)
96051+static long __init do_utime(char __force_user *filename, time_t mtime)
96052 {
96053 struct timespec t[2];
96054
96055@@ -142,7 +142,7 @@ static void __init dir_utime(void)
96056 struct dir_entry *de, *tmp;
96057 list_for_each_entry_safe(de, tmp, &dir_list, list) {
96058 list_del(&de->list);
96059- do_utime(de->name, de->mtime);
96060+ do_utime((char __force_user *)de->name, de->mtime);
96061 kfree(de->name);
96062 kfree(de);
96063 }
96064@@ -304,7 +304,7 @@ static int __init maybe_link(void)
96065 if (nlink >= 2) {
96066 char *old = find_link(major, minor, ino, mode, collected);
96067 if (old)
96068- return (sys_link(old, collected) < 0) ? -1 : 1;
96069+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
96070 }
96071 return 0;
96072 }
96073@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
96074 {
96075 struct stat st;
96076
96077- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
96078+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
96079 if (S_ISDIR(st.st_mode))
96080- sys_rmdir(path);
96081+ sys_rmdir((char __force_user *)path);
96082 else
96083- sys_unlink(path);
96084+ sys_unlink((char __force_user *)path);
96085 }
96086 }
96087
96088@@ -338,7 +338,7 @@ static int __init do_name(void)
96089 int openflags = O_WRONLY|O_CREAT;
96090 if (ml != 1)
96091 openflags |= O_TRUNC;
96092- wfd = sys_open(collected, openflags, mode);
96093+ wfd = sys_open((char __force_user *)collected, openflags, mode);
96094
96095 if (wfd >= 0) {
96096 sys_fchown(wfd, uid, gid);
96097@@ -350,17 +350,17 @@ static int __init do_name(void)
96098 }
96099 }
96100 } else if (S_ISDIR(mode)) {
96101- sys_mkdir(collected, mode);
96102- sys_chown(collected, uid, gid);
96103- sys_chmod(collected, mode);
96104+ sys_mkdir((char __force_user *)collected, mode);
96105+ sys_chown((char __force_user *)collected, uid, gid);
96106+ sys_chmod((char __force_user *)collected, mode);
96107 dir_add(collected, mtime);
96108 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
96109 S_ISFIFO(mode) || S_ISSOCK(mode)) {
96110 if (maybe_link() == 0) {
96111- sys_mknod(collected, mode, rdev);
96112- sys_chown(collected, uid, gid);
96113- sys_chmod(collected, mode);
96114- do_utime(collected, mtime);
96115+ sys_mknod((char __force_user *)collected, mode, rdev);
96116+ sys_chown((char __force_user *)collected, uid, gid);
96117+ sys_chmod((char __force_user *)collected, mode);
96118+ do_utime((char __force_user *)collected, mtime);
96119 }
96120 }
96121 return 0;
96122@@ -372,7 +372,7 @@ static int __init do_copy(void)
96123 if (xwrite(wfd, victim, body_len) != body_len)
96124 error("write error");
96125 sys_close(wfd);
96126- do_utime(vcollected, mtime);
96127+ do_utime((char __force_user *)vcollected, mtime);
96128 kfree(vcollected);
96129 eat(body_len);
96130 state = SkipIt;
96131@@ -390,9 +390,9 @@ static int __init do_symlink(void)
96132 {
96133 collected[N_ALIGN(name_len) + body_len] = '\0';
96134 clean_path(collected, 0);
96135- sys_symlink(collected + N_ALIGN(name_len), collected);
96136- sys_lchown(collected, uid, gid);
96137- do_utime(collected, mtime);
96138+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
96139+ sys_lchown((char __force_user *)collected, uid, gid);
96140+ do_utime((char __force_user *)collected, mtime);
96141 state = SkipIt;
96142 next_state = Reset;
96143 return 0;
96144diff --git a/init/main.c b/init/main.c
96145index 6f0f1c5f..a542824 100644
96146--- a/init/main.c
96147+++ b/init/main.c
96148@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
96149 static inline void mark_rodata_ro(void) { }
96150 #endif
96151
96152+extern void grsecurity_init(void);
96153+
96154 /*
96155 * Debug helper: via this flag we know that we are in 'early bootup code'
96156 * where only the boot processor is running with IRQ disabled. This means
96157@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
96158
96159 __setup("reset_devices", set_reset_devices);
96160
96161+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
96162+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
96163+static int __init setup_grsec_proc_gid(char *str)
96164+{
96165+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
96166+ return 1;
96167+}
96168+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
96169+#endif
96170+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
96171+int grsec_enable_sysfs_restrict = 1;
96172+static int __init setup_grsec_sysfs_restrict(char *str)
96173+{
96174+ if (!simple_strtol(str, NULL, 0))
96175+ grsec_enable_sysfs_restrict = 0;
96176+ return 1;
96177+}
96178+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
96179+#endif
96180+
96181+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
96182+unsigned long pax_user_shadow_base __read_only;
96183+EXPORT_SYMBOL(pax_user_shadow_base);
96184+extern char pax_enter_kernel_user[];
96185+extern char pax_exit_kernel_user[];
96186+#endif
96187+
96188+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
96189+static int __init setup_pax_nouderef(char *str)
96190+{
96191+#ifdef CONFIG_X86_32
96192+ unsigned int cpu;
96193+ struct desc_struct *gdt;
96194+
96195+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
96196+ gdt = get_cpu_gdt_table(cpu);
96197+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
96198+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
96199+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
96200+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
96201+ }
96202+ loadsegment(ds, __KERNEL_DS);
96203+ loadsegment(es, __KERNEL_DS);
96204+ loadsegment(ss, __KERNEL_DS);
96205+#else
96206+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
96207+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
96208+ clone_pgd_mask = ~(pgdval_t)0UL;
96209+ pax_user_shadow_base = 0UL;
96210+ setup_clear_cpu_cap(X86_FEATURE_PCID);
96211+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
96212+#endif
96213+
96214+ return 0;
96215+}
96216+early_param("pax_nouderef", setup_pax_nouderef);
96217+
96218+#ifdef CONFIG_X86_64
96219+static int __init setup_pax_weakuderef(char *str)
96220+{
96221+ if (clone_pgd_mask != ~(pgdval_t)0UL)
96222+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
96223+ return 1;
96224+}
96225+__setup("pax_weakuderef", setup_pax_weakuderef);
96226+#endif
96227+#endif
96228+
96229+#ifdef CONFIG_PAX_SOFTMODE
96230+int pax_softmode;
96231+
96232+static int __init setup_pax_softmode(char *str)
96233+{
96234+ get_option(&str, &pax_softmode);
96235+ return 1;
96236+}
96237+__setup("pax_softmode=", setup_pax_softmode);
96238+#endif
96239+
96240 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
96241 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
96242 static const char *panic_later, *panic_param;
96243@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
96244 struct blacklist_entry *entry;
96245 char *fn_name;
96246
96247- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
96248+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
96249 if (!fn_name)
96250 return false;
96251
96252@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
96253 {
96254 int count = preempt_count();
96255 int ret;
96256- char msgbuf[64];
96257+ const char *msg1 = "", *msg2 = "";
96258
96259 if (initcall_blacklisted(fn))
96260 return -EPERM;
96261@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
96262 else
96263 ret = fn();
96264
96265- msgbuf[0] = 0;
96266-
96267 if (preempt_count() != count) {
96268- sprintf(msgbuf, "preemption imbalance ");
96269+ msg1 = " preemption imbalance";
96270 preempt_count_set(count);
96271 }
96272 if (irqs_disabled()) {
96273- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
96274+ msg2 = " disabled interrupts";
96275 local_irq_enable();
96276 }
96277- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
96278+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
96279
96280+ add_latent_entropy();
96281 return ret;
96282 }
96283
96284@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
96285 {
96286 argv_init[0] = init_filename;
96287 return do_execve(getname_kernel(init_filename),
96288- (const char __user *const __user *)argv_init,
96289- (const char __user *const __user *)envp_init);
96290+ (const char __user *const __force_user *)argv_init,
96291+ (const char __user *const __force_user *)envp_init);
96292 }
96293
96294 static int try_to_run_init_process(const char *init_filename)
96295@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
96296 return ret;
96297 }
96298
96299+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96300+extern int gr_init_ran;
96301+#endif
96302+
96303 static noinline void __init kernel_init_freeable(void);
96304
96305 static int __ref kernel_init(void *unused)
96306@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
96307 ramdisk_execute_command, ret);
96308 }
96309
96310+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96311+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
96312+ gr_init_ran = 1;
96313+#endif
96314+
96315 /*
96316 * We try each of these until one succeeds.
96317 *
96318@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
96319 do_basic_setup();
96320
96321 /* Open the /dev/console on the rootfs, this should never fail */
96322- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
96323+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
96324 pr_err("Warning: unable to open an initial console.\n");
96325
96326 (void) sys_dup(0);
96327@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
96328 if (!ramdisk_execute_command)
96329 ramdisk_execute_command = "/init";
96330
96331- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
96332+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
96333 ramdisk_execute_command = NULL;
96334 prepare_namespace();
96335 }
96336
96337+ grsecurity_init();
96338+
96339 /*
96340 * Ok, we have completed the initial bootup, and
96341 * we're essentially up and running. Get rid of the
96342diff --git a/ipc/compat.c b/ipc/compat.c
96343index 9b3c85f..5266b0f 100644
96344--- a/ipc/compat.c
96345+++ b/ipc/compat.c
96346@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
96347 COMPAT_SHMLBA);
96348 if (err < 0)
96349 return err;
96350- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
96351+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
96352 }
96353 case SHMDT:
96354 return sys_shmdt(compat_ptr(ptr));
96355@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
96356 }
96357
96358 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
96359- unsigned, nsops,
96360+ compat_long_t, nsops,
96361 const struct compat_timespec __user *, timeout)
96362 {
96363 struct timespec __user *ts64;
96364diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
96365index 8ad93c2..efd80f8 100644
96366--- a/ipc/ipc_sysctl.c
96367+++ b/ipc/ipc_sysctl.c
96368@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
96369 static int proc_ipc_dointvec(struct ctl_table *table, int write,
96370 void __user *buffer, size_t *lenp, loff_t *ppos)
96371 {
96372- struct ctl_table ipc_table;
96373+ ctl_table_no_const ipc_table;
96374
96375 memcpy(&ipc_table, table, sizeof(ipc_table));
96376 ipc_table.data = get_ipc(table);
96377@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
96378 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
96379 void __user *buffer, size_t *lenp, loff_t *ppos)
96380 {
96381- struct ctl_table ipc_table;
96382+ ctl_table_no_const ipc_table;
96383
96384 memcpy(&ipc_table, table, sizeof(ipc_table));
96385 ipc_table.data = get_ipc(table);
96386@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
96387 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96388 void __user *buffer, size_t *lenp, loff_t *ppos)
96389 {
96390- struct ctl_table ipc_table;
96391+ ctl_table_no_const ipc_table;
96392 memcpy(&ipc_table, table, sizeof(ipc_table));
96393 ipc_table.data = get_ipc(table);
96394
96395@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96396 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
96397 void __user *buffer, size_t *lenp, loff_t *ppos)
96398 {
96399- struct ctl_table ipc_table;
96400+ ctl_table_no_const ipc_table;
96401 int dummy = 0;
96402
96403 memcpy(&ipc_table, table, sizeof(ipc_table));
96404diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
96405index 68d4e95..1477ded 100644
96406--- a/ipc/mq_sysctl.c
96407+++ b/ipc/mq_sysctl.c
96408@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
96409 static int proc_mq_dointvec(struct ctl_table *table, int write,
96410 void __user *buffer, size_t *lenp, loff_t *ppos)
96411 {
96412- struct ctl_table mq_table;
96413+ ctl_table_no_const mq_table;
96414 memcpy(&mq_table, table, sizeof(mq_table));
96415 mq_table.data = get_mq(table);
96416
96417@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
96418 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
96419 void __user *buffer, size_t *lenp, loff_t *ppos)
96420 {
96421- struct ctl_table mq_table;
96422+ ctl_table_no_const mq_table;
96423 memcpy(&mq_table, table, sizeof(mq_table));
96424 mq_table.data = get_mq(table);
96425
96426diff --git a/ipc/mqueue.c b/ipc/mqueue.c
96427index 7635a1c..7432cb6 100644
96428--- a/ipc/mqueue.c
96429+++ b/ipc/mqueue.c
96430@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
96431 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
96432 info->attr.mq_msgsize);
96433
96434+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
96435 spin_lock(&mq_lock);
96436 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
96437 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
96438diff --git a/ipc/sem.c b/ipc/sem.c
96439index 9284211..bca5b1b 100644
96440--- a/ipc/sem.c
96441+++ b/ipc/sem.c
96442@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
96443 }
96444
96445 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
96446- unsigned, nsops, const struct timespec __user *, timeout)
96447+ long, nsops, const struct timespec __user *, timeout)
96448 {
96449 int error = -EINVAL;
96450 struct sem_array *sma;
96451@@ -2015,7 +2015,7 @@ out_free:
96452 }
96453
96454 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
96455- unsigned, nsops)
96456+ long, nsops)
96457 {
96458 return sys_semtimedop(semid, tsops, nsops, NULL);
96459 }
96460diff --git a/ipc/shm.c b/ipc/shm.c
96461index 19633b4..d454904 100644
96462--- a/ipc/shm.c
96463+++ b/ipc/shm.c
96464@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
96465 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
96466 #endif
96467
96468+#ifdef CONFIG_GRKERNSEC
96469+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96470+ const u64 shm_createtime, const kuid_t cuid,
96471+ const int shmid);
96472+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96473+ const u64 shm_createtime);
96474+#endif
96475+
96476 void shm_init_ns(struct ipc_namespace *ns)
96477 {
96478 ns->shm_ctlmax = SHMMAX;
96479@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
96480 shp->shm_lprid = 0;
96481 shp->shm_atim = shp->shm_dtim = 0;
96482 shp->shm_ctim = get_seconds();
96483+#ifdef CONFIG_GRKERNSEC
96484+ shp->shm_createtime = ktime_get_ns();
96485+#endif
96486 shp->shm_segsz = size;
96487 shp->shm_nattch = 0;
96488 shp->shm_file = file;
96489@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96490 f_mode = FMODE_READ | FMODE_WRITE;
96491 }
96492 if (shmflg & SHM_EXEC) {
96493+
96494+#ifdef CONFIG_PAX_MPROTECT
96495+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
96496+ goto out;
96497+#endif
96498+
96499 prot |= PROT_EXEC;
96500 acc_mode |= S_IXUGO;
96501 }
96502@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96503 if (err)
96504 goto out_unlock;
96505
96506+#ifdef CONFIG_GRKERNSEC
96507+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
96508+ shp->shm_perm.cuid, shmid) ||
96509+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
96510+ err = -EACCES;
96511+ goto out_unlock;
96512+ }
96513+#endif
96514+
96515 ipc_lock_object(&shp->shm_perm);
96516
96517 /* check if shm_destroy() is tearing down shp */
96518@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96519 path = shp->shm_file->f_path;
96520 path_get(&path);
96521 shp->shm_nattch++;
96522+#ifdef CONFIG_GRKERNSEC
96523+ shp->shm_lapid = current->pid;
96524+#endif
96525 size = i_size_read(path.dentry->d_inode);
96526 ipc_unlock_object(&shp->shm_perm);
96527 rcu_read_unlock();
96528diff --git a/ipc/util.c b/ipc/util.c
96529index 106bed0..f851429 100644
96530--- a/ipc/util.c
96531+++ b/ipc/util.c
96532@@ -71,6 +71,8 @@ struct ipc_proc_iface {
96533 int (*show)(struct seq_file *, void *);
96534 };
96535
96536+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
96537+
96538 /**
96539 * ipc_init - initialise ipc subsystem
96540 *
96541@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
96542 granted_mode >>= 6;
96543 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
96544 granted_mode >>= 3;
96545+
96546+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
96547+ return -1;
96548+
96549 /* is there some bit set in requested_mode but not in granted_mode? */
96550 if ((requested_mode & ~granted_mode & 0007) &&
96551 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
96552diff --git a/kernel/audit.c b/kernel/audit.c
96553index 72ab759..757deba 100644
96554--- a/kernel/audit.c
96555+++ b/kernel/audit.c
96556@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
96557 3) suppressed due to audit_rate_limit
96558 4) suppressed due to audit_backlog_limit
96559 */
96560-static atomic_t audit_lost = ATOMIC_INIT(0);
96561+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
96562
96563 /* The netlink socket. */
96564 static struct sock *audit_sock;
96565@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
96566 unsigned long now;
96567 int print;
96568
96569- atomic_inc(&audit_lost);
96570+ atomic_inc_unchecked(&audit_lost);
96571
96572 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
96573
96574@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
96575 if (print) {
96576 if (printk_ratelimit())
96577 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
96578- atomic_read(&audit_lost),
96579+ atomic_read_unchecked(&audit_lost),
96580 audit_rate_limit,
96581 audit_backlog_limit);
96582 audit_panic(message);
96583@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
96584 s.pid = audit_pid;
96585 s.rate_limit = audit_rate_limit;
96586 s.backlog_limit = audit_backlog_limit;
96587- s.lost = atomic_read(&audit_lost);
96588+ s.lost = atomic_read_unchecked(&audit_lost);
96589 s.backlog = skb_queue_len(&audit_skb_queue);
96590 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
96591 s.backlog_wait_time = audit_backlog_wait_time;
96592diff --git a/kernel/auditsc.c b/kernel/auditsc.c
96593index dc4ae70..2a2bddc 100644
96594--- a/kernel/auditsc.c
96595+++ b/kernel/auditsc.c
96596@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
96597 }
96598
96599 /* global counter which is incremented every time something logs in */
96600-static atomic_t session_id = ATOMIC_INIT(0);
96601+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
96602
96603 static int audit_set_loginuid_perm(kuid_t loginuid)
96604 {
96605@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
96606
96607 /* are we setting or clearing? */
96608 if (uid_valid(loginuid))
96609- sessionid = (unsigned int)atomic_inc_return(&session_id);
96610+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
96611
96612 task->sessionid = sessionid;
96613 task->loginuid = loginuid;
96614diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
96615index 0c5796e..a9414e2 100644
96616--- a/kernel/bpf/core.c
96617+++ b/kernel/bpf/core.c
96618@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96619 * random section of illegal instructions.
96620 */
96621 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
96622- hdr = module_alloc(size);
96623+ hdr = module_alloc_exec(size);
96624 if (hdr == NULL)
96625 return NULL;
96626
96627 /* Fill space with illegal/arch-dep instructions. */
96628 bpf_fill_ill_insns(hdr, size);
96629
96630+ pax_open_kernel();
96631 hdr->pages = size / PAGE_SIZE;
96632+ pax_close_kernel();
96633+
96634 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
96635 PAGE_SIZE - sizeof(*hdr));
96636 start = (prandom_u32() % hole) & ~(alignment - 1);
96637@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96638
96639 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
96640 {
96641- module_memfree(hdr);
96642+ module_memfree_exec(hdr);
96643 }
96644 #endif /* CONFIG_BPF_JIT */
96645
96646diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
96647index 536edc2..d28c85d 100644
96648--- a/kernel/bpf/syscall.c
96649+++ b/kernel/bpf/syscall.c
96650@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
96651 int err;
96652
96653 /* the syscall is limited to root temporarily. This restriction will be
96654- * lifted when security audit is clean. Note that eBPF+tracing must have
96655- * this restriction, since it may pass kernel data to user space
96656+ * lifted by upstream when a half-assed security audit is clean. Note
96657+ * that eBPF+tracing must have this restriction, since it may pass
96658+ * kernel data to user space
96659 */
96660 if (!capable(CAP_SYS_ADMIN))
96661 return -EPERM;
96662+#ifdef CONFIG_GRKERNSEC
96663+ return -EPERM;
96664+#endif
96665
96666 if (!access_ok(VERIFY_READ, uattr, 1))
96667 return -EFAULT;
96668diff --git a/kernel/capability.c b/kernel/capability.c
96669index 989f5bf..d317ca0 100644
96670--- a/kernel/capability.c
96671+++ b/kernel/capability.c
96672@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
96673 * before modification is attempted and the application
96674 * fails.
96675 */
96676+ if (tocopy > ARRAY_SIZE(kdata))
96677+ return -EFAULT;
96678+
96679 if (copy_to_user(dataptr, kdata, tocopy
96680 * sizeof(struct __user_cap_data_struct))) {
96681 return -EFAULT;
96682@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
96683 int ret;
96684
96685 rcu_read_lock();
96686- ret = security_capable(__task_cred(t), ns, cap);
96687+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
96688+ gr_task_is_capable(t, __task_cred(t), cap);
96689 rcu_read_unlock();
96690
96691- return (ret == 0);
96692+ return ret;
96693 }
96694
96695 /**
96696@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
96697 int ret;
96698
96699 rcu_read_lock();
96700- ret = security_capable_noaudit(__task_cred(t), ns, cap);
96701+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
96702 rcu_read_unlock();
96703
96704- return (ret == 0);
96705+ return ret;
96706 }
96707
96708 /**
96709@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
96710 BUG();
96711 }
96712
96713- if (security_capable(current_cred(), ns, cap) == 0) {
96714+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
96715 current->flags |= PF_SUPERPRIV;
96716 return true;
96717 }
96718@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
96719 }
96720 EXPORT_SYMBOL(ns_capable);
96721
96722+bool ns_capable_nolog(struct user_namespace *ns, int cap)
96723+{
96724+ if (unlikely(!cap_valid(cap))) {
96725+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
96726+ BUG();
96727+ }
96728+
96729+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
96730+ current->flags |= PF_SUPERPRIV;
96731+ return true;
96732+ }
96733+ return false;
96734+}
96735+EXPORT_SYMBOL(ns_capable_nolog);
96736+
96737 /**
96738 * file_ns_capable - Determine if the file's opener had a capability in effect
96739 * @file: The file we want to check
96740@@ -427,6 +446,12 @@ bool capable(int cap)
96741 }
96742 EXPORT_SYMBOL(capable);
96743
96744+bool capable_nolog(int cap)
96745+{
96746+ return ns_capable_nolog(&init_user_ns, cap);
96747+}
96748+EXPORT_SYMBOL(capable_nolog);
96749+
96750 /**
96751 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
96752 * @inode: The inode in question
96753@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
96754 kgid_has_mapping(ns, inode->i_gid);
96755 }
96756 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
96757+
96758+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
96759+{
96760+ struct user_namespace *ns = current_user_ns();
96761+
96762+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
96763+ kgid_has_mapping(ns, inode->i_gid);
96764+}
96765+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
96766diff --git a/kernel/cgroup.c b/kernel/cgroup.c
96767index 29a7b2c..a64e30a 100644
96768--- a/kernel/cgroup.c
96769+++ b/kernel/cgroup.c
96770@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
96771 if (!pathbuf || !agentbuf)
96772 goto out;
96773
96774+ if (agentbuf[0] == '\0')
96775+ goto out;
96776+
96777 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
96778 if (!path)
96779 goto out;
96780@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
96781 struct task_struct *task;
96782 int count = 0;
96783
96784- seq_printf(seq, "css_set %p\n", cset);
96785+ seq_printf(seq, "css_set %pK\n", cset);
96786
96787 list_for_each_entry(task, &cset->tasks, cg_list) {
96788 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
96789diff --git a/kernel/compat.c b/kernel/compat.c
96790index 24f0061..762ec00 100644
96791--- a/kernel/compat.c
96792+++ b/kernel/compat.c
96793@@ -13,6 +13,7 @@
96794
96795 #include <linux/linkage.h>
96796 #include <linux/compat.h>
96797+#include <linux/module.h>
96798 #include <linux/errno.h>
96799 #include <linux/time.h>
96800 #include <linux/signal.h>
96801@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
96802 mm_segment_t oldfs;
96803 long ret;
96804
96805- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
96806+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
96807 oldfs = get_fs();
96808 set_fs(KERNEL_DS);
96809 ret = hrtimer_nanosleep_restart(restart);
96810@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
96811 oldfs = get_fs();
96812 set_fs(KERNEL_DS);
96813 ret = hrtimer_nanosleep(&tu,
96814- rmtp ? (struct timespec __user *)&rmt : NULL,
96815+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
96816 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
96817 set_fs(oldfs);
96818
96819@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
96820 mm_segment_t old_fs = get_fs();
96821
96822 set_fs(KERNEL_DS);
96823- ret = sys_sigpending((old_sigset_t __user *) &s);
96824+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
96825 set_fs(old_fs);
96826 if (ret == 0)
96827 ret = put_user(s, set);
96828@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
96829 mm_segment_t old_fs = get_fs();
96830
96831 set_fs(KERNEL_DS);
96832- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
96833+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
96834 set_fs(old_fs);
96835
96836 if (!ret) {
96837@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
96838 set_fs (KERNEL_DS);
96839 ret = sys_wait4(pid,
96840 (stat_addr ?
96841- (unsigned int __user *) &status : NULL),
96842- options, (struct rusage __user *) &r);
96843+ (unsigned int __force_user *) &status : NULL),
96844+ options, (struct rusage __force_user *) &r);
96845 set_fs (old_fs);
96846
96847 if (ret > 0) {
96848@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
96849 memset(&info, 0, sizeof(info));
96850
96851 set_fs(KERNEL_DS);
96852- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
96853- uru ? (struct rusage __user *)&ru : NULL);
96854+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
96855+ uru ? (struct rusage __force_user *)&ru : NULL);
96856 set_fs(old_fs);
96857
96858 if ((ret < 0) || (info.si_signo == 0))
96859@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
96860 oldfs = get_fs();
96861 set_fs(KERNEL_DS);
96862 err = sys_timer_settime(timer_id, flags,
96863- (struct itimerspec __user *) &newts,
96864- (struct itimerspec __user *) &oldts);
96865+ (struct itimerspec __force_user *) &newts,
96866+ (struct itimerspec __force_user *) &oldts);
96867 set_fs(oldfs);
96868 if (!err && old && put_compat_itimerspec(old, &oldts))
96869 return -EFAULT;
96870@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
96871 oldfs = get_fs();
96872 set_fs(KERNEL_DS);
96873 err = sys_timer_gettime(timer_id,
96874- (struct itimerspec __user *) &ts);
96875+ (struct itimerspec __force_user *) &ts);
96876 set_fs(oldfs);
96877 if (!err && put_compat_itimerspec(setting, &ts))
96878 return -EFAULT;
96879@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
96880 oldfs = get_fs();
96881 set_fs(KERNEL_DS);
96882 err = sys_clock_settime(which_clock,
96883- (struct timespec __user *) &ts);
96884+ (struct timespec __force_user *) &ts);
96885 set_fs(oldfs);
96886 return err;
96887 }
96888@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
96889 oldfs = get_fs();
96890 set_fs(KERNEL_DS);
96891 err = sys_clock_gettime(which_clock,
96892- (struct timespec __user *) &ts);
96893+ (struct timespec __force_user *) &ts);
96894 set_fs(oldfs);
96895 if (!err && compat_put_timespec(&ts, tp))
96896 return -EFAULT;
96897@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
96898
96899 oldfs = get_fs();
96900 set_fs(KERNEL_DS);
96901- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
96902+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
96903 set_fs(oldfs);
96904
96905 err = compat_put_timex(utp, &txc);
96906@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
96907 oldfs = get_fs();
96908 set_fs(KERNEL_DS);
96909 err = sys_clock_getres(which_clock,
96910- (struct timespec __user *) &ts);
96911+ (struct timespec __force_user *) &ts);
96912 set_fs(oldfs);
96913 if (!err && tp && compat_put_timespec(&ts, tp))
96914 return -EFAULT;
96915@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
96916 struct timespec tu;
96917 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
96918
96919- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
96920+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
96921 oldfs = get_fs();
96922 set_fs(KERNEL_DS);
96923 err = clock_nanosleep_restart(restart);
96924@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
96925 oldfs = get_fs();
96926 set_fs(KERNEL_DS);
96927 err = sys_clock_nanosleep(which_clock, flags,
96928- (struct timespec __user *) &in,
96929- (struct timespec __user *) &out);
96930+ (struct timespec __force_user *) &in,
96931+ (struct timespec __force_user *) &out);
96932 set_fs(oldfs);
96933
96934 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
96935@@ -912,7 +913,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
96936 * bitmap. We must however ensure the end of the
96937 * kernel bitmap is zeroed.
96938 */
96939- if (nr_compat_longs-- > 0) {
96940+ if (nr_compat_longs) {
96941+ nr_compat_longs--;
96942 if (__get_user(um, umask))
96943 return -EFAULT;
96944 } else {
96945@@ -954,7 +956,8 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
96946 * We dont want to write past the end of the userspace
96947 * bitmap.
96948 */
96949- if (nr_compat_longs-- > 0) {
96950+ if (nr_compat_longs) {
96951+ nr_compat_longs--;
96952 if (__put_user(um, umask))
96953 return -EFAULT;
96954 }
96955@@ -1145,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
96956 mm_segment_t old_fs = get_fs();
96957
96958 set_fs(KERNEL_DS);
96959- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
96960+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
96961 set_fs(old_fs);
96962 if (compat_put_timespec(&t, interval))
96963 return -EFAULT;
96964diff --git a/kernel/configs.c b/kernel/configs.c
96965index c18b1f1..b9a0132 100644
96966--- a/kernel/configs.c
96967+++ b/kernel/configs.c
96968@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
96969 struct proc_dir_entry *entry;
96970
96971 /* create the current config file */
96972+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
96973+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
96974+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
96975+ &ikconfig_file_ops);
96976+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96977+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
96978+ &ikconfig_file_ops);
96979+#endif
96980+#else
96981 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
96982 &ikconfig_file_ops);
96983+#endif
96984+
96985 if (!entry)
96986 return -ENOMEM;
96987
96988diff --git a/kernel/cred.c b/kernel/cred.c
96989index e0573a4..26c0fd3 100644
96990--- a/kernel/cred.c
96991+++ b/kernel/cred.c
96992@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
96993 validate_creds(cred);
96994 alter_cred_subscribers(cred, -1);
96995 put_cred(cred);
96996+
96997+#ifdef CONFIG_GRKERNSEC_SETXID
96998+ cred = (struct cred *) tsk->delayed_cred;
96999+ if (cred != NULL) {
97000+ tsk->delayed_cred = NULL;
97001+ validate_creds(cred);
97002+ alter_cred_subscribers(cred, -1);
97003+ put_cred(cred);
97004+ }
97005+#endif
97006 }
97007
97008 /**
97009@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
97010 * Always returns 0 thus allowing this function to be tail-called at the end
97011 * of, say, sys_setgid().
97012 */
97013-int commit_creds(struct cred *new)
97014+static int __commit_creds(struct cred *new)
97015 {
97016 struct task_struct *task = current;
97017 const struct cred *old = task->real_cred;
97018@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
97019
97020 get_cred(new); /* we will require a ref for the subj creds too */
97021
97022+ gr_set_role_label(task, new->uid, new->gid);
97023+
97024 /* dumpability changes */
97025 if (!uid_eq(old->euid, new->euid) ||
97026 !gid_eq(old->egid, new->egid) ||
97027@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
97028 put_cred(old);
97029 return 0;
97030 }
97031+#ifdef CONFIG_GRKERNSEC_SETXID
97032+extern int set_user(struct cred *new);
97033+
97034+void gr_delayed_cred_worker(void)
97035+{
97036+ const struct cred *new = current->delayed_cred;
97037+ struct cred *ncred;
97038+
97039+ current->delayed_cred = NULL;
97040+
97041+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
97042+ // from doing get_cred on it when queueing this
97043+ put_cred(new);
97044+ return;
97045+ } else if (new == NULL)
97046+ return;
97047+
97048+ ncred = prepare_creds();
97049+ if (!ncred)
97050+ goto die;
97051+ // uids
97052+ ncred->uid = new->uid;
97053+ ncred->euid = new->euid;
97054+ ncred->suid = new->suid;
97055+ ncred->fsuid = new->fsuid;
97056+ // gids
97057+ ncred->gid = new->gid;
97058+ ncred->egid = new->egid;
97059+ ncred->sgid = new->sgid;
97060+ ncred->fsgid = new->fsgid;
97061+ // groups
97062+ set_groups(ncred, new->group_info);
97063+ // caps
97064+ ncred->securebits = new->securebits;
97065+ ncred->cap_inheritable = new->cap_inheritable;
97066+ ncred->cap_permitted = new->cap_permitted;
97067+ ncred->cap_effective = new->cap_effective;
97068+ ncred->cap_bset = new->cap_bset;
97069+
97070+ if (set_user(ncred)) {
97071+ abort_creds(ncred);
97072+ goto die;
97073+ }
97074+
97075+ // from doing get_cred on it when queueing this
97076+ put_cred(new);
97077+
97078+ __commit_creds(ncred);
97079+ return;
97080+die:
97081+ // from doing get_cred on it when queueing this
97082+ put_cred(new);
97083+ do_group_exit(SIGKILL);
97084+}
97085+#endif
97086+
97087+int commit_creds(struct cred *new)
97088+{
97089+#ifdef CONFIG_GRKERNSEC_SETXID
97090+ int ret;
97091+ int schedule_it = 0;
97092+ struct task_struct *t;
97093+ unsigned oldsecurebits = current_cred()->securebits;
97094+
97095+ /* we won't get called with tasklist_lock held for writing
97096+ and interrupts disabled as the cred struct in that case is
97097+ init_cred
97098+ */
97099+ if (grsec_enable_setxid && !current_is_single_threaded() &&
97100+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
97101+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
97102+ schedule_it = 1;
97103+ }
97104+ ret = __commit_creds(new);
97105+ if (schedule_it) {
97106+ rcu_read_lock();
97107+ read_lock(&tasklist_lock);
97108+ for (t = next_thread(current); t != current;
97109+ t = next_thread(t)) {
97110+ /* we'll check if the thread has uid 0 in
97111+ * the delayed worker routine
97112+ */
97113+ if (task_securebits(t) == oldsecurebits &&
97114+ t->delayed_cred == NULL) {
97115+ t->delayed_cred = get_cred(new);
97116+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
97117+ set_tsk_need_resched(t);
97118+ }
97119+ }
97120+ read_unlock(&tasklist_lock);
97121+ rcu_read_unlock();
97122+ }
97123+
97124+ return ret;
97125+#else
97126+ return __commit_creds(new);
97127+#endif
97128+}
97129+
97130 EXPORT_SYMBOL(commit_creds);
97131
97132 /**
97133diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
97134index 0874e2e..5b32cc9 100644
97135--- a/kernel/debug/debug_core.c
97136+++ b/kernel/debug/debug_core.c
97137@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
97138 */
97139 static atomic_t masters_in_kgdb;
97140 static atomic_t slaves_in_kgdb;
97141-static atomic_t kgdb_break_tasklet_var;
97142+static atomic_unchecked_t kgdb_break_tasklet_var;
97143 atomic_t kgdb_setting_breakpoint;
97144
97145 struct task_struct *kgdb_usethread;
97146@@ -137,7 +137,7 @@ int kgdb_single_step;
97147 static pid_t kgdb_sstep_pid;
97148
97149 /* to keep track of the CPU which is doing the single stepping*/
97150-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97151+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97152
97153 /*
97154 * If you are debugging a problem where roundup (the collection of
97155@@ -552,7 +552,7 @@ return_normal:
97156 * kernel will only try for the value of sstep_tries before
97157 * giving up and continuing on.
97158 */
97159- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
97160+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
97161 (kgdb_info[cpu].task &&
97162 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
97163 atomic_set(&kgdb_active, -1);
97164@@ -654,8 +654,8 @@ cpu_master_loop:
97165 }
97166
97167 kgdb_restore:
97168- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
97169- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
97170+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
97171+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
97172 if (kgdb_info[sstep_cpu].task)
97173 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
97174 else
97175@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
97176 static void kgdb_tasklet_bpt(unsigned long ing)
97177 {
97178 kgdb_breakpoint();
97179- atomic_set(&kgdb_break_tasklet_var, 0);
97180+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
97181 }
97182
97183 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
97184
97185 void kgdb_schedule_breakpoint(void)
97186 {
97187- if (atomic_read(&kgdb_break_tasklet_var) ||
97188+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
97189 atomic_read(&kgdb_active) != -1 ||
97190 atomic_read(&kgdb_setting_breakpoint))
97191 return;
97192- atomic_inc(&kgdb_break_tasklet_var);
97193+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
97194 tasklet_schedule(&kgdb_tasklet_breakpoint);
97195 }
97196 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
97197diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
97198index 41213454..861e178 100644
97199--- a/kernel/debug/kdb/kdb_main.c
97200+++ b/kernel/debug/kdb/kdb_main.c
97201@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
97202 continue;
97203
97204 kdb_printf("%-20s%8u 0x%p ", mod->name,
97205- mod->core_size, (void *)mod);
97206+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
97207 #ifdef CONFIG_MODULE_UNLOAD
97208 kdb_printf("%4d ", module_refcount(mod));
97209 #endif
97210@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
97211 kdb_printf(" (Loading)");
97212 else
97213 kdb_printf(" (Live)");
97214- kdb_printf(" 0x%p", mod->module_core);
97215+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
97216
97217 #ifdef CONFIG_MODULE_UNLOAD
97218 {
97219diff --git a/kernel/events/core.c b/kernel/events/core.c
97220index 2fabc06..79cceec 100644
97221--- a/kernel/events/core.c
97222+++ b/kernel/events/core.c
97223@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
97224 * 0 - disallow raw tracepoint access for unpriv
97225 * 1 - disallow cpu events for unpriv
97226 * 2 - disallow kernel profiling for unpriv
97227+ * 3 - disallow all unpriv perf event use
97228 */
97229-int sysctl_perf_event_paranoid __read_mostly = 1;
97230+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97231+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
97232+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
97233+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
97234+#else
97235+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
97236+#endif
97237
97238 /* Minimum for 512 kiB + 1 user control page */
97239 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
97240@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
97241
97242 tmp *= sysctl_perf_cpu_time_max_percent;
97243 do_div(tmp, 100);
97244- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
97245+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
97246 }
97247
97248 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
97249@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
97250 }
97251 }
97252
97253-static atomic64_t perf_event_id;
97254+static atomic64_unchecked_t perf_event_id;
97255
97256 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
97257 enum event_type_t event_type);
97258@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
97259
97260 static inline u64 perf_event_count(struct perf_event *event)
97261 {
97262- return local64_read(&event->count) + atomic64_read(&event->child_count);
97263+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
97264 }
97265
97266 static u64 perf_event_read(struct perf_event *event)
97267@@ -3656,9 +3663,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
97268 mutex_lock(&event->child_mutex);
97269 total += perf_event_read(event);
97270 *enabled += event->total_time_enabled +
97271- atomic64_read(&event->child_total_time_enabled);
97272+ atomic64_read_unchecked(&event->child_total_time_enabled);
97273 *running += event->total_time_running +
97274- atomic64_read(&event->child_total_time_running);
97275+ atomic64_read_unchecked(&event->child_total_time_running);
97276
97277 list_for_each_entry(child, &event->child_list, child_list) {
97278 total += perf_event_read(child);
97279@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
97280 userpg->offset -= local64_read(&event->hw.prev_count);
97281
97282 userpg->time_enabled = enabled +
97283- atomic64_read(&event->child_total_time_enabled);
97284+ atomic64_read_unchecked(&event->child_total_time_enabled);
97285
97286 userpg->time_running = running +
97287- atomic64_read(&event->child_total_time_running);
97288+ atomic64_read_unchecked(&event->child_total_time_running);
97289
97290 arch_perf_update_userpage(event, userpg, now);
97291
97292@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
97293
97294 /* Data. */
97295 sp = perf_user_stack_pointer(regs);
97296- rem = __output_copy_user(handle, (void *) sp, dump_size);
97297+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
97298 dyn_size = dump_size - rem;
97299
97300 perf_output_skip(handle, rem);
97301@@ -4831,11 +4838,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
97302 values[n++] = perf_event_count(event);
97303 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
97304 values[n++] = enabled +
97305- atomic64_read(&event->child_total_time_enabled);
97306+ atomic64_read_unchecked(&event->child_total_time_enabled);
97307 }
97308 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
97309 values[n++] = running +
97310- atomic64_read(&event->child_total_time_running);
97311+ atomic64_read_unchecked(&event->child_total_time_running);
97312 }
97313 if (read_format & PERF_FORMAT_ID)
97314 values[n++] = primary_event_id(event);
97315@@ -7180,7 +7187,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
97316 event->parent = parent_event;
97317
97318 event->ns = get_pid_ns(task_active_pid_ns(current));
97319- event->id = atomic64_inc_return(&perf_event_id);
97320+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
97321
97322 event->state = PERF_EVENT_STATE_INACTIVE;
97323
97324@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
97325 if (flags & ~PERF_FLAG_ALL)
97326 return -EINVAL;
97327
97328+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97329+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
97330+ return -EACCES;
97331+#endif
97332+
97333 err = perf_copy_attr(attr_uptr, &attr);
97334 if (err)
97335 return err;
97336@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
97337 /*
97338 * Add back the child's count to the parent's count:
97339 */
97340- atomic64_add(child_val, &parent_event->child_count);
97341- atomic64_add(child_event->total_time_enabled,
97342+ atomic64_add_unchecked(child_val, &parent_event->child_count);
97343+ atomic64_add_unchecked(child_event->total_time_enabled,
97344 &parent_event->child_total_time_enabled);
97345- atomic64_add(child_event->total_time_running,
97346+ atomic64_add_unchecked(child_event->total_time_running,
97347 &parent_event->child_total_time_running);
97348
97349 /*
97350diff --git a/kernel/events/internal.h b/kernel/events/internal.h
97351index 569b2187..19940d9 100644
97352--- a/kernel/events/internal.h
97353+++ b/kernel/events/internal.h
97354@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
97355 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
97356 }
97357
97358-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
97359+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
97360 static inline unsigned long \
97361 func_name(struct perf_output_handle *handle, \
97362- const void *buf, unsigned long len) \
97363+ const void user *buf, unsigned long len) \
97364 { \
97365 unsigned long size, written; \
97366 \
97367@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
97368 return 0;
97369 }
97370
97371-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
97372+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
97373
97374 static inline unsigned long
97375 memcpy_skip(void *dst, const void *src, unsigned long n)
97376@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
97377 return 0;
97378 }
97379
97380-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
97381+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
97382
97383 #ifndef arch_perf_out_copy_user
97384 #define arch_perf_out_copy_user arch_perf_out_copy_user
97385@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
97386 }
97387 #endif
97388
97389-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
97390+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
97391
97392 /* Callchain handling */
97393 extern struct perf_callchain_entry *
97394diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
97395index cb346f2..e4dc317 100644
97396--- a/kernel/events/uprobes.c
97397+++ b/kernel/events/uprobes.c
97398@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
97399 {
97400 struct page *page;
97401 uprobe_opcode_t opcode;
97402- int result;
97403+ long result;
97404
97405 pagefault_disable();
97406 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
97407diff --git a/kernel/exit.c b/kernel/exit.c
97408index feff10b..f623dd5 100644
97409--- a/kernel/exit.c
97410+++ b/kernel/exit.c
97411@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
97412 struct task_struct *leader;
97413 int zap_leader;
97414 repeat:
97415+#ifdef CONFIG_NET
97416+ gr_del_task_from_ip_table(p);
97417+#endif
97418+
97419 /* don't need to get the RCU readlock here - the process is dead and
97420 * can't be modifying its own credentials. But shut RCU-lockdep up */
97421 rcu_read_lock();
97422@@ -656,6 +660,8 @@ void do_exit(long code)
97423 int group_dead;
97424 TASKS_RCU(int tasks_rcu_i);
97425
97426+ set_fs(USER_DS);
97427+
97428 profile_task_exit(tsk);
97429
97430 WARN_ON(blk_needs_flush_plug(tsk));
97431@@ -672,7 +678,6 @@ void do_exit(long code)
97432 * mm_release()->clear_child_tid() from writing to a user-controlled
97433 * kernel address.
97434 */
97435- set_fs(USER_DS);
97436
97437 ptrace_event(PTRACE_EVENT_EXIT, code);
97438
97439@@ -730,6 +735,9 @@ void do_exit(long code)
97440 tsk->exit_code = code;
97441 taskstats_exit(tsk, group_dead);
97442
97443+ gr_acl_handle_psacct(tsk, code);
97444+ gr_acl_handle_exit();
97445+
97446 exit_mm(tsk);
97447
97448 if (group_dead)
97449@@ -849,7 +857,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
97450 * Take down every thread in the group. This is called by fatal signals
97451 * as well as by sys_exit_group (below).
97452 */
97453-void
97454+__noreturn void
97455 do_group_exit(int exit_code)
97456 {
97457 struct signal_struct *sig = current->signal;
97458diff --git a/kernel/fork.c b/kernel/fork.c
97459index cf65139..704476e 100644
97460--- a/kernel/fork.c
97461+++ b/kernel/fork.c
97462@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
97463 void thread_info_cache_init(void)
97464 {
97465 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
97466- THREAD_SIZE, 0, NULL);
97467+ THREAD_SIZE, SLAB_USERCOPY, NULL);
97468 BUG_ON(thread_info_cache == NULL);
97469 }
97470 # endif
97471 #endif
97472
97473+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97474+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97475+ int node, void **lowmem_stack)
97476+{
97477+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
97478+ void *ret = NULL;
97479+ unsigned int i;
97480+
97481+ *lowmem_stack = alloc_thread_info_node(tsk, node);
97482+ if (*lowmem_stack == NULL)
97483+ goto out;
97484+
97485+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
97486+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
97487+
97488+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
97489+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
97490+ if (ret == NULL) {
97491+ free_thread_info(*lowmem_stack);
97492+ *lowmem_stack = NULL;
97493+ }
97494+
97495+out:
97496+ return ret;
97497+}
97498+
97499+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97500+{
97501+ unmap_process_stacks(tsk);
97502+}
97503+#else
97504+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97505+ int node, void **lowmem_stack)
97506+{
97507+ return alloc_thread_info_node(tsk, node);
97508+}
97509+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97510+{
97511+ free_thread_info(ti);
97512+}
97513+#endif
97514+
97515 /* SLAB cache for signal_struct structures (tsk->signal) */
97516 static struct kmem_cache *signal_cachep;
97517
97518@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
97519 /* SLAB cache for mm_struct structures (tsk->mm) */
97520 static struct kmem_cache *mm_cachep;
97521
97522-static void account_kernel_stack(struct thread_info *ti, int account)
97523+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
97524 {
97525+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97526+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
97527+#else
97528 struct zone *zone = page_zone(virt_to_page(ti));
97529+#endif
97530
97531 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
97532 }
97533
97534 void free_task(struct task_struct *tsk)
97535 {
97536- account_kernel_stack(tsk->stack, -1);
97537+ account_kernel_stack(tsk, tsk->stack, -1);
97538 arch_release_thread_info(tsk->stack);
97539- free_thread_info(tsk->stack);
97540+ gr_free_thread_info(tsk, tsk->stack);
97541 rt_mutex_debug_task_free(tsk);
97542 ftrace_graph_exit_task(tsk);
97543 put_seccomp_filter(tsk);
97544@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97545 {
97546 struct task_struct *tsk;
97547 struct thread_info *ti;
97548+ void *lowmem_stack;
97549 int node = tsk_fork_get_node(orig);
97550 int err;
97551
97552@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97553 if (!tsk)
97554 return NULL;
97555
97556- ti = alloc_thread_info_node(tsk, node);
97557+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
97558 if (!ti)
97559 goto free_tsk;
97560
97561@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97562 goto free_ti;
97563
97564 tsk->stack = ti;
97565+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97566+ tsk->lowmem_stack = lowmem_stack;
97567+#endif
97568 #ifdef CONFIG_SECCOMP
97569 /*
97570 * We must handle setting up seccomp filters once we're under
97571@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97572 set_task_stack_end_magic(tsk);
97573
97574 #ifdef CONFIG_CC_STACKPROTECTOR
97575- tsk->stack_canary = get_random_int();
97576+ tsk->stack_canary = pax_get_random_long();
97577 #endif
97578
97579 /*
97580@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97581 tsk->splice_pipe = NULL;
97582 tsk->task_frag.page = NULL;
97583
97584- account_kernel_stack(ti, 1);
97585+ account_kernel_stack(tsk, ti, 1);
97586
97587 return tsk;
97588
97589 free_ti:
97590- free_thread_info(ti);
97591+ gr_free_thread_info(tsk, ti);
97592 free_tsk:
97593 free_task_struct(tsk);
97594 return NULL;
97595 }
97596
97597 #ifdef CONFIG_MMU
97598-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97599+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
97600+{
97601+ struct vm_area_struct *tmp;
97602+ unsigned long charge;
97603+ struct file *file;
97604+ int retval;
97605+
97606+ charge = 0;
97607+ if (mpnt->vm_flags & VM_ACCOUNT) {
97608+ unsigned long len = vma_pages(mpnt);
97609+
97610+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97611+ goto fail_nomem;
97612+ charge = len;
97613+ }
97614+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97615+ if (!tmp)
97616+ goto fail_nomem;
97617+ *tmp = *mpnt;
97618+ tmp->vm_mm = mm;
97619+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
97620+ retval = vma_dup_policy(mpnt, tmp);
97621+ if (retval)
97622+ goto fail_nomem_policy;
97623+ if (anon_vma_fork(tmp, mpnt))
97624+ goto fail_nomem_anon_vma_fork;
97625+ tmp->vm_flags &= ~VM_LOCKED;
97626+ tmp->vm_next = tmp->vm_prev = NULL;
97627+ tmp->vm_mirror = NULL;
97628+ file = tmp->vm_file;
97629+ if (file) {
97630+ struct inode *inode = file_inode(file);
97631+ struct address_space *mapping = file->f_mapping;
97632+
97633+ get_file(file);
97634+ if (tmp->vm_flags & VM_DENYWRITE)
97635+ atomic_dec(&inode->i_writecount);
97636+ i_mmap_lock_write(mapping);
97637+ if (tmp->vm_flags & VM_SHARED)
97638+ atomic_inc(&mapping->i_mmap_writable);
97639+ flush_dcache_mmap_lock(mapping);
97640+ /* insert tmp into the share list, just after mpnt */
97641+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
97642+ flush_dcache_mmap_unlock(mapping);
97643+ i_mmap_unlock_write(mapping);
97644+ }
97645+
97646+ /*
97647+ * Clear hugetlb-related page reserves for children. This only
97648+ * affects MAP_PRIVATE mappings. Faults generated by the child
97649+ * are not guaranteed to succeed, even if read-only
97650+ */
97651+ if (is_vm_hugetlb_page(tmp))
97652+ reset_vma_resv_huge_pages(tmp);
97653+
97654+ return tmp;
97655+
97656+fail_nomem_anon_vma_fork:
97657+ mpol_put(vma_policy(tmp));
97658+fail_nomem_policy:
97659+ kmem_cache_free(vm_area_cachep, tmp);
97660+fail_nomem:
97661+ vm_unacct_memory(charge);
97662+ return NULL;
97663+}
97664+
97665+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97666 {
97667 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
97668 struct rb_node **rb_link, *rb_parent;
97669 int retval;
97670- unsigned long charge;
97671
97672 uprobe_start_dup_mmap();
97673 down_write(&oldmm->mmap_sem);
97674@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97675
97676 prev = NULL;
97677 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
97678- struct file *file;
97679-
97680 if (mpnt->vm_flags & VM_DONTCOPY) {
97681 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
97682 -vma_pages(mpnt));
97683 continue;
97684 }
97685- charge = 0;
97686- if (mpnt->vm_flags & VM_ACCOUNT) {
97687- unsigned long len = vma_pages(mpnt);
97688-
97689- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97690- goto fail_nomem;
97691- charge = len;
97692- }
97693- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97694- if (!tmp)
97695- goto fail_nomem;
97696- *tmp = *mpnt;
97697- INIT_LIST_HEAD(&tmp->anon_vma_chain);
97698- retval = vma_dup_policy(mpnt, tmp);
97699- if (retval)
97700- goto fail_nomem_policy;
97701- tmp->vm_mm = mm;
97702- if (anon_vma_fork(tmp, mpnt))
97703- goto fail_nomem_anon_vma_fork;
97704- tmp->vm_flags &= ~VM_LOCKED;
97705- tmp->vm_next = tmp->vm_prev = NULL;
97706- file = tmp->vm_file;
97707- if (file) {
97708- struct inode *inode = file_inode(file);
97709- struct address_space *mapping = file->f_mapping;
97710-
97711- get_file(file);
97712- if (tmp->vm_flags & VM_DENYWRITE)
97713- atomic_dec(&inode->i_writecount);
97714- i_mmap_lock_write(mapping);
97715- if (tmp->vm_flags & VM_SHARED)
97716- atomic_inc(&mapping->i_mmap_writable);
97717- flush_dcache_mmap_lock(mapping);
97718- /* insert tmp into the share list, just after mpnt */
97719- vma_interval_tree_insert_after(tmp, mpnt,
97720- &mapping->i_mmap);
97721- flush_dcache_mmap_unlock(mapping);
97722- i_mmap_unlock_write(mapping);
97723+ tmp = dup_vma(mm, oldmm, mpnt);
97724+ if (!tmp) {
97725+ retval = -ENOMEM;
97726+ goto out;
97727 }
97728
97729 /*
97730@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97731 if (retval)
97732 goto out;
97733 }
97734+
97735+#ifdef CONFIG_PAX_SEGMEXEC
97736+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
97737+ struct vm_area_struct *mpnt_m;
97738+
97739+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
97740+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
97741+
97742+ if (!mpnt->vm_mirror)
97743+ continue;
97744+
97745+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
97746+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
97747+ mpnt->vm_mirror = mpnt_m;
97748+ } else {
97749+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
97750+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
97751+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
97752+ mpnt->vm_mirror->vm_mirror = mpnt;
97753+ }
97754+ }
97755+ BUG_ON(mpnt_m);
97756+ }
97757+#endif
97758+
97759 /* a new mm has just been created */
97760 arch_dup_mmap(oldmm, mm);
97761 retval = 0;
97762@@ -482,14 +586,6 @@ out:
97763 up_write(&oldmm->mmap_sem);
97764 uprobe_end_dup_mmap();
97765 return retval;
97766-fail_nomem_anon_vma_fork:
97767- mpol_put(vma_policy(tmp));
97768-fail_nomem_policy:
97769- kmem_cache_free(vm_area_cachep, tmp);
97770-fail_nomem:
97771- retval = -ENOMEM;
97772- vm_unacct_memory(charge);
97773- goto out;
97774 }
97775
97776 static inline int mm_alloc_pgd(struct mm_struct *mm)
97777@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
97778 return ERR_PTR(err);
97779
97780 mm = get_task_mm(task);
97781- if (mm && mm != current->mm &&
97782- !ptrace_may_access(task, mode)) {
97783+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
97784+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
97785 mmput(mm);
97786 mm = ERR_PTR(-EACCES);
97787 }
97788@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
97789 spin_unlock(&fs->lock);
97790 return -EAGAIN;
97791 }
97792- fs->users++;
97793+ atomic_inc(&fs->users);
97794 spin_unlock(&fs->lock);
97795 return 0;
97796 }
97797 tsk->fs = copy_fs_struct(fs);
97798 if (!tsk->fs)
97799 return -ENOMEM;
97800+ /* Carry through gr_chroot_dentry and is_chrooted instead
97801+ of recomputing it here. Already copied when the task struct
97802+ is duplicated. This allows pivot_root to not be treated as
97803+ a chroot
97804+ */
97805+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
97806+
97807 return 0;
97808 }
97809
97810@@ -1187,7 +1290,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
97811 * parts of the process environment (as per the clone
97812 * flags). The actual kick-off is left to the caller.
97813 */
97814-static struct task_struct *copy_process(unsigned long clone_flags,
97815+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
97816 unsigned long stack_start,
97817 unsigned long stack_size,
97818 int __user *child_tidptr,
97819@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
97820 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
97821 #endif
97822 retval = -EAGAIN;
97823+
97824+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
97825+
97826 if (atomic_read(&p->real_cred->user->processes) >=
97827 task_rlimit(p, RLIMIT_NPROC)) {
97828 if (p->real_cred->user != INIT_USER &&
97829@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
97830 goto bad_fork_free_pid;
97831 }
97832
97833+ /* synchronizes with gr_set_acls()
97834+ we need to call this past the point of no return for fork()
97835+ */
97836+ gr_copy_label(p);
97837+
97838 if (likely(p->pid)) {
97839 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
97840
97841@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
97842 bad_fork_free:
97843 free_task(p);
97844 fork_out:
97845+ gr_log_forkfail(retval);
97846+
97847 return ERR_PTR(retval);
97848 }
97849
97850@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
97851
97852 p = copy_process(clone_flags, stack_start, stack_size,
97853 child_tidptr, NULL, trace);
97854+ add_latent_entropy();
97855 /*
97856 * Do this prior waking up the new thread - the thread pointer
97857 * might get invalid after that point, if the thread exits quickly.
97858@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
97859 if (clone_flags & CLONE_PARENT_SETTID)
97860 put_user(nr, parent_tidptr);
97861
97862+ gr_handle_brute_check();
97863+
97864 if (clone_flags & CLONE_VFORK) {
97865 p->vfork_done = &vfork;
97866 init_completion(&vfork);
97867@@ -1792,7 +1908,7 @@ void __init proc_caches_init(void)
97868 mm_cachep = kmem_cache_create("mm_struct",
97869 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
97870 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
97871- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
97872+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
97873 mmap_init();
97874 nsproxy_cache_init();
97875 }
97876@@ -1832,7 +1948,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
97877 return 0;
97878
97879 /* don't need lock here; in the worst case we'll do useless copy */
97880- if (fs->users == 1)
97881+ if (atomic_read(&fs->users) == 1)
97882 return 0;
97883
97884 *new_fsp = copy_fs_struct(fs);
97885@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
97886 fs = current->fs;
97887 spin_lock(&fs->lock);
97888 current->fs = new_fs;
97889- if (--fs->users)
97890+ gr_set_chroot_entries(current, &current->fs->root);
97891+ if (atomic_dec_return(&fs->users))
97892 new_fs = NULL;
97893 else
97894 new_fs = fs;
97895diff --git a/kernel/futex.c b/kernel/futex.c
97896index 2a5e383..878bac6 100644
97897--- a/kernel/futex.c
97898+++ b/kernel/futex.c
97899@@ -201,7 +201,7 @@ struct futex_pi_state {
97900 atomic_t refcount;
97901
97902 union futex_key key;
97903-};
97904+} __randomize_layout;
97905
97906 /**
97907 * struct futex_q - The hashed futex queue entry, one per waiting task
97908@@ -235,7 +235,7 @@ struct futex_q {
97909 struct rt_mutex_waiter *rt_waiter;
97910 union futex_key *requeue_pi_key;
97911 u32 bitset;
97912-};
97913+} __randomize_layout;
97914
97915 static const struct futex_q futex_q_init = {
97916 /* list gets initialized in queue_me()*/
97917@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
97918 struct page *page, *page_head;
97919 int err, ro = 0;
97920
97921+#ifdef CONFIG_PAX_SEGMEXEC
97922+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
97923+ return -EFAULT;
97924+#endif
97925+
97926 /*
97927 * The futex address must be "naturally" aligned.
97928 */
97929@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
97930
97931 static int get_futex_value_locked(u32 *dest, u32 __user *from)
97932 {
97933- int ret;
97934+ unsigned long ret;
97935
97936 pagefault_disable();
97937 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
97938@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
97939 {
97940 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
97941 u32 curval;
97942+ mm_segment_t oldfs;
97943
97944 /*
97945 * This will fail and we want it. Some arch implementations do
97946@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
97947 * implementation, the non-functional ones will return
97948 * -ENOSYS.
97949 */
97950+ oldfs = get_fs();
97951+ set_fs(USER_DS);
97952 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
97953 futex_cmpxchg_enabled = 1;
97954+ set_fs(oldfs);
97955 #endif
97956 }
97957
97958diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
97959index 55c8c93..9ba7ad6 100644
97960--- a/kernel/futex_compat.c
97961+++ b/kernel/futex_compat.c
97962@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
97963 return 0;
97964 }
97965
97966-static void __user *futex_uaddr(struct robust_list __user *entry,
97967+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
97968 compat_long_t futex_offset)
97969 {
97970 compat_uptr_t base = ptr_to_compat(entry);
97971diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
97972index b358a80..fc25240 100644
97973--- a/kernel/gcov/base.c
97974+++ b/kernel/gcov/base.c
97975@@ -114,11 +114,6 @@ void gcov_enable_events(void)
97976 }
97977
97978 #ifdef CONFIG_MODULES
97979-static inline int within(void *addr, void *start, unsigned long size)
97980-{
97981- return ((addr >= start) && (addr < start + size));
97982-}
97983-
97984 /* Update list and generate events when modules are unloaded. */
97985 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
97986 void *data)
97987@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
97988
97989 /* Remove entries located in module from linked list. */
97990 while ((info = gcov_info_next(info))) {
97991- if (within(info, mod->module_core, mod->core_size)) {
97992+ if (within_module_core_rw((unsigned long)info, mod)) {
97993 gcov_info_unlink(prev, info);
97994 if (gcov_events_enabled)
97995 gcov_event(GCOV_REMOVE, info);
97996diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
97997index 886d09e..c7ff4e5 100644
97998--- a/kernel/irq/manage.c
97999+++ b/kernel/irq/manage.c
98000@@ -874,7 +874,7 @@ static int irq_thread(void *data)
98001
98002 action_ret = handler_fn(desc, action);
98003 if (action_ret == IRQ_HANDLED)
98004- atomic_inc(&desc->threads_handled);
98005+ atomic_inc_unchecked(&desc->threads_handled);
98006
98007 wake_threads_waitq(desc);
98008 }
98009diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
98010index e2514b0..de3dfe0 100644
98011--- a/kernel/irq/spurious.c
98012+++ b/kernel/irq/spurious.c
98013@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
98014 * count. We just care about the count being
98015 * different than the one we saw before.
98016 */
98017- handled = atomic_read(&desc->threads_handled);
98018+ handled = atomic_read_unchecked(&desc->threads_handled);
98019 handled |= SPURIOUS_DEFERRED;
98020 if (handled != desc->threads_handled_last) {
98021 action_ret = IRQ_HANDLED;
98022diff --git a/kernel/jump_label.c b/kernel/jump_label.c
98023index 9019f15..9a3c42e 100644
98024--- a/kernel/jump_label.c
98025+++ b/kernel/jump_label.c
98026@@ -14,6 +14,7 @@
98027 #include <linux/err.h>
98028 #include <linux/static_key.h>
98029 #include <linux/jump_label_ratelimit.h>
98030+#include <linux/mm.h>
98031
98032 #ifdef HAVE_JUMP_LABEL
98033
98034@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
98035
98036 size = (((unsigned long)stop - (unsigned long)start)
98037 / sizeof(struct jump_entry));
98038+ pax_open_kernel();
98039 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
98040+ pax_close_kernel();
98041 }
98042
98043 static void jump_label_update(struct static_key *key, int enable);
98044@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
98045 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
98046 struct jump_entry *iter;
98047
98048+ pax_open_kernel();
98049 for (iter = iter_start; iter < iter_stop; iter++) {
98050 if (within_module_init(iter->code, mod))
98051 iter->code = 0;
98052 }
98053+ pax_close_kernel();
98054 }
98055
98056 static int
98057diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
98058index 5c5987f..bc502b0 100644
98059--- a/kernel/kallsyms.c
98060+++ b/kernel/kallsyms.c
98061@@ -11,6 +11,9 @@
98062 * Changed the compression method from stem compression to "table lookup"
98063 * compression (see scripts/kallsyms.c for a more complete description)
98064 */
98065+#ifdef CONFIG_GRKERNSEC_HIDESYM
98066+#define __INCLUDED_BY_HIDESYM 1
98067+#endif
98068 #include <linux/kallsyms.h>
98069 #include <linux/module.h>
98070 #include <linux/init.h>
98071@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
98072
98073 static inline int is_kernel_inittext(unsigned long addr)
98074 {
98075+ if (system_state != SYSTEM_BOOTING)
98076+ return 0;
98077+
98078 if (addr >= (unsigned long)_sinittext
98079 && addr <= (unsigned long)_einittext)
98080 return 1;
98081 return 0;
98082 }
98083
98084+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98085+#ifdef CONFIG_MODULES
98086+static inline int is_module_text(unsigned long addr)
98087+{
98088+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
98089+ return 1;
98090+
98091+ addr = ktla_ktva(addr);
98092+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
98093+}
98094+#else
98095+static inline int is_module_text(unsigned long addr)
98096+{
98097+ return 0;
98098+}
98099+#endif
98100+#endif
98101+
98102 static inline int is_kernel_text(unsigned long addr)
98103 {
98104 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
98105@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
98106
98107 static inline int is_kernel(unsigned long addr)
98108 {
98109+
98110+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98111+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
98112+ return 1;
98113+
98114+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
98115+#else
98116 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
98117+#endif
98118+
98119 return 1;
98120 return in_gate_area_no_mm(addr);
98121 }
98122
98123 static int is_ksym_addr(unsigned long addr)
98124 {
98125+
98126+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98127+ if (is_module_text(addr))
98128+ return 0;
98129+#endif
98130+
98131 if (all_var)
98132 return is_kernel(addr);
98133
98134@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
98135
98136 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
98137 {
98138- iter->name[0] = '\0';
98139 iter->nameoff = get_symbol_offset(new_pos);
98140 iter->pos = new_pos;
98141 }
98142@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
98143 {
98144 struct kallsym_iter *iter = m->private;
98145
98146+#ifdef CONFIG_GRKERNSEC_HIDESYM
98147+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
98148+ return 0;
98149+#endif
98150+
98151 /* Some debugging symbols have no name. Ignore them. */
98152 if (!iter->name[0])
98153 return 0;
98154@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
98155 */
98156 type = iter->exported ? toupper(iter->type) :
98157 tolower(iter->type);
98158+
98159 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
98160 type, iter->name, iter->module_name);
98161 } else
98162diff --git a/kernel/kcmp.c b/kernel/kcmp.c
98163index 0aa69ea..a7fcafb 100644
98164--- a/kernel/kcmp.c
98165+++ b/kernel/kcmp.c
98166@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
98167 struct task_struct *task1, *task2;
98168 int ret;
98169
98170+#ifdef CONFIG_GRKERNSEC
98171+ return -ENOSYS;
98172+#endif
98173+
98174 rcu_read_lock();
98175
98176 /*
98177diff --git a/kernel/kexec.c b/kernel/kexec.c
98178index 38c25b1..12b3f69 100644
98179--- a/kernel/kexec.c
98180+++ b/kernel/kexec.c
98181@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
98182 compat_ulong_t, flags)
98183 {
98184 struct compat_kexec_segment in;
98185- struct kexec_segment out, __user *ksegments;
98186+ struct kexec_segment out;
98187+ struct kexec_segment __user *ksegments;
98188 unsigned long i, result;
98189
98190 /* Don't allow clients that don't understand the native
98191diff --git a/kernel/kmod.c b/kernel/kmod.c
98192index 2777f40..a689506 100644
98193--- a/kernel/kmod.c
98194+++ b/kernel/kmod.c
98195@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
98196 kfree(info->argv);
98197 }
98198
98199-static int call_modprobe(char *module_name, int wait)
98200+static int call_modprobe(char *module_name, char *module_param, int wait)
98201 {
98202 struct subprocess_info *info;
98203 static char *envp[] = {
98204@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
98205 NULL
98206 };
98207
98208- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
98209+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
98210 if (!argv)
98211 goto out;
98212
98213@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
98214 argv[1] = "-q";
98215 argv[2] = "--";
98216 argv[3] = module_name; /* check free_modprobe_argv() */
98217- argv[4] = NULL;
98218+ argv[4] = module_param;
98219+ argv[5] = NULL;
98220
98221 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
98222 NULL, free_modprobe_argv, NULL);
98223@@ -122,9 +123,8 @@ out:
98224 * If module auto-loading support is disabled then this function
98225 * becomes a no-operation.
98226 */
98227-int __request_module(bool wait, const char *fmt, ...)
98228+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
98229 {
98230- va_list args;
98231 char module_name[MODULE_NAME_LEN];
98232 unsigned int max_modprobes;
98233 int ret;
98234@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
98235 if (!modprobe_path[0])
98236 return 0;
98237
98238- va_start(args, fmt);
98239- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
98240- va_end(args);
98241+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
98242 if (ret >= MODULE_NAME_LEN)
98243 return -ENAMETOOLONG;
98244
98245@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
98246 if (ret)
98247 return ret;
98248
98249+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98250+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98251+ /* hack to workaround consolekit/udisks stupidity */
98252+ read_lock(&tasklist_lock);
98253+ if (!strcmp(current->comm, "mount") &&
98254+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
98255+ read_unlock(&tasklist_lock);
98256+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
98257+ return -EPERM;
98258+ }
98259+ read_unlock(&tasklist_lock);
98260+ }
98261+#endif
98262+
98263 /* If modprobe needs a service that is in a module, we get a recursive
98264 * loop. Limit the number of running kmod threads to max_threads/2 or
98265 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
98266@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
98267
98268 trace_module_request(module_name, wait, _RET_IP_);
98269
98270- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98271+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98272
98273 atomic_dec(&kmod_concurrent);
98274 return ret;
98275 }
98276+
98277+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
98278+{
98279+ va_list args;
98280+ int ret;
98281+
98282+ va_start(args, fmt);
98283+ ret = ____request_module(wait, module_param, fmt, args);
98284+ va_end(args);
98285+
98286+ return ret;
98287+}
98288+
98289+int __request_module(bool wait, const char *fmt, ...)
98290+{
98291+ va_list args;
98292+ int ret;
98293+
98294+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98295+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98296+ char module_param[MODULE_NAME_LEN];
98297+
98298+ memset(module_param, 0, sizeof(module_param));
98299+
98300+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
98301+
98302+ va_start(args, fmt);
98303+ ret = ____request_module(wait, module_param, fmt, args);
98304+ va_end(args);
98305+
98306+ return ret;
98307+ }
98308+#endif
98309+
98310+ va_start(args, fmt);
98311+ ret = ____request_module(wait, NULL, fmt, args);
98312+ va_end(args);
98313+
98314+ return ret;
98315+}
98316+
98317 EXPORT_SYMBOL(__request_module);
98318 #endif /* CONFIG_MODULES */
98319
98320 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
98321 {
98322+#ifdef CONFIG_GRKERNSEC
98323+ kfree(info->path);
98324+ info->path = info->origpath;
98325+#endif
98326 if (info->cleanup)
98327 (*info->cleanup)(info);
98328 kfree(info);
98329@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
98330 */
98331 set_user_nice(current, 0);
98332
98333+#ifdef CONFIG_GRKERNSEC
98334+ /* this is race-free as far as userland is concerned as we copied
98335+ out the path to be used prior to this point and are now operating
98336+ on that copy
98337+ */
98338+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
98339+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
98340+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
98341+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
98342+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
98343+ retval = -EPERM;
98344+ goto out;
98345+ }
98346+#endif
98347+
98348 retval = -ENOMEM;
98349 new = prepare_kernel_cred(current);
98350 if (!new)
98351@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
98352 commit_creds(new);
98353
98354 retval = do_execve(getname_kernel(sub_info->path),
98355- (const char __user *const __user *)sub_info->argv,
98356- (const char __user *const __user *)sub_info->envp);
98357+ (const char __user *const __force_user *)sub_info->argv,
98358+ (const char __user *const __force_user *)sub_info->envp);
98359 out:
98360 sub_info->retval = retval;
98361 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
98362@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
98363 *
98364 * Thus the __user pointer cast is valid here.
98365 */
98366- sys_wait4(pid, (int __user *)&ret, 0, NULL);
98367+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
98368
98369 /*
98370 * If ret is 0, either ____call_usermodehelper failed and the
98371@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
98372 goto out;
98373
98374 INIT_WORK(&sub_info->work, __call_usermodehelper);
98375+#ifdef CONFIG_GRKERNSEC
98376+ sub_info->origpath = path;
98377+ sub_info->path = kstrdup(path, gfp_mask);
98378+#else
98379 sub_info->path = path;
98380+#endif
98381 sub_info->argv = argv;
98382 sub_info->envp = envp;
98383
98384@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
98385 static int proc_cap_handler(struct ctl_table *table, int write,
98386 void __user *buffer, size_t *lenp, loff_t *ppos)
98387 {
98388- struct ctl_table t;
98389+ ctl_table_no_const t;
98390 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
98391 kernel_cap_t new_cap;
98392 int err, i;
98393diff --git a/kernel/kprobes.c b/kernel/kprobes.c
98394index c90e417..e6c515d 100644
98395--- a/kernel/kprobes.c
98396+++ b/kernel/kprobes.c
98397@@ -31,6 +31,9 @@
98398 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
98399 * <prasanna@in.ibm.com> added function-return probes.
98400 */
98401+#ifdef CONFIG_GRKERNSEC_HIDESYM
98402+#define __INCLUDED_BY_HIDESYM 1
98403+#endif
98404 #include <linux/kprobes.h>
98405 #include <linux/hash.h>
98406 #include <linux/init.h>
98407@@ -122,12 +125,12 @@ enum kprobe_slot_state {
98408
98409 static void *alloc_insn_page(void)
98410 {
98411- return module_alloc(PAGE_SIZE);
98412+ return module_alloc_exec(PAGE_SIZE);
98413 }
98414
98415 static void free_insn_page(void *page)
98416 {
98417- module_memfree(page);
98418+ module_memfree_exec(page);
98419 }
98420
98421 struct kprobe_insn_cache kprobe_insn_slots = {
98422@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
98423 kprobe_type = "k";
98424
98425 if (sym)
98426- seq_printf(pi, "%p %s %s+0x%x %s ",
98427+ seq_printf(pi, "%pK %s %s+0x%x %s ",
98428 p->addr, kprobe_type, sym, offset,
98429 (modname ? modname : " "));
98430 else
98431- seq_printf(pi, "%p %s %p ",
98432+ seq_printf(pi, "%pK %s %pK ",
98433 p->addr, kprobe_type, p->addr);
98434
98435 if (!pp)
98436diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
98437index 6683cce..daf8999 100644
98438--- a/kernel/ksysfs.c
98439+++ b/kernel/ksysfs.c
98440@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
98441 {
98442 if (count+1 > UEVENT_HELPER_PATH_LEN)
98443 return -ENOENT;
98444+ if (!capable(CAP_SYS_ADMIN))
98445+ return -EPERM;
98446 memcpy(uevent_helper, buf, count);
98447 uevent_helper[count] = '\0';
98448 if (count && uevent_helper[count-1] == '\n')
98449@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
98450 return count;
98451 }
98452
98453-static struct bin_attribute notes_attr = {
98454+static bin_attribute_no_const notes_attr __read_only = {
98455 .attr = {
98456 .name = "notes",
98457 .mode = S_IRUGO,
98458diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
98459index ba77ab5..d6a3e20 100644
98460--- a/kernel/locking/lockdep.c
98461+++ b/kernel/locking/lockdep.c
98462@@ -599,6 +599,10 @@ static int static_obj(void *obj)
98463 end = (unsigned long) &_end,
98464 addr = (unsigned long) obj;
98465
98466+#ifdef CONFIG_PAX_KERNEXEC
98467+ start = ktla_ktva(start);
98468+#endif
98469+
98470 /*
98471 * static variable?
98472 */
98473@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
98474 if (!static_obj(lock->key)) {
98475 debug_locks_off();
98476 printk("INFO: trying to register non-static key.\n");
98477+ printk("lock:%pS key:%pS.\n", lock, lock->key);
98478 printk("the code is fine but needs lockdep annotation.\n");
98479 printk("turning off the locking correctness validator.\n");
98480 dump_stack();
98481@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
98482 if (!class)
98483 return 0;
98484 }
98485- atomic_inc((atomic_t *)&class->ops);
98486+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
98487 if (very_verbose(class)) {
98488 printk("\nacquire class [%p] %s", class->key, class->name);
98489 if (class->name_version > 1)
98490diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
98491index ef43ac4..2720dfa 100644
98492--- a/kernel/locking/lockdep_proc.c
98493+++ b/kernel/locking/lockdep_proc.c
98494@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
98495 return 0;
98496 }
98497
98498- seq_printf(m, "%p", class->key);
98499+ seq_printf(m, "%pK", class->key);
98500 #ifdef CONFIG_DEBUG_LOCKDEP
98501 seq_printf(m, " OPS:%8ld", class->ops);
98502 #endif
98503@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
98504
98505 list_for_each_entry(entry, &class->locks_after, entry) {
98506 if (entry->distance == 1) {
98507- seq_printf(m, " -> [%p] ", entry->class->key);
98508+ seq_printf(m, " -> [%pK] ", entry->class->key);
98509 print_name(m, entry->class);
98510 seq_puts(m, "\n");
98511 }
98512@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
98513 if (!class->key)
98514 continue;
98515
98516- seq_printf(m, "[%p] ", class->key);
98517+ seq_printf(m, "[%pK] ", class->key);
98518 print_name(m, class);
98519 seq_puts(m, "\n");
98520 }
98521@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98522 if (!i)
98523 seq_line(m, '-', 40-namelen, namelen);
98524
98525- snprintf(ip, sizeof(ip), "[<%p>]",
98526+ snprintf(ip, sizeof(ip), "[<%pK>]",
98527 (void *)class->contention_point[i]);
98528 seq_printf(m, "%40s %14lu %29s %pS\n",
98529 name, stats->contention_point[i],
98530@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98531 if (!i)
98532 seq_line(m, '-', 40-namelen, namelen);
98533
98534- snprintf(ip, sizeof(ip), "[<%p>]",
98535+ snprintf(ip, sizeof(ip), "[<%pK>]",
98536 (void *)class->contending_point[i]);
98537 seq_printf(m, "%40s %14lu %29s %pS\n",
98538 name, stats->contending_point[i],
98539diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
98540index d1fe2ba..180cd65e 100644
98541--- a/kernel/locking/mcs_spinlock.h
98542+++ b/kernel/locking/mcs_spinlock.h
98543@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
98544 */
98545 return;
98546 }
98547- ACCESS_ONCE(prev->next) = node;
98548+ ACCESS_ONCE_RW(prev->next) = node;
98549
98550 /* Wait until the lock holder passes the lock down. */
98551 arch_mcs_spin_lock_contended(&node->locked);
98552diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
98553index 3ef3736..9c951fa 100644
98554--- a/kernel/locking/mutex-debug.c
98555+++ b/kernel/locking/mutex-debug.c
98556@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
98557 }
98558
98559 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98560- struct thread_info *ti)
98561+ struct task_struct *task)
98562 {
98563 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
98564
98565 /* Mark the current thread as blocked on the lock: */
98566- ti->task->blocked_on = waiter;
98567+ task->blocked_on = waiter;
98568 }
98569
98570 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98571- struct thread_info *ti)
98572+ struct task_struct *task)
98573 {
98574 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
98575- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
98576- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
98577- ti->task->blocked_on = NULL;
98578+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
98579+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
98580+ task->blocked_on = NULL;
98581
98582 list_del_init(&waiter->list);
98583 waiter->task = NULL;
98584diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
98585index 0799fd3..d06ae3b 100644
98586--- a/kernel/locking/mutex-debug.h
98587+++ b/kernel/locking/mutex-debug.h
98588@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
98589 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
98590 extern void debug_mutex_add_waiter(struct mutex *lock,
98591 struct mutex_waiter *waiter,
98592- struct thread_info *ti);
98593+ struct task_struct *task);
98594 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98595- struct thread_info *ti);
98596+ struct task_struct *task);
98597 extern void debug_mutex_unlock(struct mutex *lock);
98598 extern void debug_mutex_init(struct mutex *lock, const char *name,
98599 struct lock_class_key *key);
98600diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
98601index 94674e5..de4966f 100644
98602--- a/kernel/locking/mutex.c
98603+++ b/kernel/locking/mutex.c
98604@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98605 goto skip_wait;
98606
98607 debug_mutex_lock_common(lock, &waiter);
98608- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
98609+ debug_mutex_add_waiter(lock, &waiter, task);
98610
98611 /* add waiting tasks to the end of the waitqueue (FIFO): */
98612 list_add_tail(&waiter.list, &lock->wait_list);
98613@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98614 }
98615 __set_task_state(task, TASK_RUNNING);
98616
98617- mutex_remove_waiter(lock, &waiter, current_thread_info());
98618+ mutex_remove_waiter(lock, &waiter, task);
98619 /* set it to 0 if there are no waiters left: */
98620 if (likely(list_empty(&lock->wait_list)))
98621 atomic_set(&lock->count, 0);
98622@@ -610,7 +610,7 @@ skip_wait:
98623 return 0;
98624
98625 err:
98626- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
98627+ mutex_remove_waiter(lock, &waiter, task);
98628 spin_unlock_mutex(&lock->wait_lock, flags);
98629 debug_mutex_free_waiter(&waiter);
98630 mutex_release(&lock->dep_map, 1, ip);
98631diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
98632index c112d00..1946ad9 100644
98633--- a/kernel/locking/osq_lock.c
98634+++ b/kernel/locking/osq_lock.c
98635@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
98636
98637 prev = decode_cpu(old);
98638 node->prev = prev;
98639- ACCESS_ONCE(prev->next) = node;
98640+ ACCESS_ONCE_RW(prev->next) = node;
98641
98642 /*
98643 * Normally @prev is untouchable after the above store; because at that
98644@@ -170,8 +170,8 @@ unqueue:
98645 * it will wait in Step-A.
98646 */
98647
98648- ACCESS_ONCE(next->prev) = prev;
98649- ACCESS_ONCE(prev->next) = next;
98650+ ACCESS_ONCE_RW(next->prev) = prev;
98651+ ACCESS_ONCE_RW(prev->next) = next;
98652
98653 return false;
98654 }
98655@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
98656 node = this_cpu_ptr(&osq_node);
98657 next = xchg(&node->next, NULL);
98658 if (next) {
98659- ACCESS_ONCE(next->locked) = 1;
98660+ ACCESS_ONCE_RW(next->locked) = 1;
98661 return;
98662 }
98663
98664 next = osq_wait_next(lock, node, NULL);
98665 if (next)
98666- ACCESS_ONCE(next->locked) = 1;
98667+ ACCESS_ONCE_RW(next->locked) = 1;
98668 }
98669diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
98670index 1d96dd0..994ff19 100644
98671--- a/kernel/locking/rtmutex-tester.c
98672+++ b/kernel/locking/rtmutex-tester.c
98673@@ -22,7 +22,7 @@
98674 #define MAX_RT_TEST_MUTEXES 8
98675
98676 static spinlock_t rttest_lock;
98677-static atomic_t rttest_event;
98678+static atomic_unchecked_t rttest_event;
98679
98680 struct test_thread_data {
98681 int opcode;
98682@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98683
98684 case RTTEST_LOCKCONT:
98685 td->mutexes[td->opdata] = 1;
98686- td->event = atomic_add_return(1, &rttest_event);
98687+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98688 return 0;
98689
98690 case RTTEST_RESET:
98691@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98692 return 0;
98693
98694 case RTTEST_RESETEVENT:
98695- atomic_set(&rttest_event, 0);
98696+ atomic_set_unchecked(&rttest_event, 0);
98697 return 0;
98698
98699 default:
98700@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98701 return ret;
98702
98703 td->mutexes[id] = 1;
98704- td->event = atomic_add_return(1, &rttest_event);
98705+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98706 rt_mutex_lock(&mutexes[id]);
98707- td->event = atomic_add_return(1, &rttest_event);
98708+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98709 td->mutexes[id] = 4;
98710 return 0;
98711
98712@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98713 return ret;
98714
98715 td->mutexes[id] = 1;
98716- td->event = atomic_add_return(1, &rttest_event);
98717+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98718 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
98719- td->event = atomic_add_return(1, &rttest_event);
98720+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98721 td->mutexes[id] = ret ? 0 : 4;
98722 return ret ? -EINTR : 0;
98723
98724@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98725 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
98726 return ret;
98727
98728- td->event = atomic_add_return(1, &rttest_event);
98729+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98730 rt_mutex_unlock(&mutexes[id]);
98731- td->event = atomic_add_return(1, &rttest_event);
98732+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98733 td->mutexes[id] = 0;
98734 return 0;
98735
98736@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98737 break;
98738
98739 td->mutexes[dat] = 2;
98740- td->event = atomic_add_return(1, &rttest_event);
98741+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98742 break;
98743
98744 default:
98745@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98746 return;
98747
98748 td->mutexes[dat] = 3;
98749- td->event = atomic_add_return(1, &rttest_event);
98750+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98751 break;
98752
98753 case RTTEST_LOCKNOWAIT:
98754@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98755 return;
98756
98757 td->mutexes[dat] = 1;
98758- td->event = atomic_add_return(1, &rttest_event);
98759+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98760 return;
98761
98762 default:
98763diff --git a/kernel/module.c b/kernel/module.c
98764index 538794c..76d7957 100644
98765--- a/kernel/module.c
98766+++ b/kernel/module.c
98767@@ -59,6 +59,7 @@
98768 #include <linux/jump_label.h>
98769 #include <linux/pfn.h>
98770 #include <linux/bsearch.h>
98771+#include <linux/grsecurity.h>
98772 #include <uapi/linux/module.h>
98773 #include "module-internal.h"
98774
98775@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
98776
98777 /* Bounds of module allocation, for speeding __module_address.
98778 * Protected by module_mutex. */
98779-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
98780+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
98781+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
98782
98783 int register_module_notifier(struct notifier_block *nb)
98784 {
98785@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98786 return true;
98787
98788 list_for_each_entry_rcu(mod, &modules, list) {
98789- struct symsearch arr[] = {
98790+ struct symsearch modarr[] = {
98791 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
98792 NOT_GPL_ONLY, false },
98793 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
98794@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98795 if (mod->state == MODULE_STATE_UNFORMED)
98796 continue;
98797
98798- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
98799+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
98800 return true;
98801 }
98802 return false;
98803@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
98804 if (!pcpusec->sh_size)
98805 return 0;
98806
98807- if (align > PAGE_SIZE) {
98808+ if (align-1 >= PAGE_SIZE) {
98809 pr_warn("%s: per-cpu alignment %li > %li\n",
98810 mod->name, align, PAGE_SIZE);
98811 align = PAGE_SIZE;
98812@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
98813 static ssize_t show_coresize(struct module_attribute *mattr,
98814 struct module_kobject *mk, char *buffer)
98815 {
98816- return sprintf(buffer, "%u\n", mk->mod->core_size);
98817+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
98818 }
98819
98820 static struct module_attribute modinfo_coresize =
98821@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
98822 static ssize_t show_initsize(struct module_attribute *mattr,
98823 struct module_kobject *mk, char *buffer)
98824 {
98825- return sprintf(buffer, "%u\n", mk->mod->init_size);
98826+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
98827 }
98828
98829 static struct module_attribute modinfo_initsize =
98830@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
98831 goto bad_version;
98832 }
98833
98834+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
98835+ /*
98836+ * avoid potentially printing jibberish on attempted load
98837+ * of a module randomized with a different seed
98838+ */
98839+ pr_warn("no symbol version for %s\n", symname);
98840+#else
98841 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
98842+#endif
98843 return 0;
98844
98845 bad_version:
98846+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
98847+ /*
98848+ * avoid potentially printing jibberish on attempted load
98849+ * of a module randomized with a different seed
98850+ */
98851+ pr_warn("attempted module disagrees about version of symbol %s\n",
98852+ symname);
98853+#else
98854 pr_warn("%s: disagrees about version of symbol %s\n",
98855 mod->name, symname);
98856+#endif
98857 return 0;
98858 }
98859
98860@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
98861 */
98862 #ifdef CONFIG_SYSFS
98863
98864-#ifdef CONFIG_KALLSYMS
98865+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
98866 static inline bool sect_empty(const Elf_Shdr *sect)
98867 {
98868 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
98869@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
98870 {
98871 unsigned int notes, loaded, i;
98872 struct module_notes_attrs *notes_attrs;
98873- struct bin_attribute *nattr;
98874+ bin_attribute_no_const *nattr;
98875
98876 /* failed to create section attributes, so can't create notes */
98877 if (!mod->sect_attrs)
98878@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
98879 static int module_add_modinfo_attrs(struct module *mod)
98880 {
98881 struct module_attribute *attr;
98882- struct module_attribute *temp_attr;
98883+ module_attribute_no_const *temp_attr;
98884 int error = 0;
98885 int i;
98886
98887@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
98888
98889 static void unset_module_core_ro_nx(struct module *mod)
98890 {
98891- set_page_attributes(mod->module_core + mod->core_text_size,
98892- mod->module_core + mod->core_size,
98893+ set_page_attributes(mod->module_core_rw,
98894+ mod->module_core_rw + mod->core_size_rw,
98895 set_memory_x);
98896- set_page_attributes(mod->module_core,
98897- mod->module_core + mod->core_ro_size,
98898+ set_page_attributes(mod->module_core_rx,
98899+ mod->module_core_rx + mod->core_size_rx,
98900 set_memory_rw);
98901 }
98902
98903 static void unset_module_init_ro_nx(struct module *mod)
98904 {
98905- set_page_attributes(mod->module_init + mod->init_text_size,
98906- mod->module_init + mod->init_size,
98907+ set_page_attributes(mod->module_init_rw,
98908+ mod->module_init_rw + mod->init_size_rw,
98909 set_memory_x);
98910- set_page_attributes(mod->module_init,
98911- mod->module_init + mod->init_ro_size,
98912+ set_page_attributes(mod->module_init_rx,
98913+ mod->module_init_rx + mod->init_size_rx,
98914 set_memory_rw);
98915 }
98916
98917@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
98918 list_for_each_entry_rcu(mod, &modules, list) {
98919 if (mod->state == MODULE_STATE_UNFORMED)
98920 continue;
98921- if ((mod->module_core) && (mod->core_text_size)) {
98922- set_page_attributes(mod->module_core,
98923- mod->module_core + mod->core_text_size,
98924+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
98925+ set_page_attributes(mod->module_core_rx,
98926+ mod->module_core_rx + mod->core_size_rx,
98927 set_memory_rw);
98928 }
98929- if ((mod->module_init) && (mod->init_text_size)) {
98930- set_page_attributes(mod->module_init,
98931- mod->module_init + mod->init_text_size,
98932+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
98933+ set_page_attributes(mod->module_init_rx,
98934+ mod->module_init_rx + mod->init_size_rx,
98935 set_memory_rw);
98936 }
98937 }
98938@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
98939 list_for_each_entry_rcu(mod, &modules, list) {
98940 if (mod->state == MODULE_STATE_UNFORMED)
98941 continue;
98942- if ((mod->module_core) && (mod->core_text_size)) {
98943- set_page_attributes(mod->module_core,
98944- mod->module_core + mod->core_text_size,
98945+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
98946+ set_page_attributes(mod->module_core_rx,
98947+ mod->module_core_rx + mod->core_size_rx,
98948 set_memory_ro);
98949 }
98950- if ((mod->module_init) && (mod->init_text_size)) {
98951- set_page_attributes(mod->module_init,
98952- mod->module_init + mod->init_text_size,
98953+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
98954+ set_page_attributes(mod->module_init_rx,
98955+ mod->module_init_rx + mod->init_size_rx,
98956 set_memory_ro);
98957 }
98958 }
98959@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
98960 #else
98961 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
98962 static void unset_module_core_ro_nx(struct module *mod) { }
98963-static void unset_module_init_ro_nx(struct module *mod) { }
98964+static void unset_module_init_ro_nx(struct module *mod)
98965+{
98966+
98967+#ifdef CONFIG_PAX_KERNEXEC
98968+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
98969+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
98970+#endif
98971+
98972+}
98973 #endif
98974
98975 void __weak module_memfree(void *module_region)
98976@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
98977 /* This may be NULL, but that's OK */
98978 unset_module_init_ro_nx(mod);
98979 module_arch_freeing_init(mod);
98980- module_memfree(mod->module_init);
98981+ module_memfree(mod->module_init_rw);
98982+ module_memfree_exec(mod->module_init_rx);
98983 kfree(mod->args);
98984 percpu_modfree(mod);
98985
98986 /* Free lock-classes; relies on the preceding sync_rcu(). */
98987- lockdep_free_key_range(mod->module_core, mod->core_size);
98988+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
98989+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
98990
98991 /* Finally, free the core (containing the module structure) */
98992 unset_module_core_ro_nx(mod);
98993- module_memfree(mod->module_core);
98994+ module_memfree_exec(mod->module_core_rx);
98995+ module_memfree(mod->module_core_rw);
98996
98997 #ifdef CONFIG_MPU
98998 update_protections(current->mm);
98999@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99000 int ret = 0;
99001 const struct kernel_symbol *ksym;
99002
99003+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99004+ int is_fs_load = 0;
99005+ int register_filesystem_found = 0;
99006+ char *p;
99007+
99008+ p = strstr(mod->args, "grsec_modharden_fs");
99009+ if (p) {
99010+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
99011+ /* copy \0 as well */
99012+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
99013+ is_fs_load = 1;
99014+ }
99015+#endif
99016+
99017 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
99018 const char *name = info->strtab + sym[i].st_name;
99019
99020+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99021+ /* it's a real shame this will never get ripped and copied
99022+ upstream! ;(
99023+ */
99024+ if (is_fs_load && !strcmp(name, "register_filesystem"))
99025+ register_filesystem_found = 1;
99026+#endif
99027+
99028 switch (sym[i].st_shndx) {
99029 case SHN_COMMON:
99030 /* Ignore common symbols */
99031@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99032 ksym = resolve_symbol_wait(mod, info, name);
99033 /* Ok if resolved. */
99034 if (ksym && !IS_ERR(ksym)) {
99035+ pax_open_kernel();
99036 sym[i].st_value = ksym->value;
99037+ pax_close_kernel();
99038 break;
99039 }
99040
99041@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99042 secbase = (unsigned long)mod_percpu(mod);
99043 else
99044 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
99045+ pax_open_kernel();
99046 sym[i].st_value += secbase;
99047+ pax_close_kernel();
99048 break;
99049 }
99050 }
99051
99052+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99053+ if (is_fs_load && !register_filesystem_found) {
99054+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
99055+ ret = -EPERM;
99056+ }
99057+#endif
99058+
99059 return ret;
99060 }
99061
99062@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
99063 || s->sh_entsize != ~0UL
99064 || strstarts(sname, ".init"))
99065 continue;
99066- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
99067+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99068+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
99069+ else
99070+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
99071 pr_debug("\t%s\n", sname);
99072 }
99073- switch (m) {
99074- case 0: /* executable */
99075- mod->core_size = debug_align(mod->core_size);
99076- mod->core_text_size = mod->core_size;
99077- break;
99078- case 1: /* RO: text and ro-data */
99079- mod->core_size = debug_align(mod->core_size);
99080- mod->core_ro_size = mod->core_size;
99081- break;
99082- case 3: /* whole core */
99083- mod->core_size = debug_align(mod->core_size);
99084- break;
99085- }
99086 }
99087
99088 pr_debug("Init section allocation order:\n");
99089@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
99090 || s->sh_entsize != ~0UL
99091 || !strstarts(sname, ".init"))
99092 continue;
99093- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
99094- | INIT_OFFSET_MASK);
99095+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99096+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
99097+ else
99098+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
99099+ s->sh_entsize |= INIT_OFFSET_MASK;
99100 pr_debug("\t%s\n", sname);
99101 }
99102- switch (m) {
99103- case 0: /* executable */
99104- mod->init_size = debug_align(mod->init_size);
99105- mod->init_text_size = mod->init_size;
99106- break;
99107- case 1: /* RO: text and ro-data */
99108- mod->init_size = debug_align(mod->init_size);
99109- mod->init_ro_size = mod->init_size;
99110- break;
99111- case 3: /* whole init */
99112- mod->init_size = debug_align(mod->init_size);
99113- break;
99114- }
99115 }
99116 }
99117
99118@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99119
99120 /* Put symbol section at end of init part of module. */
99121 symsect->sh_flags |= SHF_ALLOC;
99122- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
99123+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
99124 info->index.sym) | INIT_OFFSET_MASK;
99125 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
99126
99127@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99128 }
99129
99130 /* Append room for core symbols at end of core part. */
99131- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
99132- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
99133- mod->core_size += strtab_size;
99134- mod->core_size = debug_align(mod->core_size);
99135+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
99136+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
99137+ mod->core_size_rx += strtab_size;
99138+ mod->core_size_rx = debug_align(mod->core_size_rx);
99139
99140 /* Put string table section at end of init part of module. */
99141 strsect->sh_flags |= SHF_ALLOC;
99142- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
99143+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
99144 info->index.str) | INIT_OFFSET_MASK;
99145- mod->init_size = debug_align(mod->init_size);
99146+ mod->init_size_rx = debug_align(mod->init_size_rx);
99147 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
99148 }
99149
99150@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99151 /* Make sure we get permanent strtab: don't use info->strtab. */
99152 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
99153
99154+ pax_open_kernel();
99155+
99156 /* Set types up while we still have access to sections. */
99157 for (i = 0; i < mod->num_symtab; i++)
99158 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
99159
99160- mod->core_symtab = dst = mod->module_core + info->symoffs;
99161- mod->core_strtab = s = mod->module_core + info->stroffs;
99162+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
99163+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
99164 src = mod->symtab;
99165 for (ndst = i = 0; i < mod->num_symtab; i++) {
99166 if (i == 0 ||
99167@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99168 }
99169 }
99170 mod->core_num_syms = ndst;
99171+
99172+ pax_close_kernel();
99173 }
99174 #else
99175 static inline void layout_symtab(struct module *mod, struct load_info *info)
99176@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
99177 return vmalloc_exec(size);
99178 }
99179
99180-static void *module_alloc_update_bounds(unsigned long size)
99181+static void *module_alloc_update_bounds_rw(unsigned long size)
99182 {
99183 void *ret = module_alloc(size);
99184
99185 if (ret) {
99186 mutex_lock(&module_mutex);
99187 /* Update module bounds. */
99188- if ((unsigned long)ret < module_addr_min)
99189- module_addr_min = (unsigned long)ret;
99190- if ((unsigned long)ret + size > module_addr_max)
99191- module_addr_max = (unsigned long)ret + size;
99192+ if ((unsigned long)ret < module_addr_min_rw)
99193+ module_addr_min_rw = (unsigned long)ret;
99194+ if ((unsigned long)ret + size > module_addr_max_rw)
99195+ module_addr_max_rw = (unsigned long)ret + size;
99196+ mutex_unlock(&module_mutex);
99197+ }
99198+ return ret;
99199+}
99200+
99201+static void *module_alloc_update_bounds_rx(unsigned long size)
99202+{
99203+ void *ret = module_alloc_exec(size);
99204+
99205+ if (ret) {
99206+ mutex_lock(&module_mutex);
99207+ /* Update module bounds. */
99208+ if ((unsigned long)ret < module_addr_min_rx)
99209+ module_addr_min_rx = (unsigned long)ret;
99210+ if ((unsigned long)ret + size > module_addr_max_rx)
99211+ module_addr_max_rx = (unsigned long)ret + size;
99212 mutex_unlock(&module_mutex);
99213 }
99214 return ret;
99215@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99216 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
99217
99218 if (info->index.sym == 0) {
99219+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99220+ /*
99221+ * avoid potentially printing jibberish on attempted load
99222+ * of a module randomized with a different seed
99223+ */
99224+ pr_warn("module has no symbols (stripped?)\n");
99225+#else
99226 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
99227+#endif
99228 return ERR_PTR(-ENOEXEC);
99229 }
99230
99231@@ -2681,8 +2752,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99232 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99233 {
99234 const char *modmagic = get_modinfo(info, "vermagic");
99235+ const char *license = get_modinfo(info, "license");
99236 int err;
99237
99238+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
99239+ if (!license || !license_is_gpl_compatible(license))
99240+ return -ENOEXEC;
99241+#endif
99242+
99243 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
99244 modmagic = NULL;
99245
99246@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99247 }
99248
99249 /* Set up license info based on the info section */
99250- set_license(mod, get_modinfo(info, "license"));
99251+ set_license(mod, license);
99252
99253 return 0;
99254 }
99255@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
99256 void *ptr;
99257
99258 /* Do the allocs. */
99259- ptr = module_alloc_update_bounds(mod->core_size);
99260+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
99261 /*
99262 * The pointer to this block is stored in the module structure
99263 * which is inside the block. Just mark it as not being a
99264@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
99265 if (!ptr)
99266 return -ENOMEM;
99267
99268- memset(ptr, 0, mod->core_size);
99269- mod->module_core = ptr;
99270+ memset(ptr, 0, mod->core_size_rw);
99271+ mod->module_core_rw = ptr;
99272
99273- if (mod->init_size) {
99274- ptr = module_alloc_update_bounds(mod->init_size);
99275+ if (mod->init_size_rw) {
99276+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
99277 /*
99278 * The pointer to this block is stored in the module structure
99279 * which is inside the block. This block doesn't need to be
99280@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
99281 */
99282 kmemleak_ignore(ptr);
99283 if (!ptr) {
99284- module_memfree(mod->module_core);
99285+ module_memfree(mod->module_core_rw);
99286 return -ENOMEM;
99287 }
99288- memset(ptr, 0, mod->init_size);
99289- mod->module_init = ptr;
99290+ memset(ptr, 0, mod->init_size_rw);
99291+ mod->module_init_rw = ptr;
99292 } else
99293- mod->module_init = NULL;
99294+ mod->module_init_rw = NULL;
99295+
99296+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
99297+ kmemleak_not_leak(ptr);
99298+ if (!ptr) {
99299+ if (mod->module_init_rw)
99300+ module_memfree(mod->module_init_rw);
99301+ module_memfree(mod->module_core_rw);
99302+ return -ENOMEM;
99303+ }
99304+
99305+ pax_open_kernel();
99306+ memset(ptr, 0, mod->core_size_rx);
99307+ pax_close_kernel();
99308+ mod->module_core_rx = ptr;
99309+
99310+ if (mod->init_size_rx) {
99311+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
99312+ kmemleak_ignore(ptr);
99313+ if (!ptr && mod->init_size_rx) {
99314+ module_memfree_exec(mod->module_core_rx);
99315+ if (mod->module_init_rw)
99316+ module_memfree(mod->module_init_rw);
99317+ module_memfree(mod->module_core_rw);
99318+ return -ENOMEM;
99319+ }
99320+
99321+ pax_open_kernel();
99322+ memset(ptr, 0, mod->init_size_rx);
99323+ pax_close_kernel();
99324+ mod->module_init_rx = ptr;
99325+ } else
99326+ mod->module_init_rx = NULL;
99327
99328 /* Transfer each section which specifies SHF_ALLOC */
99329 pr_debug("final section addresses:\n");
99330@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
99331 if (!(shdr->sh_flags & SHF_ALLOC))
99332 continue;
99333
99334- if (shdr->sh_entsize & INIT_OFFSET_MASK)
99335- dest = mod->module_init
99336- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99337- else
99338- dest = mod->module_core + shdr->sh_entsize;
99339+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
99340+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99341+ dest = mod->module_init_rw
99342+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99343+ else
99344+ dest = mod->module_init_rx
99345+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99346+ } else {
99347+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99348+ dest = mod->module_core_rw + shdr->sh_entsize;
99349+ else
99350+ dest = mod->module_core_rx + shdr->sh_entsize;
99351+ }
99352+
99353+ if (shdr->sh_type != SHT_NOBITS) {
99354+
99355+#ifdef CONFIG_PAX_KERNEXEC
99356+#ifdef CONFIG_X86_64
99357+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
99358+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
99359+#endif
99360+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
99361+ pax_open_kernel();
99362+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99363+ pax_close_kernel();
99364+ } else
99365+#endif
99366
99367- if (shdr->sh_type != SHT_NOBITS)
99368 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99369+ }
99370 /* Update sh_addr to point to copy in image. */
99371- shdr->sh_addr = (unsigned long)dest;
99372+
99373+#ifdef CONFIG_PAX_KERNEXEC
99374+ if (shdr->sh_flags & SHF_EXECINSTR)
99375+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
99376+ else
99377+#endif
99378+
99379+ shdr->sh_addr = (unsigned long)dest;
99380 pr_debug("\t0x%lx %s\n",
99381 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
99382 }
99383@@ -2907,12 +3045,12 @@ static void flush_module_icache(const struct module *mod)
99384 * Do it before processing of module parameters, so the module
99385 * can provide parameter accessor functions of its own.
99386 */
99387- if (mod->module_init)
99388- flush_icache_range((unsigned long)mod->module_init,
99389- (unsigned long)mod->module_init
99390- + mod->init_size);
99391- flush_icache_range((unsigned long)mod->module_core,
99392- (unsigned long)mod->module_core + mod->core_size);
99393+ if (mod->module_init_rx)
99394+ flush_icache_range((unsigned long)mod->module_init_rx,
99395+ (unsigned long)mod->module_init_rx
99396+ + mod->init_size_rx);
99397+ flush_icache_range((unsigned long)mod->module_core_rx,
99398+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
99399
99400 set_fs(old_fs);
99401 }
99402@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
99403 {
99404 percpu_modfree(mod);
99405 module_arch_freeing_init(mod);
99406- module_memfree(mod->module_init);
99407- module_memfree(mod->module_core);
99408+ module_memfree_exec(mod->module_init_rx);
99409+ module_memfree_exec(mod->module_core_rx);
99410+ module_memfree(mod->module_init_rw);
99411+ module_memfree(mod->module_core_rw);
99412 }
99413
99414 int __weak module_finalize(const Elf_Ehdr *hdr,
99415@@ -2984,7 +3124,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
99416 static int post_relocation(struct module *mod, const struct load_info *info)
99417 {
99418 /* Sort exception table now relocations are done. */
99419+ pax_open_kernel();
99420 sort_extable(mod->extable, mod->extable + mod->num_exentries);
99421+ pax_close_kernel();
99422
99423 /* Copy relocated percpu area over. */
99424 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
99425@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
99426 /* For freeing module_init on success, in case kallsyms traversing */
99427 struct mod_initfree {
99428 struct rcu_head rcu;
99429- void *module_init;
99430+ void *module_init_rw;
99431+ void *module_init_rx;
99432 };
99433
99434 static void do_free_init(struct rcu_head *head)
99435 {
99436 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
99437- module_memfree(m->module_init);
99438+ module_memfree(m->module_init_rw);
99439+ module_memfree_exec(m->module_init_rx);
99440 kfree(m);
99441 }
99442
99443@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
99444 ret = -ENOMEM;
99445 goto fail;
99446 }
99447- freeinit->module_init = mod->module_init;
99448+ freeinit->module_init_rw = mod->module_init_rw;
99449+ freeinit->module_init_rx = mod->module_init_rx;
99450
99451 /*
99452 * We want to find out whether @mod uses async during init. Clear
99453@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
99454 #endif
99455 unset_module_init_ro_nx(mod);
99456 module_arch_freeing_init(mod);
99457- mod->module_init = NULL;
99458- mod->init_size = 0;
99459- mod->init_ro_size = 0;
99460- mod->init_text_size = 0;
99461+ mod->module_init_rw = NULL;
99462+ mod->module_init_rx = NULL;
99463+ mod->init_size_rw = 0;
99464+ mod->init_size_rx = 0;
99465 /*
99466 * We want to free module_init, but be aware that kallsyms may be
99467 * walking this with preempt disabled. In all the failure paths,
99468@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
99469 module_bug_finalize(info->hdr, info->sechdrs, mod);
99470
99471 /* Set RO and NX regions for core */
99472- set_section_ro_nx(mod->module_core,
99473- mod->core_text_size,
99474- mod->core_ro_size,
99475- mod->core_size);
99476+ set_section_ro_nx(mod->module_core_rx,
99477+ mod->core_size_rx,
99478+ mod->core_size_rx,
99479+ mod->core_size_rx);
99480
99481 /* Set RO and NX regions for init */
99482- set_section_ro_nx(mod->module_init,
99483- mod->init_text_size,
99484- mod->init_ro_size,
99485- mod->init_size);
99486+ set_section_ro_nx(mod->module_init_rx,
99487+ mod->init_size_rx,
99488+ mod->init_size_rx,
99489+ mod->init_size_rx);
99490
99491 /* Mark state as coming so strong_try_module_get() ignores us,
99492 * but kallsyms etc. can see us. */
99493@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
99494 if (err)
99495 goto free_unload;
99496
99497+ /* Now copy in args */
99498+ mod->args = strndup_user(uargs, ~0UL >> 1);
99499+ if (IS_ERR(mod->args)) {
99500+ err = PTR_ERR(mod->args);
99501+ goto free_unload;
99502+ }
99503+
99504 /* Set up MODINFO_ATTR fields */
99505 setup_modinfo(mod, info);
99506
99507+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99508+ {
99509+ char *p, *p2;
99510+
99511+ if (strstr(mod->args, "grsec_modharden_netdev")) {
99512+ 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);
99513+ err = -EPERM;
99514+ goto free_modinfo;
99515+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
99516+ p += sizeof("grsec_modharden_normal") - 1;
99517+ p2 = strstr(p, "_");
99518+ if (p2) {
99519+ *p2 = '\0';
99520+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
99521+ *p2 = '_';
99522+ }
99523+ err = -EPERM;
99524+ goto free_modinfo;
99525+ }
99526+ }
99527+#endif
99528+
99529 /* Fix up syms, so that st_value is a pointer to location. */
99530 err = simplify_symbols(mod, info);
99531 if (err < 0)
99532@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
99533
99534 flush_module_icache(mod);
99535
99536- /* Now copy in args */
99537- mod->args = strndup_user(uargs, ~0UL >> 1);
99538- if (IS_ERR(mod->args)) {
99539- err = PTR_ERR(mod->args);
99540- goto free_arch_cleanup;
99541- }
99542-
99543 dynamic_debug_setup(info->debug, info->num_debug);
99544
99545 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
99546@@ -3376,11 +3543,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
99547 ddebug_cleanup:
99548 dynamic_debug_remove(info->debug);
99549 synchronize_sched();
99550- kfree(mod->args);
99551- free_arch_cleanup:
99552 module_arch_cleanup(mod);
99553 free_modinfo:
99554 free_modinfo(mod);
99555+ kfree(mod->args);
99556 free_unload:
99557 module_unload_free(mod);
99558 unlink_mod:
99559@@ -3393,7 +3559,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
99560 mutex_unlock(&module_mutex);
99561 free_module:
99562 /* Free lock-classes; relies on the preceding sync_rcu() */
99563- lockdep_free_key_range(mod->module_core, mod->core_size);
99564+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99565+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99566
99567 module_deallocate(mod, info);
99568 free_copy:
99569@@ -3470,10 +3637,16 @@ static const char *get_ksymbol(struct module *mod,
99570 unsigned long nextval;
99571
99572 /* At worse, next value is at end of module */
99573- if (within_module_init(addr, mod))
99574- nextval = (unsigned long)mod->module_init+mod->init_text_size;
99575+ if (within_module_init_rx(addr, mod))
99576+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
99577+ else if (within_module_init_rw(addr, mod))
99578+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
99579+ else if (within_module_core_rx(addr, mod))
99580+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
99581+ else if (within_module_core_rw(addr, mod))
99582+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
99583 else
99584- nextval = (unsigned long)mod->module_core+mod->core_text_size;
99585+ return NULL;
99586
99587 /* Scan for closest preceding symbol, and next symbol. (ELF
99588 starts real symbols at 1). */
99589@@ -3721,7 +3894,7 @@ static int m_show(struct seq_file *m, void *p)
99590 return 0;
99591
99592 seq_printf(m, "%s %u",
99593- mod->name, mod->init_size + mod->core_size);
99594+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
99595 print_unload_info(m, mod);
99596
99597 /* Informative for users. */
99598@@ -3730,7 +3903,7 @@ static int m_show(struct seq_file *m, void *p)
99599 mod->state == MODULE_STATE_COMING ? "Loading" :
99600 "Live");
99601 /* Used by oprofile and other similar tools. */
99602- seq_printf(m, " 0x%pK", mod->module_core);
99603+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
99604
99605 /* Taints info */
99606 if (mod->taints)
99607@@ -3766,7 +3939,17 @@ static const struct file_operations proc_modules_operations = {
99608
99609 static int __init proc_modules_init(void)
99610 {
99611+#ifndef CONFIG_GRKERNSEC_HIDESYM
99612+#ifdef CONFIG_GRKERNSEC_PROC_USER
99613+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99614+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99615+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
99616+#else
99617 proc_create("modules", 0, NULL, &proc_modules_operations);
99618+#endif
99619+#else
99620+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99621+#endif
99622 return 0;
99623 }
99624 module_init(proc_modules_init);
99625@@ -3827,7 +4010,8 @@ struct module *__module_address(unsigned long addr)
99626 {
99627 struct module *mod;
99628
99629- if (addr < module_addr_min || addr > module_addr_max)
99630+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
99631+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
99632 return NULL;
99633
99634 list_for_each_entry_rcu(mod, &modules, list) {
99635@@ -3868,11 +4052,20 @@ bool is_module_text_address(unsigned long addr)
99636 */
99637 struct module *__module_text_address(unsigned long addr)
99638 {
99639- struct module *mod = __module_address(addr);
99640+ struct module *mod;
99641+
99642+#ifdef CONFIG_X86_32
99643+ addr = ktla_ktva(addr);
99644+#endif
99645+
99646+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
99647+ return NULL;
99648+
99649+ mod = __module_address(addr);
99650+
99651 if (mod) {
99652 /* Make sure it's within the text section. */
99653- if (!within(addr, mod->module_init, mod->init_text_size)
99654- && !within(addr, mod->module_core, mod->core_text_size))
99655+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
99656 mod = NULL;
99657 }
99658 return mod;
99659diff --git a/kernel/notifier.c b/kernel/notifier.c
99660index ae9fc7c..5085fbf 100644
99661--- a/kernel/notifier.c
99662+++ b/kernel/notifier.c
99663@@ -5,6 +5,7 @@
99664 #include <linux/rcupdate.h>
99665 #include <linux/vmalloc.h>
99666 #include <linux/reboot.h>
99667+#include <linux/mm.h>
99668
99669 /*
99670 * Notifier list for kernel code which wants to be called
99671@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
99672 while ((*nl) != NULL) {
99673 if (n->priority > (*nl)->priority)
99674 break;
99675- nl = &((*nl)->next);
99676+ nl = (struct notifier_block **)&((*nl)->next);
99677 }
99678- n->next = *nl;
99679+ pax_open_kernel();
99680+ *(const void **)&n->next = *nl;
99681 rcu_assign_pointer(*nl, n);
99682+ pax_close_kernel();
99683 return 0;
99684 }
99685
99686@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
99687 return 0;
99688 if (n->priority > (*nl)->priority)
99689 break;
99690- nl = &((*nl)->next);
99691+ nl = (struct notifier_block **)&((*nl)->next);
99692 }
99693- n->next = *nl;
99694+ pax_open_kernel();
99695+ *(const void **)&n->next = *nl;
99696 rcu_assign_pointer(*nl, n);
99697+ pax_close_kernel();
99698 return 0;
99699 }
99700
99701@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
99702 {
99703 while ((*nl) != NULL) {
99704 if ((*nl) == n) {
99705+ pax_open_kernel();
99706 rcu_assign_pointer(*nl, n->next);
99707+ pax_close_kernel();
99708 return 0;
99709 }
99710- nl = &((*nl)->next);
99711+ nl = (struct notifier_block **)&((*nl)->next);
99712 }
99713 return -ENOENT;
99714 }
99715diff --git a/kernel/padata.c b/kernel/padata.c
99716index b38bea9..91acfbe 100644
99717--- a/kernel/padata.c
99718+++ b/kernel/padata.c
99719@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
99720 * seq_nr mod. number of cpus in use.
99721 */
99722
99723- seq_nr = atomic_inc_return(&pd->seq_nr);
99724+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
99725 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
99726
99727 return padata_index_to_cpu(pd, cpu_index);
99728@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
99729 padata_init_pqueues(pd);
99730 padata_init_squeues(pd);
99731 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
99732- atomic_set(&pd->seq_nr, -1);
99733+ atomic_set_unchecked(&pd->seq_nr, -1);
99734 atomic_set(&pd->reorder_objects, 0);
99735 atomic_set(&pd->refcnt, 0);
99736 pd->pinst = pinst;
99737diff --git a/kernel/panic.c b/kernel/panic.c
99738index 8136ad7..15c857b 100644
99739--- a/kernel/panic.c
99740+++ b/kernel/panic.c
99741@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
99742 /*
99743 * Stop ourself in panic -- architecture code may override this
99744 */
99745-void __weak panic_smp_self_stop(void)
99746+void __weak __noreturn panic_smp_self_stop(void)
99747 {
99748 while (1)
99749 cpu_relax();
99750@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
99751 disable_trace_on_warning();
99752
99753 pr_warn("------------[ cut here ]------------\n");
99754- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
99755+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
99756 raw_smp_processor_id(), current->pid, file, line, caller);
99757
99758 if (args)
99759@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
99760 */
99761 __visible void __stack_chk_fail(void)
99762 {
99763- panic("stack-protector: Kernel stack is corrupted in: %p\n",
99764+ dump_stack();
99765+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
99766 __builtin_return_address(0));
99767 }
99768 EXPORT_SYMBOL(__stack_chk_fail);
99769diff --git a/kernel/pid.c b/kernel/pid.c
99770index cd36a5e..11f185d 100644
99771--- a/kernel/pid.c
99772+++ b/kernel/pid.c
99773@@ -33,6 +33,7 @@
99774 #include <linux/rculist.h>
99775 #include <linux/bootmem.h>
99776 #include <linux/hash.h>
99777+#include <linux/security.h>
99778 #include <linux/pid_namespace.h>
99779 #include <linux/init_task.h>
99780 #include <linux/syscalls.h>
99781@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
99782
99783 int pid_max = PID_MAX_DEFAULT;
99784
99785-#define RESERVED_PIDS 300
99786+#define RESERVED_PIDS 500
99787
99788 int pid_max_min = RESERVED_PIDS + 1;
99789 int pid_max_max = PID_MAX_LIMIT;
99790@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
99791 */
99792 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
99793 {
99794+ struct task_struct *task;
99795+
99796 rcu_lockdep_assert(rcu_read_lock_held(),
99797 "find_task_by_pid_ns() needs rcu_read_lock()"
99798 " protection");
99799- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99800+
99801+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99802+
99803+ if (gr_pid_is_chrooted(task))
99804+ return NULL;
99805+
99806+ return task;
99807 }
99808
99809 struct task_struct *find_task_by_vpid(pid_t vnr)
99810@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
99811 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
99812 }
99813
99814+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
99815+{
99816+ rcu_lockdep_assert(rcu_read_lock_held(),
99817+ "find_task_by_pid_ns() needs rcu_read_lock()"
99818+ " protection");
99819+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
99820+}
99821+
99822 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
99823 {
99824 struct pid *pid;
99825diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
99826index a65ba13..f600dbb 100644
99827--- a/kernel/pid_namespace.c
99828+++ b/kernel/pid_namespace.c
99829@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
99830 void __user *buffer, size_t *lenp, loff_t *ppos)
99831 {
99832 struct pid_namespace *pid_ns = task_active_pid_ns(current);
99833- struct ctl_table tmp = *table;
99834+ ctl_table_no_const tmp = *table;
99835
99836 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
99837 return -EPERM;
99838diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
99839index 7e01f78..f5da19d 100644
99840--- a/kernel/power/Kconfig
99841+++ b/kernel/power/Kconfig
99842@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
99843 config HIBERNATION
99844 bool "Hibernation (aka 'suspend to disk')"
99845 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
99846+ depends on !GRKERNSEC_KMEM
99847+ depends on !PAX_MEMORY_SANITIZE
99848 select HIBERNATE_CALLBACKS
99849 select LZO_COMPRESS
99850 select LZO_DECOMPRESS
99851diff --git a/kernel/power/process.c b/kernel/power/process.c
99852index 564f786..361a18e 100644
99853--- a/kernel/power/process.c
99854+++ b/kernel/power/process.c
99855@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
99856 unsigned int elapsed_msecs;
99857 bool wakeup = false;
99858 int sleep_usecs = USEC_PER_MSEC;
99859+ bool timedout = false;
99860
99861 do_gettimeofday(&start);
99862
99863@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
99864
99865 while (true) {
99866 todo = 0;
99867+ if (time_after(jiffies, end_time))
99868+ timedout = true;
99869 read_lock(&tasklist_lock);
99870 for_each_process_thread(g, p) {
99871 if (p == current || !freeze_task(p))
99872 continue;
99873
99874- if (!freezer_should_skip(p))
99875+ if (!freezer_should_skip(p)) {
99876 todo++;
99877+ if (timedout) {
99878+ printk(KERN_ERR "Task refusing to freeze:\n");
99879+ sched_show_task(p);
99880+ }
99881+ }
99882 }
99883 read_unlock(&tasklist_lock);
99884
99885@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
99886 todo += wq_busy;
99887 }
99888
99889- if (!todo || time_after(jiffies, end_time))
99890+ if (!todo || timedout)
99891 break;
99892
99893 if (pm_wakeup_pending()) {
99894diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
99895index bb0635b..9aff9f3 100644
99896--- a/kernel/printk/printk.c
99897+++ b/kernel/printk/printk.c
99898@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
99899 if (from_file && type != SYSLOG_ACTION_OPEN)
99900 return 0;
99901
99902+#ifdef CONFIG_GRKERNSEC_DMESG
99903+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
99904+ return -EPERM;
99905+#endif
99906+
99907 if (syslog_action_restricted(type)) {
99908 if (capable(CAP_SYSLOG))
99909 return 0;
99910diff --git a/kernel/profile.c b/kernel/profile.c
99911index a7bcd28..5b368fa 100644
99912--- a/kernel/profile.c
99913+++ b/kernel/profile.c
99914@@ -37,7 +37,7 @@ struct profile_hit {
99915 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
99916 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
99917
99918-static atomic_t *prof_buffer;
99919+static atomic_unchecked_t *prof_buffer;
99920 static unsigned long prof_len, prof_shift;
99921
99922 int prof_on __read_mostly;
99923@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
99924 hits[i].pc = 0;
99925 continue;
99926 }
99927- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
99928+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
99929 hits[i].hits = hits[i].pc = 0;
99930 }
99931 }
99932@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
99933 * Add the current hit(s) and flush the write-queue out
99934 * to the global buffer:
99935 */
99936- atomic_add(nr_hits, &prof_buffer[pc]);
99937+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
99938 for (i = 0; i < NR_PROFILE_HIT; ++i) {
99939- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
99940+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
99941 hits[i].pc = hits[i].hits = 0;
99942 }
99943 out:
99944@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
99945 {
99946 unsigned long pc;
99947 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
99948- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
99949+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
99950 }
99951 #endif /* !CONFIG_SMP */
99952
99953@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
99954 return -EFAULT;
99955 buf++; p++; count--; read++;
99956 }
99957- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
99958+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
99959 if (copy_to_user(buf, (void *)pnt, count))
99960 return -EFAULT;
99961 read += count;
99962@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
99963 }
99964 #endif
99965 profile_discard_flip_buffers();
99966- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
99967+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
99968 return count;
99969 }
99970
99971diff --git a/kernel/ptrace.c b/kernel/ptrace.c
99972index 9a34bd8..38d90e5 100644
99973--- a/kernel/ptrace.c
99974+++ b/kernel/ptrace.c
99975@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
99976 if (seize)
99977 flags |= PT_SEIZED;
99978 rcu_read_lock();
99979- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
99980+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
99981 flags |= PT_PTRACE_CAP;
99982 rcu_read_unlock();
99983 task->ptrace = flags;
99984@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
99985 break;
99986 return -EIO;
99987 }
99988- if (copy_to_user(dst, buf, retval))
99989+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
99990 return -EFAULT;
99991 copied += retval;
99992 src += retval;
99993@@ -803,7 +803,7 @@ int ptrace_request(struct task_struct *child, long request,
99994 bool seized = child->ptrace & PT_SEIZED;
99995 int ret = -EIO;
99996 siginfo_t siginfo, *si;
99997- void __user *datavp = (void __user *) data;
99998+ void __user *datavp = (__force void __user *) data;
99999 unsigned long __user *datalp = datavp;
100000 unsigned long flags;
100001
100002@@ -1049,14 +1049,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
100003 goto out;
100004 }
100005
100006+ if (gr_handle_ptrace(child, request)) {
100007+ ret = -EPERM;
100008+ goto out_put_task_struct;
100009+ }
100010+
100011 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100012 ret = ptrace_attach(child, request, addr, data);
100013 /*
100014 * Some architectures need to do book-keeping after
100015 * a ptrace attach.
100016 */
100017- if (!ret)
100018+ if (!ret) {
100019 arch_ptrace_attach(child);
100020+ gr_audit_ptrace(child);
100021+ }
100022 goto out_put_task_struct;
100023 }
100024
100025@@ -1084,7 +1091,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
100026 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
100027 if (copied != sizeof(tmp))
100028 return -EIO;
100029- return put_user(tmp, (unsigned long __user *)data);
100030+ return put_user(tmp, (__force unsigned long __user *)data);
100031 }
100032
100033 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
100034@@ -1177,7 +1184,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
100035 }
100036
100037 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100038- compat_long_t, addr, compat_long_t, data)
100039+ compat_ulong_t, addr, compat_ulong_t, data)
100040 {
100041 struct task_struct *child;
100042 long ret;
100043@@ -1193,14 +1200,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100044 goto out;
100045 }
100046
100047+ if (gr_handle_ptrace(child, request)) {
100048+ ret = -EPERM;
100049+ goto out_put_task_struct;
100050+ }
100051+
100052 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100053 ret = ptrace_attach(child, request, addr, data);
100054 /*
100055 * Some architectures need to do book-keeping after
100056 * a ptrace attach.
100057 */
100058- if (!ret)
100059+ if (!ret) {
100060 arch_ptrace_attach(child);
100061+ gr_audit_ptrace(child);
100062+ }
100063 goto out_put_task_struct;
100064 }
100065
100066diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
100067index 30d42aa..cac5d66 100644
100068--- a/kernel/rcu/rcutorture.c
100069+++ b/kernel/rcu/rcutorture.c
100070@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100071 rcu_torture_count) = { 0 };
100072 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100073 rcu_torture_batch) = { 0 };
100074-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100075-static atomic_t n_rcu_torture_alloc;
100076-static atomic_t n_rcu_torture_alloc_fail;
100077-static atomic_t n_rcu_torture_free;
100078-static atomic_t n_rcu_torture_mberror;
100079-static atomic_t n_rcu_torture_error;
100080+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100081+static atomic_unchecked_t n_rcu_torture_alloc;
100082+static atomic_unchecked_t n_rcu_torture_alloc_fail;
100083+static atomic_unchecked_t n_rcu_torture_free;
100084+static atomic_unchecked_t n_rcu_torture_mberror;
100085+static atomic_unchecked_t n_rcu_torture_error;
100086 static long n_rcu_torture_barrier_error;
100087 static long n_rcu_torture_boost_ktrerror;
100088 static long n_rcu_torture_boost_rterror;
100089@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
100090 static long n_rcu_torture_timers;
100091 static long n_barrier_attempts;
100092 static long n_barrier_successes;
100093-static atomic_long_t n_cbfloods;
100094+static atomic_long_unchecked_t n_cbfloods;
100095 static struct list_head rcu_torture_removed;
100096
100097 static int rcu_torture_writer_state;
100098@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
100099
100100 spin_lock_bh(&rcu_torture_lock);
100101 if (list_empty(&rcu_torture_freelist)) {
100102- atomic_inc(&n_rcu_torture_alloc_fail);
100103+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
100104 spin_unlock_bh(&rcu_torture_lock);
100105 return NULL;
100106 }
100107- atomic_inc(&n_rcu_torture_alloc);
100108+ atomic_inc_unchecked(&n_rcu_torture_alloc);
100109 p = rcu_torture_freelist.next;
100110 list_del_init(p);
100111 spin_unlock_bh(&rcu_torture_lock);
100112@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
100113 static void
100114 rcu_torture_free(struct rcu_torture *p)
100115 {
100116- atomic_inc(&n_rcu_torture_free);
100117+ atomic_inc_unchecked(&n_rcu_torture_free);
100118 spin_lock_bh(&rcu_torture_lock);
100119 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
100120 spin_unlock_bh(&rcu_torture_lock);
100121@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
100122 i = rp->rtort_pipe_count;
100123 if (i > RCU_TORTURE_PIPE_LEN)
100124 i = RCU_TORTURE_PIPE_LEN;
100125- atomic_inc(&rcu_torture_wcount[i]);
100126+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100127 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
100128 rp->rtort_mbtest = 0;
100129 return true;
100130@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
100131 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
100132 do {
100133 schedule_timeout_interruptible(cbflood_inter_holdoff);
100134- atomic_long_inc(&n_cbfloods);
100135+ atomic_long_inc_unchecked(&n_cbfloods);
100136 WARN_ON(signal_pending(current));
100137 for (i = 0; i < cbflood_n_burst; i++) {
100138 for (j = 0; j < cbflood_n_per_burst; j++) {
100139@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
100140 i = old_rp->rtort_pipe_count;
100141 if (i > RCU_TORTURE_PIPE_LEN)
100142 i = RCU_TORTURE_PIPE_LEN;
100143- atomic_inc(&rcu_torture_wcount[i]);
100144+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100145 old_rp->rtort_pipe_count++;
100146 switch (synctype[torture_random(&rand) % nsynctypes]) {
100147 case RTWS_DEF_FREE:
100148@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
100149 return;
100150 }
100151 if (p->rtort_mbtest == 0)
100152- atomic_inc(&n_rcu_torture_mberror);
100153+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100154 spin_lock(&rand_lock);
100155 cur_ops->read_delay(&rand);
100156 n_rcu_torture_timers++;
100157@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
100158 continue;
100159 }
100160 if (p->rtort_mbtest == 0)
100161- atomic_inc(&n_rcu_torture_mberror);
100162+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100163 cur_ops->read_delay(&rand);
100164 preempt_disable();
100165 pipe_count = p->rtort_pipe_count;
100166@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
100167 rcu_torture_current,
100168 rcu_torture_current_version,
100169 list_empty(&rcu_torture_freelist),
100170- atomic_read(&n_rcu_torture_alloc),
100171- atomic_read(&n_rcu_torture_alloc_fail),
100172- atomic_read(&n_rcu_torture_free));
100173+ atomic_read_unchecked(&n_rcu_torture_alloc),
100174+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
100175+ atomic_read_unchecked(&n_rcu_torture_free));
100176 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
100177- atomic_read(&n_rcu_torture_mberror),
100178+ atomic_read_unchecked(&n_rcu_torture_mberror),
100179 n_rcu_torture_boost_ktrerror,
100180 n_rcu_torture_boost_rterror);
100181 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
100182@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
100183 n_barrier_successes,
100184 n_barrier_attempts,
100185 n_rcu_torture_barrier_error);
100186- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
100187+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
100188
100189 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100190- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
100191+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
100192 n_rcu_torture_barrier_error != 0 ||
100193 n_rcu_torture_boost_ktrerror != 0 ||
100194 n_rcu_torture_boost_rterror != 0 ||
100195 n_rcu_torture_boost_failure != 0 ||
100196 i > 1) {
100197 pr_cont("%s", "!!! ");
100198- atomic_inc(&n_rcu_torture_error);
100199+ atomic_inc_unchecked(&n_rcu_torture_error);
100200 WARN_ON_ONCE(1);
100201 }
100202 pr_cont("Reader Pipe: ");
100203@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
100204 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100205 pr_cont("Free-Block Circulation: ");
100206 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100207- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
100208+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
100209 }
100210 pr_cont("\n");
100211
100212@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
100213
100214 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
100215
100216- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100217+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100218 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
100219 else if (torture_onoff_failures())
100220 rcu_torture_print_module_parms(cur_ops,
100221@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
100222
100223 rcu_torture_current = NULL;
100224 rcu_torture_current_version = 0;
100225- atomic_set(&n_rcu_torture_alloc, 0);
100226- atomic_set(&n_rcu_torture_alloc_fail, 0);
100227- atomic_set(&n_rcu_torture_free, 0);
100228- atomic_set(&n_rcu_torture_mberror, 0);
100229- atomic_set(&n_rcu_torture_error, 0);
100230+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
100231+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
100232+ atomic_set_unchecked(&n_rcu_torture_free, 0);
100233+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
100234+ atomic_set_unchecked(&n_rcu_torture_error, 0);
100235 n_rcu_torture_barrier_error = 0;
100236 n_rcu_torture_boost_ktrerror = 0;
100237 n_rcu_torture_boost_rterror = 0;
100238 n_rcu_torture_boost_failure = 0;
100239 n_rcu_torture_boosts = 0;
100240 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
100241- atomic_set(&rcu_torture_wcount[i], 0);
100242+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
100243 for_each_possible_cpu(cpu) {
100244 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100245 per_cpu(rcu_torture_count, cpu)[i] = 0;
100246diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
100247index cc9ceca..ce075a6 100644
100248--- a/kernel/rcu/tiny.c
100249+++ b/kernel/rcu/tiny.c
100250@@ -42,7 +42,7 @@
100251 /* Forward declarations for tiny_plugin.h. */
100252 struct rcu_ctrlblk;
100253 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
100254-static void rcu_process_callbacks(struct softirq_action *unused);
100255+static void rcu_process_callbacks(void);
100256 static void __call_rcu(struct rcu_head *head,
100257 void (*func)(struct rcu_head *rcu),
100258 struct rcu_ctrlblk *rcp);
100259@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
100260 false));
100261 }
100262
100263-static void rcu_process_callbacks(struct softirq_action *unused)
100264+static __latent_entropy void rcu_process_callbacks(void)
100265 {
100266 __rcu_process_callbacks(&rcu_sched_ctrlblk);
100267 __rcu_process_callbacks(&rcu_bh_ctrlblk);
100268diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
100269index f94e209..d2985bd 100644
100270--- a/kernel/rcu/tiny_plugin.h
100271+++ b/kernel/rcu/tiny_plugin.h
100272@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
100273 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
100274 jiffies - rcp->gp_start, rcp->qlen);
100275 dump_stack();
100276- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
100277+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
100278 3 * rcu_jiffies_till_stall_check() + 3;
100279 } else if (ULONG_CMP_GE(j, js)) {
100280- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100281+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100282 }
100283 }
100284
100285@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
100286 {
100287 rcp->ticks_this_gp = 0;
100288 rcp->gp_start = jiffies;
100289- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100290+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100291 }
100292
100293 static void check_cpu_stalls(void)
100294diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
100295index 48d640c..9401d30 100644
100296--- a/kernel/rcu/tree.c
100297+++ b/kernel/rcu/tree.c
100298@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
100299 */
100300 rdtp = this_cpu_ptr(&rcu_dynticks);
100301 smp_mb__before_atomic(); /* Earlier stuff before QS. */
100302- atomic_add(2, &rdtp->dynticks); /* QS. */
100303+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
100304 smp_mb__after_atomic(); /* Later stuff after QS. */
100305 break;
100306 }
100307@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
100308 rcu_prepare_for_idle();
100309 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100310 smp_mb__before_atomic(); /* See above. */
100311- atomic_inc(&rdtp->dynticks);
100312+ atomic_inc_unchecked(&rdtp->dynticks);
100313 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
100314- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100315+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100316 rcu_dynticks_task_enter();
100317
100318 /*
100319@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
100320
100321 rcu_dynticks_task_exit();
100322 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
100323- atomic_inc(&rdtp->dynticks);
100324+ atomic_inc_unchecked(&rdtp->dynticks);
100325 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
100326 smp_mb__after_atomic(); /* See above. */
100327- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100328+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100329 rcu_cleanup_after_idle();
100330 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
100331 if (!user && !is_idle_task(current)) {
100332@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
100333 * to be in the outermost NMI handler that interrupted an RCU-idle
100334 * period (observation due to Andy Lutomirski).
100335 */
100336- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
100337+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
100338 smp_mb__before_atomic(); /* Force delay from prior write. */
100339- atomic_inc(&rdtp->dynticks);
100340+ atomic_inc_unchecked(&rdtp->dynticks);
100341 /* atomic_inc() before later RCU read-side crit sects */
100342 smp_mb__after_atomic(); /* See above. */
100343- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100344+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100345 incby = 1;
100346 }
100347 rdtp->dynticks_nmi_nesting += incby;
100348@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
100349 * to us!)
100350 */
100351 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
100352- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100353+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100354
100355 /*
100356 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
100357@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
100358 rdtp->dynticks_nmi_nesting = 0;
100359 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100360 smp_mb__before_atomic(); /* See above. */
100361- atomic_inc(&rdtp->dynticks);
100362+ atomic_inc_unchecked(&rdtp->dynticks);
100363 smp_mb__after_atomic(); /* Force delay to next write. */
100364- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100365+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100366 }
100367
100368 /**
100369@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
100370 */
100371 bool notrace __rcu_is_watching(void)
100372 {
100373- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100374+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100375 }
100376
100377 /**
100378@@ -983,7 +983,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
100379 static int dyntick_save_progress_counter(struct rcu_data *rdp,
100380 bool *isidle, unsigned long *maxj)
100381 {
100382- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
100383+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100384 rcu_sysidle_check_cpu(rdp, isidle, maxj);
100385 if ((rdp->dynticks_snap & 0x1) == 0) {
100386 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
100387@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
100388 } else {
100389 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
100390 rdp->mynode->gpnum))
100391- ACCESS_ONCE(rdp->gpwrap) = true;
100392+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
100393 return 0;
100394 }
100395 }
100396@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100397 int *rcrmp;
100398 unsigned int snap;
100399
100400- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
100401+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100402 snap = (unsigned int)rdp->dynticks_snap;
100403
100404 /*
100405@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100406 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
100407 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
100408 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
100409- ACCESS_ONCE(rdp->cond_resched_completed) =
100410+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
100411 ACCESS_ONCE(rdp->mynode->completed);
100412 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
100413- ACCESS_ONCE(*rcrmp) =
100414+ ACCESS_ONCE_RW(*rcrmp) =
100415 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
100416 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
100417 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
100418@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
100419 rsp->gp_start = j;
100420 smp_wmb(); /* Record start time before stall time. */
100421 j1 = rcu_jiffies_till_stall_check();
100422- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
100423+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
100424 rsp->jiffies_resched = j + j1 / 2;
100425 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
100426 }
100427@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
100428 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100429 return;
100430 }
100431- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100432+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100433 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100434
100435 /*
100436@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
100437
100438 raw_spin_lock_irqsave(&rnp->lock, flags);
100439 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
100440- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
100441+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
100442 3 * rcu_jiffies_till_stall_check() + 3;
100443 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100444
100445@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
100446 struct rcu_state *rsp;
100447
100448 for_each_rcu_flavor(rsp)
100449- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100450+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100451 }
100452
100453 /*
100454@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
100455 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
100456 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
100457 zero_cpu_stall_ticks(rdp);
100458- ACCESS_ONCE(rdp->gpwrap) = false;
100459+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
100460 }
100461 return ret;
100462 }
100463@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100464 struct rcu_data *rdp;
100465 struct rcu_node *rnp = rcu_get_root(rsp);
100466
100467- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100468+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100469 rcu_bind_gp_kthread();
100470 raw_spin_lock_irq(&rnp->lock);
100471 smp_mb__after_unlock_lock();
100472@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100473 raw_spin_unlock_irq(&rnp->lock);
100474 return 0;
100475 }
100476- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100477+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100478
100479 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
100480 /*
100481@@ -1756,9 +1756,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
100482 rdp = this_cpu_ptr(rsp->rda);
100483 rcu_preempt_check_blocked_tasks(rnp);
100484 rnp->qsmask = rnp->qsmaskinit;
100485- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
100486+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
100487 WARN_ON_ONCE(rnp->completed != rsp->completed);
100488- ACCESS_ONCE(rnp->completed) = rsp->completed;
100489+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
100490 if (rnp == rdp->mynode)
100491 (void)__note_gp_changes(rsp, rnp, rdp);
100492 rcu_preempt_boost_start_gp(rnp);
100493@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100494 rnp->grphi, rnp->qsmask);
100495 raw_spin_unlock_irq(&rnp->lock);
100496 cond_resched_rcu_qs();
100497- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100498+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100499 }
100500
100501 mutex_unlock(&rsp->onoff_mutex);
100502@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100503 unsigned long maxj;
100504 struct rcu_node *rnp = rcu_get_root(rsp);
100505
100506- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100507+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100508 rsp->n_force_qs++;
100509 if (fqs_state == RCU_SAVE_DYNTICK) {
100510 /* Collect dyntick-idle snapshots. */
100511@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100512 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
100513 raw_spin_lock_irq(&rnp->lock);
100514 smp_mb__after_unlock_lock();
100515- ACCESS_ONCE(rsp->gp_flags) =
100516+ ACCESS_ONCE_RW(rsp->gp_flags) =
100517 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
100518 raw_spin_unlock_irq(&rnp->lock);
100519 }
100520@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100521 struct rcu_data *rdp;
100522 struct rcu_node *rnp = rcu_get_root(rsp);
100523
100524- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100525+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100526 raw_spin_lock_irq(&rnp->lock);
100527 smp_mb__after_unlock_lock();
100528 gp_duration = jiffies - rsp->gp_start;
100529@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100530 rcu_for_each_node_breadth_first(rsp, rnp) {
100531 raw_spin_lock_irq(&rnp->lock);
100532 smp_mb__after_unlock_lock();
100533- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
100534+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
100535 rdp = this_cpu_ptr(rsp->rda);
100536 if (rnp == rdp->mynode)
100537 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
100538@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100539 nocb += rcu_future_gp_cleanup(rsp, rnp);
100540 raw_spin_unlock_irq(&rnp->lock);
100541 cond_resched_rcu_qs();
100542- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100543+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100544 }
100545 rnp = rcu_get_root(rsp);
100546 raw_spin_lock_irq(&rnp->lock);
100547@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100548 rcu_nocb_gp_set(rnp, nocb);
100549
100550 /* Declare grace period done. */
100551- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
100552+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
100553 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
100554 rsp->fqs_state = RCU_GP_IDLE;
100555 rdp = this_cpu_ptr(rsp->rda);
100556 /* Advance CBs to reduce false positives below. */
100557 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
100558 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
100559- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100560+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100561 trace_rcu_grace_period(rsp->name,
100562 ACCESS_ONCE(rsp->gpnum),
100563 TPS("newreq"));
100564@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
100565 if (rcu_gp_init(rsp))
100566 break;
100567 cond_resched_rcu_qs();
100568- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100569+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100570 WARN_ON(signal_pending(current));
100571 trace_rcu_grace_period(rsp->name,
100572 ACCESS_ONCE(rsp->gpnum),
100573@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
100574 ACCESS_ONCE(rsp->gpnum),
100575 TPS("fqsend"));
100576 cond_resched_rcu_qs();
100577- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100578+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100579 } else {
100580 /* Deal with stray signal. */
100581 cond_resched_rcu_qs();
100582- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100583+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100584 WARN_ON(signal_pending(current));
100585 trace_rcu_grace_period(rsp->name,
100586 ACCESS_ONCE(rsp->gpnum),
100587@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
100588 */
100589 return false;
100590 }
100591- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100592+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100593 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
100594 TPS("newreq"));
100595
100596@@ -2228,7 +2228,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
100597 rsp->qlen += rdp->qlen;
100598 rdp->n_cbs_orphaned += rdp->qlen;
100599 rdp->qlen_lazy = 0;
100600- ACCESS_ONCE(rdp->qlen) = 0;
100601+ ACCESS_ONCE_RW(rdp->qlen) = 0;
100602 }
100603
100604 /*
100605@@ -2490,7 +2490,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
100606 }
100607 smp_mb(); /* List handling before counting for rcu_barrier(). */
100608 rdp->qlen_lazy -= count_lazy;
100609- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
100610+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
100611 rdp->n_cbs_invoked += count;
100612
100613 /* Reinstate batch limit if we have worked down the excess. */
100614@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
100615 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100616 return; /* Someone beat us to it. */
100617 }
100618- ACCESS_ONCE(rsp->gp_flags) =
100619+ ACCESS_ONCE_RW(rsp->gp_flags) =
100620 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
100621 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100622 rcu_gp_kthread_wake(rsp);
100623@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
100624 /*
100625 * Do RCU core processing for the current CPU.
100626 */
100627-static void rcu_process_callbacks(struct softirq_action *unused)
100628+static void rcu_process_callbacks(void)
100629 {
100630 struct rcu_state *rsp;
100631
100632@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100633 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
100634 if (debug_rcu_head_queue(head)) {
100635 /* Probable double call_rcu(), so leak the callback. */
100636- ACCESS_ONCE(head->func) = rcu_leak_callback;
100637+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
100638 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
100639 return;
100640 }
100641@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100642 local_irq_restore(flags);
100643 return;
100644 }
100645- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
100646+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
100647 if (lazy)
100648 rdp->qlen_lazy++;
100649 else
100650@@ -3106,11 +3106,11 @@ void synchronize_sched_expedited(void)
100651 * counter wrap on a 32-bit system. Quite a few more CPUs would of
100652 * course be required on a 64-bit system.
100653 */
100654- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
100655+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
100656 (ulong)atomic_long_read(&rsp->expedited_done) +
100657 ULONG_MAX / 8)) {
100658 synchronize_sched();
100659- atomic_long_inc(&rsp->expedited_wrap);
100660+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
100661 return;
100662 }
100663
100664@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
100665 * Take a ticket. Note that atomic_inc_return() implies a
100666 * full memory barrier.
100667 */
100668- snap = atomic_long_inc_return(&rsp->expedited_start);
100669+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
100670 firstsnap = snap;
100671 if (!try_get_online_cpus()) {
100672 /* CPU hotplug operation in flight, fall back to normal GP. */
100673 wait_rcu_gp(call_rcu_sched);
100674- atomic_long_inc(&rsp->expedited_normal);
100675+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100676 return;
100677 }
100678 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
100679@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
100680 for_each_cpu(cpu, cm) {
100681 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
100682
100683- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
100684+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
100685 cpumask_clear_cpu(cpu, cm);
100686 }
100687 if (cpumask_weight(cm) == 0)
100688@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
100689 synchronize_sched_expedited_cpu_stop,
100690 NULL) == -EAGAIN) {
100691 put_online_cpus();
100692- atomic_long_inc(&rsp->expedited_tryfail);
100693+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
100694
100695 /* Check to see if someone else did our work for us. */
100696 s = atomic_long_read(&rsp->expedited_done);
100697 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100698 /* ensure test happens before caller kfree */
100699 smp_mb__before_atomic(); /* ^^^ */
100700- atomic_long_inc(&rsp->expedited_workdone1);
100701+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
100702 free_cpumask_var(cm);
100703 return;
100704 }
100705@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
100706 udelay(trycount * num_online_cpus());
100707 } else {
100708 wait_rcu_gp(call_rcu_sched);
100709- atomic_long_inc(&rsp->expedited_normal);
100710+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100711 free_cpumask_var(cm);
100712 return;
100713 }
100714@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
100715 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100716 /* ensure test happens before caller kfree */
100717 smp_mb__before_atomic(); /* ^^^ */
100718- atomic_long_inc(&rsp->expedited_workdone2);
100719+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
100720 free_cpumask_var(cm);
100721 return;
100722 }
100723@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
100724 if (!try_get_online_cpus()) {
100725 /* CPU hotplug operation in flight, use normal GP. */
100726 wait_rcu_gp(call_rcu_sched);
100727- atomic_long_inc(&rsp->expedited_normal);
100728+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100729 free_cpumask_var(cm);
100730 return;
100731 }
100732- snap = atomic_long_read(&rsp->expedited_start);
100733+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
100734 smp_mb(); /* ensure read is before try_stop_cpus(). */
100735 }
100736- atomic_long_inc(&rsp->expedited_stoppedcpus);
100737+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
100738
100739 all_cpus_idle:
100740 free_cpumask_var(cm);
100741@@ -3212,16 +3212,16 @@ all_cpus_idle:
100742 * than we did already did their update.
100743 */
100744 do {
100745- atomic_long_inc(&rsp->expedited_done_tries);
100746+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
100747 s = atomic_long_read(&rsp->expedited_done);
100748 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
100749 /* ensure test happens before caller kfree */
100750 smp_mb__before_atomic(); /* ^^^ */
100751- atomic_long_inc(&rsp->expedited_done_lost);
100752+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
100753 break;
100754 }
100755 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
100756- atomic_long_inc(&rsp->expedited_done_exit);
100757+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
100758
100759 put_online_cpus();
100760 }
100761@@ -3431,7 +3431,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100762 * ACCESS_ONCE() to prevent the compiler from speculating
100763 * the increment to precede the early-exit check.
100764 */
100765- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100766+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100767 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
100768 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
100769 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
100770@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100771
100772 /* Increment ->n_barrier_done to prevent duplicate work. */
100773 smp_mb(); /* Keep increment after above mechanism. */
100774- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100775+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100776 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
100777 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
100778 smp_mb(); /* Keep increment before caller's subsequent code. */
100779@@ -3532,7 +3532,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
100780 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
100781 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
100782 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
100783- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
100784+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
100785 rdp->cpu = cpu;
100786 rdp->rsp = rsp;
100787 rcu_boot_init_nocb_percpu_data(rdp);
100788@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
100789 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
100790 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
100791 rcu_sysidle_init_percpu_data(rdp->dynticks);
100792- atomic_set(&rdp->dynticks->dynticks,
100793- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
100794+ atomic_set_unchecked(&rdp->dynticks->dynticks,
100795+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
100796 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
100797
100798 /* Add CPU to rcu_node bitmasks. */
100799diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
100800index 119de39..f07d31a 100644
100801--- a/kernel/rcu/tree.h
100802+++ b/kernel/rcu/tree.h
100803@@ -86,11 +86,11 @@ struct rcu_dynticks {
100804 long long dynticks_nesting; /* Track irq/process nesting level. */
100805 /* Process level is worth LLONG_MAX/2. */
100806 int dynticks_nmi_nesting; /* Track NMI nesting level. */
100807- atomic_t dynticks; /* Even value for idle, else odd. */
100808+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
100809 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
100810 long long dynticks_idle_nesting;
100811 /* irq/process nesting level from idle. */
100812- atomic_t dynticks_idle; /* Even value for idle, else odd. */
100813+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
100814 /* "Idle" excludes userspace execution. */
100815 unsigned long dynticks_idle_jiffies;
100816 /* End of last non-NMI non-idle period. */
100817@@ -457,17 +457,17 @@ struct rcu_state {
100818 /* _rcu_barrier(). */
100819 /* End of fields guarded by barrier_mutex. */
100820
100821- atomic_long_t expedited_start; /* Starting ticket. */
100822- atomic_long_t expedited_done; /* Done ticket. */
100823- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
100824- atomic_long_t expedited_tryfail; /* # acquisition failures. */
100825- atomic_long_t expedited_workdone1; /* # done by others #1. */
100826- atomic_long_t expedited_workdone2; /* # done by others #2. */
100827- atomic_long_t expedited_normal; /* # fallbacks to normal. */
100828- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
100829- atomic_long_t expedited_done_tries; /* # tries to update _done. */
100830- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
100831- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
100832+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
100833+ atomic_long_t expedited_done; /* Done ticket. */
100834+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
100835+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
100836+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
100837+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
100838+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
100839+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
100840+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
100841+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
100842+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
100843
100844 unsigned long jiffies_force_qs; /* Time at which to invoke */
100845 /* force_quiescent_state(). */
100846diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
100847index 0a571e9..fbfd611 100644
100848--- a/kernel/rcu/tree_plugin.h
100849+++ b/kernel/rcu/tree_plugin.h
100850@@ -619,7 +619,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
100851 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
100852 {
100853 return !rcu_preempted_readers_exp(rnp) &&
100854- ACCESS_ONCE(rnp->expmask) == 0;
100855+ ACCESS_ONCE_RW(rnp->expmask) == 0;
100856 }
100857
100858 /*
100859@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
100860
100861 /* Clean up and exit. */
100862 smp_mb(); /* ensure expedited GP seen before counter increment. */
100863- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
100864+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
100865 sync_rcu_preempt_exp_count + 1;
100866 unlock_mb_ret:
100867 mutex_unlock(&sync_rcu_preempt_exp_mutex);
100868@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
100869 free_cpumask_var(cm);
100870 }
100871
100872-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
100873+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
100874 .store = &rcu_cpu_kthread_task,
100875 .thread_should_run = rcu_cpu_kthread_should_run,
100876 .thread_fn = rcu_cpu_kthread,
100877@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
100878 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
100879 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
100880 cpu, ticks_value, ticks_title,
100881- atomic_read(&rdtp->dynticks) & 0xfff,
100882+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
100883 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
100884 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
100885 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
100886@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
100887 return;
100888 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
100889 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
100890- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
100891+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
100892 wake_up(&rdp_leader->nocb_wq);
100893 }
100894 }
100895@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
100896 atomic_long_add(rhcount, &rdp->nocb_q_count);
100897 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
100898 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
100899- ACCESS_ONCE(*old_rhpp) = rhp;
100900+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
100901 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
100902 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
100903
100904@@ -2167,7 +2167,7 @@ wait_again:
100905 continue; /* No CBs here, try next follower. */
100906
100907 /* Move callbacks to wait-for-GP list, which is empty. */
100908- ACCESS_ONCE(rdp->nocb_head) = NULL;
100909+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
100910 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
100911 gotcbs = true;
100912 }
100913@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
100914 list = ACCESS_ONCE(rdp->nocb_follower_head);
100915 BUG_ON(!list);
100916 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
100917- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
100918+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
100919 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
100920
100921 /* Each pass through the following loop invokes a callback. */
100922@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
100923 if (!rcu_nocb_need_deferred_wakeup(rdp))
100924 return;
100925 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
100926- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
100927+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
100928 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
100929 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
100930 }
100931@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
100932 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
100933 "rcuo%c/%d", rsp->abbr, cpu);
100934 BUG_ON(IS_ERR(t));
100935- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
100936+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
100937 }
100938
100939 /*
100940@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
100941
100942 /* Record start of fully idle period. */
100943 j = jiffies;
100944- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
100945+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
100946 smp_mb__before_atomic();
100947- atomic_inc(&rdtp->dynticks_idle);
100948+ atomic_inc_unchecked(&rdtp->dynticks_idle);
100949 smp_mb__after_atomic();
100950- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
100951+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
100952 }
100953
100954 /*
100955@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
100956
100957 /* Record end of idle period. */
100958 smp_mb__before_atomic();
100959- atomic_inc(&rdtp->dynticks_idle);
100960+ atomic_inc_unchecked(&rdtp->dynticks_idle);
100961 smp_mb__after_atomic();
100962- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
100963+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
100964
100965 /*
100966 * If we are the timekeeping CPU, we are permitted to be non-idle
100967@@ -2788,7 +2788,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
100968 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
100969
100970 /* Pick up current idle and NMI-nesting counter and check. */
100971- cur = atomic_read(&rdtp->dynticks_idle);
100972+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
100973 if (cur & 0x1) {
100974 *isidle = false; /* We are not idle! */
100975 return;
100976@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
100977 case RCU_SYSIDLE_NOT:
100978
100979 /* First time all are idle, so note a short idle period. */
100980- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
100981+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
100982 break;
100983
100984 case RCU_SYSIDLE_SHORT:
100985@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
100986 {
100987 smp_mb();
100988 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
100989- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
100990+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
100991 }
100992
100993 /*
100994@@ -2927,7 +2927,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
100995 smp_mb(); /* grace period precedes setting inuse. */
100996
100997 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
100998- ACCESS_ONCE(rshp->inuse) = 0;
100999+ ACCESS_ONCE_RW(rshp->inuse) = 0;
101000 }
101001
101002 /*
101003@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
101004 static void rcu_dynticks_task_enter(void)
101005 {
101006 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101007- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
101008+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
101009 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101010 }
101011
101012@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
101013 static void rcu_dynticks_task_exit(void)
101014 {
101015 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101016- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
101017+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
101018 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101019 }
101020diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
101021index fbb6240..f6c5097 100644
101022--- a/kernel/rcu/tree_trace.c
101023+++ b/kernel/rcu/tree_trace.c
101024@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
101025 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
101026 rdp->qs_pending);
101027 seq_printf(m, " dt=%d/%llx/%d df=%lu",
101028- atomic_read(&rdp->dynticks->dynticks),
101029+ atomic_read_unchecked(&rdp->dynticks->dynticks),
101030 rdp->dynticks->dynticks_nesting,
101031 rdp->dynticks->dynticks_nmi_nesting,
101032 rdp->dynticks_fqs);
101033@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
101034 struct rcu_state *rsp = (struct rcu_state *)m->private;
101035
101036 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",
101037- atomic_long_read(&rsp->expedited_start),
101038+ atomic_long_read_unchecked(&rsp->expedited_start),
101039 atomic_long_read(&rsp->expedited_done),
101040- atomic_long_read(&rsp->expedited_wrap),
101041- atomic_long_read(&rsp->expedited_tryfail),
101042- atomic_long_read(&rsp->expedited_workdone1),
101043- atomic_long_read(&rsp->expedited_workdone2),
101044- atomic_long_read(&rsp->expedited_normal),
101045- atomic_long_read(&rsp->expedited_stoppedcpus),
101046- atomic_long_read(&rsp->expedited_done_tries),
101047- atomic_long_read(&rsp->expedited_done_lost),
101048- atomic_long_read(&rsp->expedited_done_exit));
101049+ atomic_long_read_unchecked(&rsp->expedited_wrap),
101050+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
101051+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
101052+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
101053+ atomic_long_read_unchecked(&rsp->expedited_normal),
101054+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
101055+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
101056+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
101057+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
101058 return 0;
101059 }
101060
101061diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
101062index e0d31a3..f4dafe3 100644
101063--- a/kernel/rcu/update.c
101064+++ b/kernel/rcu/update.c
101065@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
101066 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
101067 */
101068 if (till_stall_check < 3) {
101069- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
101070+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
101071 till_stall_check = 3;
101072 } else if (till_stall_check > 300) {
101073- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
101074+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
101075 till_stall_check = 300;
101076 }
101077 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
101078@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
101079 !ACCESS_ONCE(t->on_rq) ||
101080 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
101081 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
101082- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
101083+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
101084 list_del_init(&t->rcu_tasks_holdout_list);
101085 put_task_struct(t);
101086 return;
101087@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
101088 !is_idle_task(t)) {
101089 get_task_struct(t);
101090 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
101091- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
101092+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
101093 list_add(&t->rcu_tasks_holdout_list,
101094 &rcu_tasks_holdouts);
101095 }
101096@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
101097 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
101098 BUG_ON(IS_ERR(t));
101099 smp_mb(); /* Ensure others see full kthread. */
101100- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
101101+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
101102 mutex_unlock(&rcu_tasks_kthread_mutex);
101103 }
101104
101105diff --git a/kernel/resource.c b/kernel/resource.c
101106index 19f2357..ebe7f35 100644
101107--- a/kernel/resource.c
101108+++ b/kernel/resource.c
101109@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
101110
101111 static int __init ioresources_init(void)
101112 {
101113+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101114+#ifdef CONFIG_GRKERNSEC_PROC_USER
101115+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
101116+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
101117+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101118+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
101119+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
101120+#endif
101121+#else
101122 proc_create("ioports", 0, NULL, &proc_ioports_operations);
101123 proc_create("iomem", 0, NULL, &proc_iomem_operations);
101124+#endif
101125 return 0;
101126 }
101127 __initcall(ioresources_init);
101128diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
101129index eae160d..c9aa22e 100644
101130--- a/kernel/sched/auto_group.c
101131+++ b/kernel/sched/auto_group.c
101132@@ -11,7 +11,7 @@
101133
101134 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
101135 static struct autogroup autogroup_default;
101136-static atomic_t autogroup_seq_nr;
101137+static atomic_unchecked_t autogroup_seq_nr;
101138
101139 void __init autogroup_init(struct task_struct *init_task)
101140 {
101141@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
101142
101143 kref_init(&ag->kref);
101144 init_rwsem(&ag->lock);
101145- ag->id = atomic_inc_return(&autogroup_seq_nr);
101146+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
101147 ag->tg = tg;
101148 #ifdef CONFIG_RT_GROUP_SCHED
101149 /*
101150diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
101151index 8d0f35d..c16360d 100644
101152--- a/kernel/sched/completion.c
101153+++ b/kernel/sched/completion.c
101154@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
101155 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101156 * or number of jiffies left till timeout) if completed.
101157 */
101158-long __sched
101159+long __sched __intentional_overflow(-1)
101160 wait_for_completion_interruptible_timeout(struct completion *x,
101161 unsigned long timeout)
101162 {
101163@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
101164 *
101165 * Return: -ERESTARTSYS if interrupted, 0 if completed.
101166 */
101167-int __sched wait_for_completion_killable(struct completion *x)
101168+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
101169 {
101170 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
101171 if (t == -ERESTARTSYS)
101172@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
101173 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101174 * or number of jiffies left till timeout) if completed.
101175 */
101176-long __sched
101177+long __sched __intentional_overflow(-1)
101178 wait_for_completion_killable_timeout(struct completion *x,
101179 unsigned long timeout)
101180 {
101181diff --git a/kernel/sched/core.c b/kernel/sched/core.c
101182index f4da2cb..e44587b 100644
101183--- a/kernel/sched/core.c
101184+++ b/kernel/sched/core.c
101185@@ -1862,7 +1862,7 @@ void set_numabalancing_state(bool enabled)
101186 int sysctl_numa_balancing(struct ctl_table *table, int write,
101187 void __user *buffer, size_t *lenp, loff_t *ppos)
101188 {
101189- struct ctl_table t;
101190+ ctl_table_no_const t;
101191 int err;
101192 int state = numabalancing_enabled;
101193
101194@@ -2312,8 +2312,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
101195 next->active_mm = oldmm;
101196 atomic_inc(&oldmm->mm_count);
101197 enter_lazy_tlb(oldmm, next);
101198- } else
101199+ } else {
101200 switch_mm(oldmm, mm, next);
101201+ populate_stack();
101202+ }
101203
101204 if (!prev->mm) {
101205 prev->active_mm = NULL;
101206@@ -3124,6 +3126,8 @@ int can_nice(const struct task_struct *p, const int nice)
101207 /* convert nice value [19,-20] to rlimit style value [1,40] */
101208 int nice_rlim = nice_to_rlimit(nice);
101209
101210+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
101211+
101212 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
101213 capable(CAP_SYS_NICE));
101214 }
101215@@ -3150,7 +3154,8 @@ SYSCALL_DEFINE1(nice, int, increment)
101216 nice = task_nice(current) + increment;
101217
101218 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
101219- if (increment < 0 && !can_nice(current, nice))
101220+ if (increment < 0 && (!can_nice(current, nice) ||
101221+ gr_handle_chroot_nice()))
101222 return -EPERM;
101223
101224 retval = security_task_setnice(current, nice);
101225@@ -3462,6 +3467,7 @@ recheck:
101226 if (policy != p->policy && !rlim_rtprio)
101227 return -EPERM;
101228
101229+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
101230 /* can't increase priority */
101231 if (attr->sched_priority > p->rt_priority &&
101232 attr->sched_priority > rlim_rtprio)
101233@@ -4945,6 +4951,7 @@ void idle_task_exit(void)
101234
101235 if (mm != &init_mm) {
101236 switch_mm(mm, &init_mm, current);
101237+ populate_stack();
101238 finish_arch_post_lock_switch();
101239 }
101240 mmdrop(mm);
101241@@ -5040,7 +5047,7 @@ static void migrate_tasks(unsigned int dead_cpu)
101242
101243 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
101244
101245-static struct ctl_table sd_ctl_dir[] = {
101246+static ctl_table_no_const sd_ctl_dir[] __read_only = {
101247 {
101248 .procname = "sched_domain",
101249 .mode = 0555,
101250@@ -5057,17 +5064,17 @@ static struct ctl_table sd_ctl_root[] = {
101251 {}
101252 };
101253
101254-static struct ctl_table *sd_alloc_ctl_entry(int n)
101255+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
101256 {
101257- struct ctl_table *entry =
101258+ ctl_table_no_const *entry =
101259 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
101260
101261 return entry;
101262 }
101263
101264-static void sd_free_ctl_entry(struct ctl_table **tablep)
101265+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
101266 {
101267- struct ctl_table *entry;
101268+ ctl_table_no_const *entry;
101269
101270 /*
101271 * In the intermediate directories, both the child directory and
101272@@ -5075,22 +5082,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
101273 * will always be set. In the lowest directory the names are
101274 * static strings and all have proc handlers.
101275 */
101276- for (entry = *tablep; entry->mode; entry++) {
101277- if (entry->child)
101278- sd_free_ctl_entry(&entry->child);
101279+ for (entry = tablep; entry->mode; entry++) {
101280+ if (entry->child) {
101281+ sd_free_ctl_entry(entry->child);
101282+ pax_open_kernel();
101283+ entry->child = NULL;
101284+ pax_close_kernel();
101285+ }
101286 if (entry->proc_handler == NULL)
101287 kfree(entry->procname);
101288 }
101289
101290- kfree(*tablep);
101291- *tablep = NULL;
101292+ kfree(tablep);
101293 }
101294
101295 static int min_load_idx = 0;
101296 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
101297
101298 static void
101299-set_table_entry(struct ctl_table *entry,
101300+set_table_entry(ctl_table_no_const *entry,
101301 const char *procname, void *data, int maxlen,
101302 umode_t mode, proc_handler *proc_handler,
101303 bool load_idx)
101304@@ -5110,7 +5120,7 @@ set_table_entry(struct ctl_table *entry,
101305 static struct ctl_table *
101306 sd_alloc_ctl_domain_table(struct sched_domain *sd)
101307 {
101308- struct ctl_table *table = sd_alloc_ctl_entry(14);
101309+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
101310
101311 if (table == NULL)
101312 return NULL;
101313@@ -5148,9 +5158,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
101314 return table;
101315 }
101316
101317-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
101318+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
101319 {
101320- struct ctl_table *entry, *table;
101321+ ctl_table_no_const *entry, *table;
101322 struct sched_domain *sd;
101323 int domain_num = 0, i;
101324 char buf[32];
101325@@ -5177,11 +5187,13 @@ static struct ctl_table_header *sd_sysctl_header;
101326 static void register_sched_domain_sysctl(void)
101327 {
101328 int i, cpu_num = num_possible_cpus();
101329- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
101330+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
101331 char buf[32];
101332
101333 WARN_ON(sd_ctl_dir[0].child);
101334+ pax_open_kernel();
101335 sd_ctl_dir[0].child = entry;
101336+ pax_close_kernel();
101337
101338 if (entry == NULL)
101339 return;
101340@@ -5204,8 +5216,12 @@ static void unregister_sched_domain_sysctl(void)
101341 if (sd_sysctl_header)
101342 unregister_sysctl_table(sd_sysctl_header);
101343 sd_sysctl_header = NULL;
101344- if (sd_ctl_dir[0].child)
101345- sd_free_ctl_entry(&sd_ctl_dir[0].child);
101346+ if (sd_ctl_dir[0].child) {
101347+ sd_free_ctl_entry(sd_ctl_dir[0].child);
101348+ pax_open_kernel();
101349+ sd_ctl_dir[0].child = NULL;
101350+ pax_close_kernel();
101351+ }
101352 }
101353 #else
101354 static void register_sched_domain_sysctl(void)
101355diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
101356index 241213b..6a64c91 100644
101357--- a/kernel/sched/fair.c
101358+++ b/kernel/sched/fair.c
101359@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
101360
101361 static void reset_ptenuma_scan(struct task_struct *p)
101362 {
101363- ACCESS_ONCE(p->mm->numa_scan_seq)++;
101364+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
101365 p->mm->numa_scan_offset = 0;
101366 }
101367
101368@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
101369 * run_rebalance_domains is triggered when needed from the scheduler tick.
101370 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
101371 */
101372-static void run_rebalance_domains(struct softirq_action *h)
101373+static __latent_entropy void run_rebalance_domains(void)
101374 {
101375 struct rq *this_rq = this_rq();
101376 enum cpu_idle_type idle = this_rq->idle_balance ?
101377diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
101378index dc0f435..ae2e085 100644
101379--- a/kernel/sched/sched.h
101380+++ b/kernel/sched/sched.h
101381@@ -1200,7 +1200,7 @@ struct sched_class {
101382 #ifdef CONFIG_FAIR_GROUP_SCHED
101383 void (*task_move_group) (struct task_struct *p, int on_rq);
101384 #endif
101385-};
101386+} __do_const;
101387
101388 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
101389 {
101390diff --git a/kernel/signal.c b/kernel/signal.c
101391index a390499..ebe9a21 100644
101392--- a/kernel/signal.c
101393+++ b/kernel/signal.c
101394@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
101395
101396 int print_fatal_signals __read_mostly;
101397
101398-static void __user *sig_handler(struct task_struct *t, int sig)
101399+static __sighandler_t sig_handler(struct task_struct *t, int sig)
101400 {
101401 return t->sighand->action[sig - 1].sa.sa_handler;
101402 }
101403
101404-static int sig_handler_ignored(void __user *handler, int sig)
101405+static int sig_handler_ignored(__sighandler_t handler, int sig)
101406 {
101407 /* Is it explicitly or implicitly ignored? */
101408 return handler == SIG_IGN ||
101409@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
101410
101411 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
101412 {
101413- void __user *handler;
101414+ __sighandler_t handler;
101415
101416 handler = sig_handler(t, sig);
101417
101418@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
101419 atomic_inc(&user->sigpending);
101420 rcu_read_unlock();
101421
101422+ if (!override_rlimit)
101423+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
101424+
101425 if (override_rlimit ||
101426 atomic_read(&user->sigpending) <=
101427 task_rlimit(t, RLIMIT_SIGPENDING)) {
101428@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
101429
101430 int unhandled_signal(struct task_struct *tsk, int sig)
101431 {
101432- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
101433+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
101434 if (is_global_init(tsk))
101435 return 1;
101436 if (handler != SIG_IGN && handler != SIG_DFL)
101437@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
101438 }
101439 }
101440
101441+ /* allow glibc communication via tgkill to other threads in our
101442+ thread group */
101443+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
101444+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
101445+ && gr_handle_signal(t, sig))
101446+ return -EPERM;
101447+
101448 return security_task_kill(t, info, sig, 0);
101449 }
101450
101451@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101452 return send_signal(sig, info, p, 1);
101453 }
101454
101455-static int
101456+int
101457 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101458 {
101459 return send_signal(sig, info, t, 0);
101460@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101461 unsigned long int flags;
101462 int ret, blocked, ignored;
101463 struct k_sigaction *action;
101464+ int is_unhandled = 0;
101465
101466 spin_lock_irqsave(&t->sighand->siglock, flags);
101467 action = &t->sighand->action[sig-1];
101468@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101469 }
101470 if (action->sa.sa_handler == SIG_DFL)
101471 t->signal->flags &= ~SIGNAL_UNKILLABLE;
101472+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
101473+ is_unhandled = 1;
101474 ret = specific_send_sig_info(sig, info, t);
101475 spin_unlock_irqrestore(&t->sighand->siglock, flags);
101476
101477+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
101478+ normal operation */
101479+ if (is_unhandled) {
101480+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
101481+ gr_handle_crash(t, sig);
101482+ }
101483+
101484 return ret;
101485 }
101486
101487@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101488 ret = check_kill_permission(sig, info, p);
101489 rcu_read_unlock();
101490
101491- if (!ret && sig)
101492+ if (!ret && sig) {
101493 ret = do_send_sig_info(sig, info, p, true);
101494+ if (!ret)
101495+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
101496+ }
101497
101498 return ret;
101499 }
101500@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
101501 int error = -ESRCH;
101502
101503 rcu_read_lock();
101504- p = find_task_by_vpid(pid);
101505+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
101506+ /* allow glibc communication via tgkill to other threads in our
101507+ thread group */
101508+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
101509+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
101510+ p = find_task_by_vpid_unrestricted(pid);
101511+ else
101512+#endif
101513+ p = find_task_by_vpid(pid);
101514 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
101515 error = check_kill_permission(sig, info, p);
101516 /*
101517@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
101518 }
101519 seg = get_fs();
101520 set_fs(KERNEL_DS);
101521- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
101522- (stack_t __force __user *) &uoss,
101523+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
101524+ (stack_t __force_user *) &uoss,
101525 compat_user_stack_pointer());
101526 set_fs(seg);
101527 if (ret >= 0 && uoss_ptr) {
101528diff --git a/kernel/smpboot.c b/kernel/smpboot.c
101529index 40190f2..8861d40 100644
101530--- a/kernel/smpboot.c
101531+++ b/kernel/smpboot.c
101532@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
101533 }
101534 smpboot_unpark_thread(plug_thread, cpu);
101535 }
101536- list_add(&plug_thread->list, &hotplug_threads);
101537+ pax_list_add(&plug_thread->list, &hotplug_threads);
101538 out:
101539 mutex_unlock(&smpboot_threads_lock);
101540 put_online_cpus();
101541@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
101542 {
101543 get_online_cpus();
101544 mutex_lock(&smpboot_threads_lock);
101545- list_del(&plug_thread->list);
101546+ pax_list_del(&plug_thread->list);
101547 smpboot_destroy_threads(plug_thread);
101548 mutex_unlock(&smpboot_threads_lock);
101549 put_online_cpus();
101550diff --git a/kernel/softirq.c b/kernel/softirq.c
101551index 479e443..66d845e1 100644
101552--- a/kernel/softirq.c
101553+++ b/kernel/softirq.c
101554@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
101555 EXPORT_SYMBOL(irq_stat);
101556 #endif
101557
101558-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
101559+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
101560
101561 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
101562
101563@@ -270,7 +270,7 @@ restart:
101564 kstat_incr_softirqs_this_cpu(vec_nr);
101565
101566 trace_softirq_entry(vec_nr);
101567- h->action(h);
101568+ h->action();
101569 trace_softirq_exit(vec_nr);
101570 if (unlikely(prev_count != preempt_count())) {
101571 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
101572@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
101573 or_softirq_pending(1UL << nr);
101574 }
101575
101576-void open_softirq(int nr, void (*action)(struct softirq_action *))
101577+void __init open_softirq(int nr, void (*action)(void))
101578 {
101579 softirq_vec[nr].action = action;
101580 }
101581@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
101582 }
101583 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
101584
101585-static void tasklet_action(struct softirq_action *a)
101586+static void tasklet_action(void)
101587 {
101588 struct tasklet_struct *list;
101589
101590@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
101591 }
101592 }
101593
101594-static void tasklet_hi_action(struct softirq_action *a)
101595+static __latent_entropy void tasklet_hi_action(void)
101596 {
101597 struct tasklet_struct *list;
101598
101599@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
101600 .notifier_call = cpu_callback
101601 };
101602
101603-static struct smp_hotplug_thread softirq_threads = {
101604+static struct smp_hotplug_thread softirq_threads __read_only = {
101605 .store = &ksoftirqd,
101606 .thread_should_run = ksoftirqd_should_run,
101607 .thread_fn = run_ksoftirqd,
101608diff --git a/kernel/sys.c b/kernel/sys.c
101609index a03d9cd..55dbe9c 100644
101610--- a/kernel/sys.c
101611+++ b/kernel/sys.c
101612@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
101613 error = -EACCES;
101614 goto out;
101615 }
101616+
101617+ if (gr_handle_chroot_setpriority(p, niceval)) {
101618+ error = -EACCES;
101619+ goto out;
101620+ }
101621+
101622 no_nice = security_task_setnice(p, niceval);
101623 if (no_nice) {
101624 error = no_nice;
101625@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
101626 goto error;
101627 }
101628
101629+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
101630+ goto error;
101631+
101632+ if (!gid_eq(new->gid, old->gid)) {
101633+ /* make sure we generate a learn log for what will
101634+ end up being a role transition after a full-learning
101635+ policy is generated
101636+ CAP_SETGID is required to perform a transition
101637+ we may not log a CAP_SETGID check above, e.g.
101638+ in the case where new rgid = old egid
101639+ */
101640+ gr_learn_cap(current, new, CAP_SETGID);
101641+ }
101642+
101643 if (rgid != (gid_t) -1 ||
101644 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
101645 new->sgid = new->egid;
101646@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
101647 old = current_cred();
101648
101649 retval = -EPERM;
101650+
101651+ if (gr_check_group_change(kgid, kgid, kgid))
101652+ goto error;
101653+
101654 if (ns_capable(old->user_ns, CAP_SETGID))
101655 new->gid = new->egid = new->sgid = new->fsgid = kgid;
101656 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
101657@@ -417,7 +441,7 @@ error:
101658 /*
101659 * change the user struct in a credentials set to match the new UID
101660 */
101661-static int set_user(struct cred *new)
101662+int set_user(struct cred *new)
101663 {
101664 struct user_struct *new_user;
101665
101666@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
101667 goto error;
101668 }
101669
101670+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
101671+ goto error;
101672+
101673 if (!uid_eq(new->uid, old->uid)) {
101674+ /* make sure we generate a learn log for what will
101675+ end up being a role transition after a full-learning
101676+ policy is generated
101677+ CAP_SETUID is required to perform a transition
101678+ we may not log a CAP_SETUID check above, e.g.
101679+ in the case where new ruid = old euid
101680+ */
101681+ gr_learn_cap(current, new, CAP_SETUID);
101682 retval = set_user(new);
101683 if (retval < 0)
101684 goto error;
101685@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
101686 old = current_cred();
101687
101688 retval = -EPERM;
101689+
101690+ if (gr_check_crash_uid(kuid))
101691+ goto error;
101692+ if (gr_check_user_change(kuid, kuid, kuid))
101693+ goto error;
101694+
101695 if (ns_capable(old->user_ns, CAP_SETUID)) {
101696 new->suid = new->uid = kuid;
101697 if (!uid_eq(kuid, old->uid)) {
101698@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
101699 goto error;
101700 }
101701
101702+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
101703+ goto error;
101704+
101705 if (ruid != (uid_t) -1) {
101706 new->uid = kruid;
101707 if (!uid_eq(kruid, old->uid)) {
101708@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
101709 goto error;
101710 }
101711
101712+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
101713+ goto error;
101714+
101715 if (rgid != (gid_t) -1)
101716 new->gid = krgid;
101717 if (egid != (gid_t) -1)
101718@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
101719 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
101720 ns_capable(old->user_ns, CAP_SETUID)) {
101721 if (!uid_eq(kuid, old->fsuid)) {
101722+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
101723+ goto error;
101724+
101725 new->fsuid = kuid;
101726 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
101727 goto change_okay;
101728 }
101729 }
101730
101731+error:
101732 abort_creds(new);
101733 return old_fsuid;
101734
101735@@ -802,12 +853,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
101736 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
101737 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
101738 ns_capable(old->user_ns, CAP_SETGID)) {
101739+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
101740+ goto error;
101741+
101742 if (!gid_eq(kgid, old->fsgid)) {
101743 new->fsgid = kgid;
101744 goto change_okay;
101745 }
101746 }
101747
101748+error:
101749 abort_creds(new);
101750 return old_fsgid;
101751
101752@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
101753 return -EFAULT;
101754
101755 down_read(&uts_sem);
101756- error = __copy_to_user(&name->sysname, &utsname()->sysname,
101757+ error = __copy_to_user(name->sysname, &utsname()->sysname,
101758 __OLD_UTS_LEN);
101759 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
101760- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
101761+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
101762 __OLD_UTS_LEN);
101763 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
101764- error |= __copy_to_user(&name->release, &utsname()->release,
101765+ error |= __copy_to_user(name->release, &utsname()->release,
101766 __OLD_UTS_LEN);
101767 error |= __put_user(0, name->release + __OLD_UTS_LEN);
101768- error |= __copy_to_user(&name->version, &utsname()->version,
101769+ error |= __copy_to_user(name->version, &utsname()->version,
101770 __OLD_UTS_LEN);
101771 error |= __put_user(0, name->version + __OLD_UTS_LEN);
101772- error |= __copy_to_user(&name->machine, &utsname()->machine,
101773+ error |= __copy_to_user(name->machine, &utsname()->machine,
101774 __OLD_UTS_LEN);
101775 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
101776 up_read(&uts_sem);
101777@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
101778 */
101779 new_rlim->rlim_cur = 1;
101780 }
101781+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
101782+ is changed to a lower value. Since tasks can be created by the same
101783+ user in between this limit change and an execve by this task, force
101784+ a recheck only for this task by setting PF_NPROC_EXCEEDED
101785+ */
101786+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
101787+ tsk->flags |= PF_NPROC_EXCEEDED;
101788 }
101789 if (!retval) {
101790 if (old_rlim)
101791diff --git a/kernel/sysctl.c b/kernel/sysctl.c
101792index ce410bb..cd276f0 100644
101793--- a/kernel/sysctl.c
101794+++ b/kernel/sysctl.c
101795@@ -94,7 +94,6 @@
101796
101797
101798 #if defined(CONFIG_SYSCTL)
101799-
101800 /* External variables not in a header file. */
101801 extern int max_threads;
101802 extern int suid_dumpable;
101803@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
101804
101805 /* Constants used for minimum and maximum */
101806 #ifdef CONFIG_LOCKUP_DETECTOR
101807-static int sixty = 60;
101808+static int sixty __read_only = 60;
101809 #endif
101810
101811-static int __maybe_unused neg_one = -1;
101812+static int __maybe_unused neg_one __read_only = -1;
101813
101814-static int zero;
101815-static int __maybe_unused one = 1;
101816-static int __maybe_unused two = 2;
101817-static int __maybe_unused four = 4;
101818-static unsigned long one_ul = 1;
101819-static int one_hundred = 100;
101820+static int zero __read_only = 0;
101821+static int __maybe_unused one __read_only = 1;
101822+static int __maybe_unused two __read_only = 2;
101823+static int __maybe_unused three __read_only = 3;
101824+static int __maybe_unused four __read_only = 4;
101825+static unsigned long one_ul __read_only = 1;
101826+static int one_hundred __read_only = 100;
101827 #ifdef CONFIG_PRINTK
101828-static int ten_thousand = 10000;
101829+static int ten_thousand __read_only = 10000;
101830 #endif
101831
101832 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
101833@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
101834 void __user *buffer, size_t *lenp, loff_t *ppos);
101835 #endif
101836
101837-#ifdef CONFIG_PRINTK
101838 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
101839 void __user *buffer, size_t *lenp, loff_t *ppos);
101840-#endif
101841
101842 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
101843 void __user *buffer, size_t *lenp, loff_t *ppos);
101844@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
101845
101846 #endif
101847
101848+extern struct ctl_table grsecurity_table[];
101849+
101850 static struct ctl_table kern_table[];
101851 static struct ctl_table vm_table[];
101852 static struct ctl_table fs_table[];
101853@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
101854 int sysctl_legacy_va_layout;
101855 #endif
101856
101857+#ifdef CONFIG_PAX_SOFTMODE
101858+static struct ctl_table pax_table[] = {
101859+ {
101860+ .procname = "softmode",
101861+ .data = &pax_softmode,
101862+ .maxlen = sizeof(unsigned int),
101863+ .mode = 0600,
101864+ .proc_handler = &proc_dointvec,
101865+ },
101866+
101867+ { }
101868+};
101869+#endif
101870+
101871 /* The default sysctl tables: */
101872
101873 static struct ctl_table sysctl_base_table[] = {
101874@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
101875 #endif
101876
101877 static struct ctl_table kern_table[] = {
101878+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
101879+ {
101880+ .procname = "grsecurity",
101881+ .mode = 0500,
101882+ .child = grsecurity_table,
101883+ },
101884+#endif
101885+
101886+#ifdef CONFIG_PAX_SOFTMODE
101887+ {
101888+ .procname = "pax",
101889+ .mode = 0500,
101890+ .child = pax_table,
101891+ },
101892+#endif
101893+
101894 {
101895 .procname = "sched_child_runs_first",
101896 .data = &sysctl_sched_child_runs_first,
101897@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
101898 .data = &modprobe_path,
101899 .maxlen = KMOD_PATH_LEN,
101900 .mode = 0644,
101901- .proc_handler = proc_dostring,
101902+ .proc_handler = proc_dostring_modpriv,
101903 },
101904 {
101905 .procname = "modules_disabled",
101906@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
101907 .extra1 = &zero,
101908 .extra2 = &one,
101909 },
101910+#endif
101911 {
101912 .procname = "kptr_restrict",
101913 .data = &kptr_restrict,
101914 .maxlen = sizeof(int),
101915 .mode = 0644,
101916 .proc_handler = proc_dointvec_minmax_sysadmin,
101917+#ifdef CONFIG_GRKERNSEC_HIDESYM
101918+ .extra1 = &two,
101919+#else
101920 .extra1 = &zero,
101921+#endif
101922 .extra2 = &two,
101923 },
101924-#endif
101925 {
101926 .procname = "ngroups_max",
101927 .data = &ngroups_max,
101928@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
101929 */
101930 {
101931 .procname = "perf_event_paranoid",
101932- .data = &sysctl_perf_event_paranoid,
101933- .maxlen = sizeof(sysctl_perf_event_paranoid),
101934+ .data = &sysctl_perf_event_legitimately_concerned,
101935+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
101936 .mode = 0644,
101937- .proc_handler = proc_dointvec,
101938+ /* go ahead, be a hero */
101939+ .proc_handler = proc_dointvec_minmax_sysadmin,
101940+ .extra1 = &neg_one,
101941+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
101942+ .extra2 = &three,
101943+#else
101944+ .extra2 = &two,
101945+#endif
101946 },
101947 {
101948 .procname = "perf_event_mlock_kb",
101949@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
101950 .proc_handler = proc_dointvec_minmax,
101951 .extra1 = &zero,
101952 },
101953+ {
101954+ .procname = "heap_stack_gap",
101955+ .data = &sysctl_heap_stack_gap,
101956+ .maxlen = sizeof(sysctl_heap_stack_gap),
101957+ .mode = 0644,
101958+ .proc_handler = proc_doulongvec_minmax,
101959+ },
101960 #else
101961 {
101962 .procname = "nr_trim_pages",
101963@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
101964 (char __user *)buffer, lenp, ppos);
101965 }
101966
101967+int proc_dostring_modpriv(struct ctl_table *table, int write,
101968+ void __user *buffer, size_t *lenp, loff_t *ppos)
101969+{
101970+ if (write && !capable(CAP_SYS_MODULE))
101971+ return -EPERM;
101972+
101973+ return _proc_do_string(table->data, table->maxlen, write,
101974+ buffer, lenp, ppos);
101975+}
101976+
101977 static size_t proc_skip_spaces(char **buf)
101978 {
101979 size_t ret;
101980@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
101981 len = strlen(tmp);
101982 if (len > *size)
101983 len = *size;
101984+ if (len > sizeof(tmp))
101985+ len = sizeof(tmp);
101986 if (copy_to_user(*buf, tmp, len))
101987 return -EFAULT;
101988 *size -= len;
101989@@ -2112,7 +2172,7 @@ int proc_dointvec(struct ctl_table *table, int write,
101990 static int proc_taint(struct ctl_table *table, int write,
101991 void __user *buffer, size_t *lenp, loff_t *ppos)
101992 {
101993- struct ctl_table t;
101994+ ctl_table_no_const t;
101995 unsigned long tmptaint = get_taint();
101996 int err;
101997
101998@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
101999 return err;
102000 }
102001
102002-#ifdef CONFIG_PRINTK
102003 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102004 void __user *buffer, size_t *lenp, loff_t *ppos)
102005 {
102006@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102007
102008 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
102009 }
102010-#endif
102011
102012 struct do_proc_dointvec_minmax_conv_param {
102013 int *min;
102014@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
102015 return -ENOSYS;
102016 }
102017
102018+int proc_dostring_modpriv(struct ctl_table *table, int write,
102019+ void __user *buffer, size_t *lenp, loff_t *ppos)
102020+{
102021+ return -ENOSYS;
102022+}
102023+
102024 int proc_dointvec(struct ctl_table *table, int write,
102025 void __user *buffer, size_t *lenp, loff_t *ppos)
102026 {
102027@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
102028 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
102029 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
102030 EXPORT_SYMBOL(proc_dostring);
102031+EXPORT_SYMBOL(proc_dostring_modpriv);
102032 EXPORT_SYMBOL(proc_doulongvec_minmax);
102033 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
102034diff --git a/kernel/taskstats.c b/kernel/taskstats.c
102035index 21f82c2..c1984e5 100644
102036--- a/kernel/taskstats.c
102037+++ b/kernel/taskstats.c
102038@@ -28,9 +28,12 @@
102039 #include <linux/fs.h>
102040 #include <linux/file.h>
102041 #include <linux/pid_namespace.h>
102042+#include <linux/grsecurity.h>
102043 #include <net/genetlink.h>
102044 #include <linux/atomic.h>
102045
102046+extern int gr_is_taskstats_denied(int pid);
102047+
102048 /*
102049 * Maximum length of a cpumask that can be specified in
102050 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
102051@@ -567,6 +570,9 @@ err:
102052
102053 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
102054 {
102055+ if (gr_is_taskstats_denied(current->pid))
102056+ return -EACCES;
102057+
102058 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
102059 return cmd_attr_register_cpumask(info);
102060 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
102061diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
102062index 1b001ed..55ef9e4 100644
102063--- a/kernel/time/alarmtimer.c
102064+++ b/kernel/time/alarmtimer.c
102065@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
102066 struct platform_device *pdev;
102067 int error = 0;
102068 int i;
102069- struct k_clock alarm_clock = {
102070+ static struct k_clock alarm_clock = {
102071 .clock_getres = alarm_clock_getres,
102072 .clock_get = alarm_clock_get,
102073 .timer_create = alarm_timer_create,
102074diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
102075index 38f586c..14386a7 100644
102076--- a/kernel/time/hrtimer.c
102077+++ b/kernel/time/hrtimer.c
102078@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
102079 local_irq_restore(flags);
102080 }
102081
102082-static void run_hrtimer_softirq(struct softirq_action *h)
102083+static __latent_entropy void run_hrtimer_softirq(void)
102084 {
102085 hrtimer_peek_ahead_timers();
102086 }
102087diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
102088index 0075da7..63cc872 100644
102089--- a/kernel/time/posix-cpu-timers.c
102090+++ b/kernel/time/posix-cpu-timers.c
102091@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
102092
102093 static __init int init_posix_cpu_timers(void)
102094 {
102095- struct k_clock process = {
102096+ static struct k_clock process = {
102097 .clock_getres = process_cpu_clock_getres,
102098 .clock_get = process_cpu_clock_get,
102099 .timer_create = process_cpu_timer_create,
102100 .nsleep = process_cpu_nsleep,
102101 .nsleep_restart = process_cpu_nsleep_restart,
102102 };
102103- struct k_clock thread = {
102104+ static struct k_clock thread = {
102105 .clock_getres = thread_cpu_clock_getres,
102106 .clock_get = thread_cpu_clock_get,
102107 .timer_create = thread_cpu_timer_create,
102108diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
102109index 31ea01f..7fc61ef 100644
102110--- a/kernel/time/posix-timers.c
102111+++ b/kernel/time/posix-timers.c
102112@@ -43,6 +43,7 @@
102113 #include <linux/hash.h>
102114 #include <linux/posix-clock.h>
102115 #include <linux/posix-timers.h>
102116+#include <linux/grsecurity.h>
102117 #include <linux/syscalls.h>
102118 #include <linux/wait.h>
102119 #include <linux/workqueue.h>
102120@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
102121 * which we beg off on and pass to do_sys_settimeofday().
102122 */
102123
102124-static struct k_clock posix_clocks[MAX_CLOCKS];
102125+static struct k_clock *posix_clocks[MAX_CLOCKS];
102126
102127 /*
102128 * These ones are defined below.
102129@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
102130 */
102131 static __init int init_posix_timers(void)
102132 {
102133- struct k_clock clock_realtime = {
102134+ static struct k_clock clock_realtime = {
102135 .clock_getres = hrtimer_get_res,
102136 .clock_get = posix_clock_realtime_get,
102137 .clock_set = posix_clock_realtime_set,
102138@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
102139 .timer_get = common_timer_get,
102140 .timer_del = common_timer_del,
102141 };
102142- struct k_clock clock_monotonic = {
102143+ static struct k_clock clock_monotonic = {
102144 .clock_getres = hrtimer_get_res,
102145 .clock_get = posix_ktime_get_ts,
102146 .nsleep = common_nsleep,
102147@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
102148 .timer_get = common_timer_get,
102149 .timer_del = common_timer_del,
102150 };
102151- struct k_clock clock_monotonic_raw = {
102152+ static struct k_clock clock_monotonic_raw = {
102153 .clock_getres = hrtimer_get_res,
102154 .clock_get = posix_get_monotonic_raw,
102155 };
102156- struct k_clock clock_realtime_coarse = {
102157+ static struct k_clock clock_realtime_coarse = {
102158 .clock_getres = posix_get_coarse_res,
102159 .clock_get = posix_get_realtime_coarse,
102160 };
102161- struct k_clock clock_monotonic_coarse = {
102162+ static struct k_clock clock_monotonic_coarse = {
102163 .clock_getres = posix_get_coarse_res,
102164 .clock_get = posix_get_monotonic_coarse,
102165 };
102166- struct k_clock clock_tai = {
102167+ static struct k_clock clock_tai = {
102168 .clock_getres = hrtimer_get_res,
102169 .clock_get = posix_get_tai,
102170 .nsleep = common_nsleep,
102171@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
102172 .timer_get = common_timer_get,
102173 .timer_del = common_timer_del,
102174 };
102175- struct k_clock clock_boottime = {
102176+ static struct k_clock clock_boottime = {
102177 .clock_getres = hrtimer_get_res,
102178 .clock_get = posix_get_boottime,
102179 .nsleep = common_nsleep,
102180@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
102181 return;
102182 }
102183
102184- posix_clocks[clock_id] = *new_clock;
102185+ posix_clocks[clock_id] = new_clock;
102186 }
102187 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
102188
102189@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
102190 return (id & CLOCKFD_MASK) == CLOCKFD ?
102191 &clock_posix_dynamic : &clock_posix_cpu;
102192
102193- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
102194+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
102195 return NULL;
102196- return &posix_clocks[id];
102197+ return posix_clocks[id];
102198 }
102199
102200 static int common_timer_create(struct k_itimer *new_timer)
102201@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
102202 struct k_clock *kc = clockid_to_kclock(which_clock);
102203 struct k_itimer *new_timer;
102204 int error, new_timer_id;
102205- sigevent_t event;
102206+ sigevent_t event = { };
102207 int it_id_set = IT_ID_NOT_SET;
102208
102209 if (!kc)
102210@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
102211 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
102212 return -EFAULT;
102213
102214+ /* only the CLOCK_REALTIME clock can be set, all other clocks
102215+ have their clock_set fptr set to a nosettime dummy function
102216+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
102217+ call common_clock_set, which calls do_sys_settimeofday, which
102218+ we hook
102219+ */
102220+
102221 return kc->clock_set(which_clock, &new_tp);
102222 }
102223
102224diff --git a/kernel/time/time.c b/kernel/time/time.c
102225index 2c85b77..6530536 100644
102226--- a/kernel/time/time.c
102227+++ b/kernel/time/time.c
102228@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
102229 return error;
102230
102231 if (tz) {
102232+ /* we log in do_settimeofday called below, so don't log twice
102233+ */
102234+ if (!tv)
102235+ gr_log_timechange();
102236+
102237 sys_tz = *tz;
102238 update_vsyscall_tz();
102239 if (firsttime) {
102240diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
102241index 91db941..a371671 100644
102242--- a/kernel/time/timekeeping.c
102243+++ b/kernel/time/timekeeping.c
102244@@ -15,6 +15,7 @@
102245 #include <linux/init.h>
102246 #include <linux/mm.h>
102247 #include <linux/sched.h>
102248+#include <linux/grsecurity.h>
102249 #include <linux/syscore_ops.h>
102250 #include <linux/clocksource.h>
102251 #include <linux/jiffies.h>
102252@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
102253 if (!timespec64_valid_strict(ts))
102254 return -EINVAL;
102255
102256+ gr_log_timechange();
102257+
102258 raw_spin_lock_irqsave(&timekeeper_lock, flags);
102259 write_seqcount_begin(&tk_core.seq);
102260
102261diff --git a/kernel/time/timer.c b/kernel/time/timer.c
102262index 2d3f5c5..7ed7dc5 100644
102263--- a/kernel/time/timer.c
102264+++ b/kernel/time/timer.c
102265@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
102266 /*
102267 * This function runs timers and the timer-tq in bottom half context.
102268 */
102269-static void run_timer_softirq(struct softirq_action *h)
102270+static __latent_entropy void run_timer_softirq(void)
102271 {
102272 struct tvec_base *base = __this_cpu_read(tvec_bases);
102273
102274@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
102275 *
102276 * In all cases the return value is guaranteed to be non-negative.
102277 */
102278-signed long __sched schedule_timeout(signed long timeout)
102279+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
102280 {
102281 struct timer_list timer;
102282 unsigned long expire;
102283diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
102284index 61ed862..3b52c65 100644
102285--- a/kernel/time/timer_list.c
102286+++ b/kernel/time/timer_list.c
102287@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
102288
102289 static void print_name_offset(struct seq_file *m, void *sym)
102290 {
102291+#ifdef CONFIG_GRKERNSEC_HIDESYM
102292+ SEQ_printf(m, "<%p>", NULL);
102293+#else
102294 char symname[KSYM_NAME_LEN];
102295
102296 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
102297 SEQ_printf(m, "<%pK>", sym);
102298 else
102299 SEQ_printf(m, "%s", symname);
102300+#endif
102301 }
102302
102303 static void
102304@@ -119,7 +123,11 @@ next_one:
102305 static void
102306 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
102307 {
102308+#ifdef CONFIG_GRKERNSEC_HIDESYM
102309+ SEQ_printf(m, " .base: %p\n", NULL);
102310+#else
102311 SEQ_printf(m, " .base: %pK\n", base);
102312+#endif
102313 SEQ_printf(m, " .index: %d\n",
102314 base->index);
102315 SEQ_printf(m, " .resolution: %Lu nsecs\n",
102316@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
102317 {
102318 struct proc_dir_entry *pe;
102319
102320+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102321+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
102322+#else
102323 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
102324+#endif
102325 if (!pe)
102326 return -ENOMEM;
102327 return 0;
102328diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
102329index 1fb08f2..ca4bb1e 100644
102330--- a/kernel/time/timer_stats.c
102331+++ b/kernel/time/timer_stats.c
102332@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
102333 static unsigned long nr_entries;
102334 static struct entry entries[MAX_ENTRIES];
102335
102336-static atomic_t overflow_count;
102337+static atomic_unchecked_t overflow_count;
102338
102339 /*
102340 * The entries are in a hash-table, for fast lookup:
102341@@ -140,7 +140,7 @@ static void reset_entries(void)
102342 nr_entries = 0;
102343 memset(entries, 0, sizeof(entries));
102344 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
102345- atomic_set(&overflow_count, 0);
102346+ atomic_set_unchecked(&overflow_count, 0);
102347 }
102348
102349 static struct entry *alloc_entry(void)
102350@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102351 if (likely(entry))
102352 entry->count++;
102353 else
102354- atomic_inc(&overflow_count);
102355+ atomic_inc_unchecked(&overflow_count);
102356
102357 out_unlock:
102358 raw_spin_unlock_irqrestore(lock, flags);
102359@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102360
102361 static void print_name_offset(struct seq_file *m, unsigned long addr)
102362 {
102363+#ifdef CONFIG_GRKERNSEC_HIDESYM
102364+ seq_printf(m, "<%p>", NULL);
102365+#else
102366 char symname[KSYM_NAME_LEN];
102367
102368 if (lookup_symbol_name(addr, symname) < 0)
102369- seq_printf(m, "<%p>", (void *)addr);
102370+ seq_printf(m, "<%pK>", (void *)addr);
102371 else
102372 seq_printf(m, "%s", symname);
102373+#endif
102374 }
102375
102376 static int tstats_show(struct seq_file *m, void *v)
102377@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
102378
102379 seq_puts(m, "Timer Stats Version: v0.3\n");
102380 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
102381- if (atomic_read(&overflow_count))
102382- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
102383+ if (atomic_read_unchecked(&overflow_count))
102384+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
102385 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
102386
102387 for (i = 0; i < nr_entries; i++) {
102388@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
102389 {
102390 struct proc_dir_entry *pe;
102391
102392+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102393+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
102394+#else
102395 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
102396+#endif
102397 if (!pe)
102398 return -ENOMEM;
102399 return 0;
102400diff --git a/kernel/torture.c b/kernel/torture.c
102401index dd70993..0bf694b 100644
102402--- a/kernel/torture.c
102403+++ b/kernel/torture.c
102404@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
102405 mutex_lock(&fullstop_mutex);
102406 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
102407 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
102408- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
102409+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
102410 } else {
102411 pr_warn("Concurrent rmmod and shutdown illegal!\n");
102412 }
102413@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
102414 if (!torture_must_stop()) {
102415 if (stutter > 1) {
102416 schedule_timeout_interruptible(stutter - 1);
102417- ACCESS_ONCE(stutter_pause_test) = 2;
102418+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
102419 }
102420 schedule_timeout_interruptible(1);
102421- ACCESS_ONCE(stutter_pause_test) = 1;
102422+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
102423 }
102424 if (!torture_must_stop())
102425 schedule_timeout_interruptible(stutter);
102426- ACCESS_ONCE(stutter_pause_test) = 0;
102427+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
102428 torture_shutdown_absorb("torture_stutter");
102429 } while (!torture_must_stop());
102430 torture_kthread_stopping("torture_stutter");
102431@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
102432 schedule_timeout_uninterruptible(10);
102433 return true;
102434 }
102435- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
102436+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
102437 mutex_unlock(&fullstop_mutex);
102438 torture_shutdown_cleanup();
102439 torture_shuffle_cleanup();
102440diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
102441index 483cecf..ac46091 100644
102442--- a/kernel/trace/blktrace.c
102443+++ b/kernel/trace/blktrace.c
102444@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
102445 struct blk_trace *bt = filp->private_data;
102446 char buf[16];
102447
102448- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
102449+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
102450
102451 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
102452 }
102453@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
102454 return 1;
102455
102456 bt = buf->chan->private_data;
102457- atomic_inc(&bt->dropped);
102458+ atomic_inc_unchecked(&bt->dropped);
102459 return 0;
102460 }
102461
102462@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
102463
102464 bt->dir = dir;
102465 bt->dev = dev;
102466- atomic_set(&bt->dropped, 0);
102467+ atomic_set_unchecked(&bt->dropped, 0);
102468 INIT_LIST_HEAD(&bt->running_list);
102469
102470 ret = -EIO;
102471diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
102472index 4f22802..bd268b1 100644
102473--- a/kernel/trace/ftrace.c
102474+++ b/kernel/trace/ftrace.c
102475@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
102476 if (unlikely(ftrace_disabled))
102477 return 0;
102478
102479+ ret = ftrace_arch_code_modify_prepare();
102480+ FTRACE_WARN_ON(ret);
102481+ if (ret)
102482+ return 0;
102483+
102484 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
102485+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
102486 if (ret) {
102487 ftrace_bug(ret, rec);
102488- return 0;
102489 }
102490- return 1;
102491+ return ret ? 0 : 1;
102492 }
102493
102494 /*
102495@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
102496 if (!count)
102497 return 0;
102498
102499+ pax_open_kernel();
102500 sort(start, count, sizeof(*start),
102501 ftrace_cmp_ips, ftrace_swap_ips);
102502+ pax_close_kernel();
102503
102504 start_pg = ftrace_allocate_pages(count);
102505 if (!start_pg)
102506@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
102507
102508 if (t->ret_stack == NULL) {
102509 atomic_set(&t->tracing_graph_pause, 0);
102510- atomic_set(&t->trace_overrun, 0);
102511+ atomic_set_unchecked(&t->trace_overrun, 0);
102512 t->curr_ret_stack = -1;
102513 /* Make sure the tasks see the -1 first: */
102514 smp_wmb();
102515@@ -5876,7 +5883,7 @@ static void
102516 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
102517 {
102518 atomic_set(&t->tracing_graph_pause, 0);
102519- atomic_set(&t->trace_overrun, 0);
102520+ atomic_set_unchecked(&t->trace_overrun, 0);
102521 t->ftrace_timestamp = 0;
102522 /* make curr_ret_stack visible before we add the ret_stack */
102523 smp_wmb();
102524diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
102525index 922048a..bb71a55 100644
102526--- a/kernel/trace/ring_buffer.c
102527+++ b/kernel/trace/ring_buffer.c
102528@@ -348,9 +348,9 @@ struct buffer_data_page {
102529 */
102530 struct buffer_page {
102531 struct list_head list; /* list of buffer pages */
102532- local_t write; /* index for next write */
102533+ local_unchecked_t write; /* index for next write */
102534 unsigned read; /* index for next read */
102535- local_t entries; /* entries on this page */
102536+ local_unchecked_t entries; /* entries on this page */
102537 unsigned long real_end; /* real end of data */
102538 struct buffer_data_page *page; /* Actual data page */
102539 };
102540@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
102541 unsigned long last_overrun;
102542 local_t entries_bytes;
102543 local_t entries;
102544- local_t overrun;
102545- local_t commit_overrun;
102546- local_t dropped_events;
102547+ local_unchecked_t overrun;
102548+ local_unchecked_t commit_overrun;
102549+ local_unchecked_t dropped_events;
102550 local_t committing;
102551- local_t commits;
102552+ local_unchecked_t commits;
102553 unsigned long read;
102554 unsigned long read_bytes;
102555 u64 write_stamp;
102556@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102557 *
102558 * We add a counter to the write field to denote this.
102559 */
102560- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
102561- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
102562+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
102563+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
102564
102565 /*
102566 * Just make sure we have seen our old_write and synchronize
102567@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102568 * cmpxchg to only update if an interrupt did not already
102569 * do it for us. If the cmpxchg fails, we don't care.
102570 */
102571- (void)local_cmpxchg(&next_page->write, old_write, val);
102572- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
102573+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
102574+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
102575
102576 /*
102577 * No need to worry about races with clearing out the commit.
102578@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
102579
102580 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
102581 {
102582- return local_read(&bpage->entries) & RB_WRITE_MASK;
102583+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
102584 }
102585
102586 static inline unsigned long rb_page_write(struct buffer_page *bpage)
102587 {
102588- return local_read(&bpage->write) & RB_WRITE_MASK;
102589+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
102590 }
102591
102592 static int
102593@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
102594 * bytes consumed in ring buffer from here.
102595 * Increment overrun to account for the lost events.
102596 */
102597- local_add(page_entries, &cpu_buffer->overrun);
102598+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
102599 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102600 }
102601
102602@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
102603 * it is our responsibility to update
102604 * the counters.
102605 */
102606- local_add(entries, &cpu_buffer->overrun);
102607+ local_add_unchecked(entries, &cpu_buffer->overrun);
102608 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102609
102610 /*
102611@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102612 if (tail == BUF_PAGE_SIZE)
102613 tail_page->real_end = 0;
102614
102615- local_sub(length, &tail_page->write);
102616+ local_sub_unchecked(length, &tail_page->write);
102617 return;
102618 }
102619
102620@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102621 rb_event_set_padding(event);
102622
102623 /* Set the write back to the previous setting */
102624- local_sub(length, &tail_page->write);
102625+ local_sub_unchecked(length, &tail_page->write);
102626 return;
102627 }
102628
102629@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102630
102631 /* Set write to end of buffer */
102632 length = (tail + length) - BUF_PAGE_SIZE;
102633- local_sub(length, &tail_page->write);
102634+ local_sub_unchecked(length, &tail_page->write);
102635 }
102636
102637 /*
102638@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102639 * about it.
102640 */
102641 if (unlikely(next_page == commit_page)) {
102642- local_inc(&cpu_buffer->commit_overrun);
102643+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102644 goto out_reset;
102645 }
102646
102647@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102648 * this is easy, just stop here.
102649 */
102650 if (!(buffer->flags & RB_FL_OVERWRITE)) {
102651- local_inc(&cpu_buffer->dropped_events);
102652+ local_inc_unchecked(&cpu_buffer->dropped_events);
102653 goto out_reset;
102654 }
102655
102656@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102657 cpu_buffer->tail_page) &&
102658 (cpu_buffer->commit_page ==
102659 cpu_buffer->reader_page))) {
102660- local_inc(&cpu_buffer->commit_overrun);
102661+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102662 goto out_reset;
102663 }
102664 }
102665@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102666 length += RB_LEN_TIME_EXTEND;
102667
102668 tail_page = cpu_buffer->tail_page;
102669- write = local_add_return(length, &tail_page->write);
102670+ write = local_add_return_unchecked(length, &tail_page->write);
102671
102672 /* set write to only the index of the write */
102673 write &= RB_WRITE_MASK;
102674@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102675 kmemcheck_annotate_bitfield(event, bitfield);
102676 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
102677
102678- local_inc(&tail_page->entries);
102679+ local_inc_unchecked(&tail_page->entries);
102680
102681 /*
102682 * If this is the first commit on the page, then update
102683@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102684
102685 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
102686 unsigned long write_mask =
102687- local_read(&bpage->write) & ~RB_WRITE_MASK;
102688+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
102689 unsigned long event_length = rb_event_length(event);
102690 /*
102691 * This is on the tail page. It is possible that
102692@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102693 */
102694 old_index += write_mask;
102695 new_index += write_mask;
102696- index = local_cmpxchg(&bpage->write, old_index, new_index);
102697+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
102698 if (index == old_index) {
102699 /* update counters */
102700 local_sub(event_length, &cpu_buffer->entries_bytes);
102701@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102702 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
102703 {
102704 local_inc(&cpu_buffer->committing);
102705- local_inc(&cpu_buffer->commits);
102706+ local_inc_unchecked(&cpu_buffer->commits);
102707 }
102708
102709 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102710@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102711 return;
102712
102713 again:
102714- commits = local_read(&cpu_buffer->commits);
102715+ commits = local_read_unchecked(&cpu_buffer->commits);
102716 /* synchronize with interrupts */
102717 barrier();
102718 if (local_read(&cpu_buffer->committing) == 1)
102719@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102720 * updating of the commit page and the clearing of the
102721 * committing counter.
102722 */
102723- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
102724+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
102725 !local_read(&cpu_buffer->committing)) {
102726 local_inc(&cpu_buffer->committing);
102727 goto again;
102728@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
102729 barrier();
102730 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
102731 local_dec(&cpu_buffer->committing);
102732- local_dec(&cpu_buffer->commits);
102733+ local_dec_unchecked(&cpu_buffer->commits);
102734 return NULL;
102735 }
102736 #endif
102737@@ -2901,7 +2901,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102738
102739 /* Do the likely case first */
102740 if (likely(bpage->page == (void *)addr)) {
102741- local_dec(&bpage->entries);
102742+ local_dec_unchecked(&bpage->entries);
102743 return;
102744 }
102745
102746@@ -2913,7 +2913,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102747 start = bpage;
102748 do {
102749 if (bpage->page == (void *)addr) {
102750- local_dec(&bpage->entries);
102751+ local_dec_unchecked(&bpage->entries);
102752 return;
102753 }
102754 rb_inc_page(cpu_buffer, &bpage);
102755@@ -3197,7 +3197,7 @@ static inline unsigned long
102756 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
102757 {
102758 return local_read(&cpu_buffer->entries) -
102759- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
102760+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
102761 }
102762
102763 /**
102764@@ -3286,7 +3286,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
102765 return 0;
102766
102767 cpu_buffer = buffer->buffers[cpu];
102768- ret = local_read(&cpu_buffer->overrun);
102769+ ret = local_read_unchecked(&cpu_buffer->overrun);
102770
102771 return ret;
102772 }
102773@@ -3309,7 +3309,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
102774 return 0;
102775
102776 cpu_buffer = buffer->buffers[cpu];
102777- ret = local_read(&cpu_buffer->commit_overrun);
102778+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
102779
102780 return ret;
102781 }
102782@@ -3331,7 +3331,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
102783 return 0;
102784
102785 cpu_buffer = buffer->buffers[cpu];
102786- ret = local_read(&cpu_buffer->dropped_events);
102787+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
102788
102789 return ret;
102790 }
102791@@ -3394,7 +3394,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
102792 /* if you care about this being correct, lock the buffer */
102793 for_each_buffer_cpu(buffer, cpu) {
102794 cpu_buffer = buffer->buffers[cpu];
102795- overruns += local_read(&cpu_buffer->overrun);
102796+ overruns += local_read_unchecked(&cpu_buffer->overrun);
102797 }
102798
102799 return overruns;
102800@@ -3565,8 +3565,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102801 /*
102802 * Reset the reader page to size zero.
102803 */
102804- local_set(&cpu_buffer->reader_page->write, 0);
102805- local_set(&cpu_buffer->reader_page->entries, 0);
102806+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
102807+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
102808 local_set(&cpu_buffer->reader_page->page->commit, 0);
102809 cpu_buffer->reader_page->real_end = 0;
102810
102811@@ -3600,7 +3600,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102812 * want to compare with the last_overrun.
102813 */
102814 smp_mb();
102815- overwrite = local_read(&(cpu_buffer->overrun));
102816+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
102817
102818 /*
102819 * Here's the tricky part.
102820@@ -4172,8 +4172,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
102821
102822 cpu_buffer->head_page
102823 = list_entry(cpu_buffer->pages, struct buffer_page, list);
102824- local_set(&cpu_buffer->head_page->write, 0);
102825- local_set(&cpu_buffer->head_page->entries, 0);
102826+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
102827+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
102828 local_set(&cpu_buffer->head_page->page->commit, 0);
102829
102830 cpu_buffer->head_page->read = 0;
102831@@ -4183,18 +4183,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
102832
102833 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
102834 INIT_LIST_HEAD(&cpu_buffer->new_pages);
102835- local_set(&cpu_buffer->reader_page->write, 0);
102836- local_set(&cpu_buffer->reader_page->entries, 0);
102837+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
102838+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
102839 local_set(&cpu_buffer->reader_page->page->commit, 0);
102840 cpu_buffer->reader_page->read = 0;
102841
102842 local_set(&cpu_buffer->entries_bytes, 0);
102843- local_set(&cpu_buffer->overrun, 0);
102844- local_set(&cpu_buffer->commit_overrun, 0);
102845- local_set(&cpu_buffer->dropped_events, 0);
102846+ local_set_unchecked(&cpu_buffer->overrun, 0);
102847+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
102848+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
102849 local_set(&cpu_buffer->entries, 0);
102850 local_set(&cpu_buffer->committing, 0);
102851- local_set(&cpu_buffer->commits, 0);
102852+ local_set_unchecked(&cpu_buffer->commits, 0);
102853 cpu_buffer->read = 0;
102854 cpu_buffer->read_bytes = 0;
102855
102856@@ -4595,8 +4595,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
102857 rb_init_page(bpage);
102858 bpage = reader->page;
102859 reader->page = *data_page;
102860- local_set(&reader->write, 0);
102861- local_set(&reader->entries, 0);
102862+ local_set_unchecked(&reader->write, 0);
102863+ local_set_unchecked(&reader->entries, 0);
102864 reader->read = 0;
102865 *data_page = bpage;
102866
102867diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
102868index 62c6506..5c25989 100644
102869--- a/kernel/trace/trace.c
102870+++ b/kernel/trace/trace.c
102871@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
102872 return 0;
102873 }
102874
102875-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
102876+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
102877 {
102878 /* do nothing if flag is already set */
102879 if (!!(trace_flags & mask) == !!enabled)
102880diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
102881index dd8205a..1aae87a 100644
102882--- a/kernel/trace/trace.h
102883+++ b/kernel/trace/trace.h
102884@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
102885 void trace_printk_init_buffers(void);
102886 void trace_printk_start_comm(void);
102887 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
102888-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
102889+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
102890
102891 /*
102892 * Normal trace_printk() and friends allocates special buffers
102893diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
102894index 57b67b1..66082a9 100644
102895--- a/kernel/trace/trace_clock.c
102896+++ b/kernel/trace/trace_clock.c
102897@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
102898 return now;
102899 }
102900
102901-static atomic64_t trace_counter;
102902+static atomic64_unchecked_t trace_counter;
102903
102904 /*
102905 * trace_clock_counter(): simply an atomic counter.
102906@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
102907 */
102908 u64 notrace trace_clock_counter(void)
102909 {
102910- return atomic64_add_return(1, &trace_counter);
102911+ return atomic64_inc_return_unchecked(&trace_counter);
102912 }
102913diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
102914index a9c10a3..1864f6b 100644
102915--- a/kernel/trace/trace_events.c
102916+++ b/kernel/trace/trace_events.c
102917@@ -1762,7 +1762,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
102918 return 0;
102919 }
102920
102921-struct ftrace_module_file_ops;
102922 static void __add_event_to_tracers(struct ftrace_event_call *call);
102923
102924 /* Add an additional event_call dynamically */
102925diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
102926index b6fce36..d9f11a3 100644
102927--- a/kernel/trace/trace_functions_graph.c
102928+++ b/kernel/trace/trace_functions_graph.c
102929@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
102930
102931 /* The return trace stack is full */
102932 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
102933- atomic_inc(&current->trace_overrun);
102934+ atomic_inc_unchecked(&current->trace_overrun);
102935 return -EBUSY;
102936 }
102937
102938@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
102939 *ret = current->ret_stack[index].ret;
102940 trace->func = current->ret_stack[index].func;
102941 trace->calltime = current->ret_stack[index].calltime;
102942- trace->overrun = atomic_read(&current->trace_overrun);
102943+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
102944 trace->depth = index;
102945 }
102946
102947diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
102948index 7a9ba62..2e0e4a1 100644
102949--- a/kernel/trace/trace_mmiotrace.c
102950+++ b/kernel/trace/trace_mmiotrace.c
102951@@ -24,7 +24,7 @@ struct header_iter {
102952 static struct trace_array *mmio_trace_array;
102953 static bool overrun_detected;
102954 static unsigned long prev_overruns;
102955-static atomic_t dropped_count;
102956+static atomic_unchecked_t dropped_count;
102957
102958 static void mmio_reset_data(struct trace_array *tr)
102959 {
102960@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
102961
102962 static unsigned long count_overruns(struct trace_iterator *iter)
102963 {
102964- unsigned long cnt = atomic_xchg(&dropped_count, 0);
102965+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
102966 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
102967
102968 if (over > prev_overruns)
102969@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
102970 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
102971 sizeof(*entry), 0, pc);
102972 if (!event) {
102973- atomic_inc(&dropped_count);
102974+ atomic_inc_unchecked(&dropped_count);
102975 return;
102976 }
102977 entry = ring_buffer_event_data(event);
102978@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
102979 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
102980 sizeof(*entry), 0, pc);
102981 if (!event) {
102982- atomic_inc(&dropped_count);
102983+ atomic_inc_unchecked(&dropped_count);
102984 return;
102985 }
102986 entry = ring_buffer_event_data(event);
102987diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
102988index 692bf71..6d9a9cd 100644
102989--- a/kernel/trace/trace_output.c
102990+++ b/kernel/trace/trace_output.c
102991@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
102992 goto out;
102993 }
102994
102995+ pax_open_kernel();
102996 if (event->funcs->trace == NULL)
102997- event->funcs->trace = trace_nop_print;
102998+ *(void **)&event->funcs->trace = trace_nop_print;
102999 if (event->funcs->raw == NULL)
103000- event->funcs->raw = trace_nop_print;
103001+ *(void **)&event->funcs->raw = trace_nop_print;
103002 if (event->funcs->hex == NULL)
103003- event->funcs->hex = trace_nop_print;
103004+ *(void **)&event->funcs->hex = trace_nop_print;
103005 if (event->funcs->binary == NULL)
103006- event->funcs->binary = trace_nop_print;
103007+ *(void **)&event->funcs->binary = trace_nop_print;
103008+ pax_close_kernel();
103009
103010 key = event->type & (EVENT_HASHSIZE - 1);
103011
103012diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
103013index e694c9f..6775a38 100644
103014--- a/kernel/trace/trace_seq.c
103015+++ b/kernel/trace/trace_seq.c
103016@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
103017 return 0;
103018 }
103019
103020- seq_buf_path(&s->seq, path, "\n");
103021+ seq_buf_path(&s->seq, path, "\n\\");
103022
103023 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
103024 s->seq.len = save_len;
103025diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
103026index c3e4fcf..ef6cc43 100644
103027--- a/kernel/trace/trace_stack.c
103028+++ b/kernel/trace/trace_stack.c
103029@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
103030 return;
103031
103032 /* we do not handle interrupt stacks yet */
103033- if (!object_is_on_stack(stack))
103034+ if (!object_starts_on_stack(stack))
103035 return;
103036
103037 local_irq_save(flags);
103038diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
103039index f97f6e3..d367b48 100644
103040--- a/kernel/trace/trace_syscalls.c
103041+++ b/kernel/trace/trace_syscalls.c
103042@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
103043 int num;
103044
103045 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103046+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103047+ return -EINVAL;
103048
103049 mutex_lock(&syscall_trace_lock);
103050 if (!sys_perf_refcount_enter)
103051@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
103052 int num;
103053
103054 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103055+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103056+ return;
103057
103058 mutex_lock(&syscall_trace_lock);
103059 sys_perf_refcount_enter--;
103060@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
103061 int num;
103062
103063 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103064+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103065+ return -EINVAL;
103066
103067 mutex_lock(&syscall_trace_lock);
103068 if (!sys_perf_refcount_exit)
103069@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
103070 int num;
103071
103072 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103073+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103074+ return;
103075
103076 mutex_lock(&syscall_trace_lock);
103077 sys_perf_refcount_exit--;
103078diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
103079index 4109f83..fe1f830 100644
103080--- a/kernel/user_namespace.c
103081+++ b/kernel/user_namespace.c
103082@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
103083 !kgid_has_mapping(parent_ns, group))
103084 return -EPERM;
103085
103086+#ifdef CONFIG_GRKERNSEC
103087+ /*
103088+ * This doesn't really inspire confidence:
103089+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
103090+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
103091+ * Increases kernel attack surface in areas developers
103092+ * previously cared little about ("low importance due
103093+ * to requiring "root" capability")
103094+ * To be removed when this code receives *proper* review
103095+ */
103096+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
103097+ !capable(CAP_SETGID))
103098+ return -EPERM;
103099+#endif
103100+
103101 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
103102 if (!ns)
103103 return -ENOMEM;
103104@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
103105 if (atomic_read(&current->mm->mm_users) > 1)
103106 return -EINVAL;
103107
103108- if (current->fs->users != 1)
103109+ if (atomic_read(&current->fs->users) != 1)
103110 return -EINVAL;
103111
103112 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
103113diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
103114index c8eac43..4b5f08f 100644
103115--- a/kernel/utsname_sysctl.c
103116+++ b/kernel/utsname_sysctl.c
103117@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
103118 static int proc_do_uts_string(struct ctl_table *table, int write,
103119 void __user *buffer, size_t *lenp, loff_t *ppos)
103120 {
103121- struct ctl_table uts_table;
103122+ ctl_table_no_const uts_table;
103123 int r;
103124 memcpy(&uts_table, table, sizeof(uts_table));
103125 uts_table.data = get_uts(table, write);
103126diff --git a/kernel/watchdog.c b/kernel/watchdog.c
103127index 3174bf8..3553520 100644
103128--- a/kernel/watchdog.c
103129+++ b/kernel/watchdog.c
103130@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
103131 static void watchdog_nmi_disable(unsigned int cpu) { return; }
103132 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
103133
103134-static struct smp_hotplug_thread watchdog_threads = {
103135+static struct smp_hotplug_thread watchdog_threads __read_only = {
103136 .store = &softlockup_watchdog,
103137 .thread_should_run = watchdog_should_run,
103138 .thread_fn = watchdog,
103139diff --git a/kernel/workqueue.c b/kernel/workqueue.c
103140index 41ff75b..5ad683a 100644
103141--- a/kernel/workqueue.c
103142+++ b/kernel/workqueue.c
103143@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
103144 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
103145 worker_flags |= WORKER_REBOUND;
103146 worker_flags &= ~WORKER_UNBOUND;
103147- ACCESS_ONCE(worker->flags) = worker_flags;
103148+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
103149 }
103150
103151 spin_unlock_irq(&pool->lock);
103152diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
103153index c5cefb3..a4241e3 100644
103154--- a/lib/Kconfig.debug
103155+++ b/lib/Kconfig.debug
103156@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
103157
103158 config DEBUG_WW_MUTEX_SLOWPATH
103159 bool "Wait/wound mutex debugging: Slowpath testing"
103160- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103161+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103162 select DEBUG_LOCK_ALLOC
103163 select DEBUG_SPINLOCK
103164 select DEBUG_MUTEXES
103165@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
103166
103167 config DEBUG_LOCK_ALLOC
103168 bool "Lock debugging: detect incorrect freeing of live locks"
103169- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103170+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103171 select DEBUG_SPINLOCK
103172 select DEBUG_MUTEXES
103173 select LOCKDEP
103174@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
103175
103176 config PROVE_LOCKING
103177 bool "Lock debugging: prove locking correctness"
103178- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103179+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103180 select LOCKDEP
103181 select DEBUG_SPINLOCK
103182 select DEBUG_MUTEXES
103183@@ -1005,7 +1005,7 @@ config LOCKDEP
103184
103185 config LOCK_STAT
103186 bool "Lock usage statistics"
103187- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103188+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103189 select LOCKDEP
103190 select DEBUG_SPINLOCK
103191 select DEBUG_MUTEXES
103192@@ -1467,6 +1467,7 @@ config LATENCYTOP
103193 depends on DEBUG_KERNEL
103194 depends on STACKTRACE_SUPPORT
103195 depends on PROC_FS
103196+ depends on !GRKERNSEC_HIDESYM
103197 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
103198 select KALLSYMS
103199 select KALLSYMS_ALL
103200@@ -1483,7 +1484,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103201 config DEBUG_STRICT_USER_COPY_CHECKS
103202 bool "Strict user copy size checks"
103203 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103204- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
103205+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
103206 help
103207 Enabling this option turns a certain set of sanity checks for user
103208 copy operations into compile time failures.
103209@@ -1614,7 +1615,7 @@ endmenu # runtime tests
103210
103211 config PROVIDE_OHCI1394_DMA_INIT
103212 bool "Remote debugging over FireWire early on boot"
103213- depends on PCI && X86
103214+ depends on PCI && X86 && !GRKERNSEC
103215 help
103216 If you want to debug problems which hang or crash the kernel early
103217 on boot and the crashing machine has a FireWire port, you can use
103218diff --git a/lib/Makefile b/lib/Makefile
103219index 58f74d2..08e011f 100644
103220--- a/lib/Makefile
103221+++ b/lib/Makefile
103222@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
103223 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
103224 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
103225 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
103226-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
103227+obj-y += list_debug.o
103228 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
103229
103230 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
103231diff --git a/lib/average.c b/lib/average.c
103232index 114d1be..ab0350c 100644
103233--- a/lib/average.c
103234+++ b/lib/average.c
103235@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
103236 {
103237 unsigned long internal = ACCESS_ONCE(avg->internal);
103238
103239- ACCESS_ONCE(avg->internal) = internal ?
103240+ ACCESS_ONCE_RW(avg->internal) = internal ?
103241 (((internal << avg->weight) - internal) +
103242 (val << avg->factor)) >> avg->weight :
103243 (val << avg->factor);
103244diff --git a/lib/bitmap.c b/lib/bitmap.c
103245index d456f4c1..29a0308 100644
103246--- a/lib/bitmap.c
103247+++ b/lib/bitmap.c
103248@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
103249 }
103250 EXPORT_SYMBOL(__bitmap_subset);
103251
103252-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103253+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103254 {
103255 unsigned int k, lim = bits/BITS_PER_LONG;
103256 int w = 0;
103257@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
103258 {
103259 int c, old_c, totaldigits, ndigits, nchunks, nbits;
103260 u32 chunk;
103261- const char __user __force *ubuf = (const char __user __force *)buf;
103262+ const char __user *ubuf = (const char __force_user *)buf;
103263
103264 bitmap_zero(maskp, nmaskbits);
103265
103266@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
103267 {
103268 if (!access_ok(VERIFY_READ, ubuf, ulen))
103269 return -EFAULT;
103270- return __bitmap_parse((const char __force *)ubuf,
103271+ return __bitmap_parse((const char __force_kernel *)ubuf,
103272 ulen, 1, maskp, nmaskbits);
103273
103274 }
103275@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
103276 {
103277 unsigned a, b;
103278 int c, old_c, totaldigits;
103279- const char __user __force *ubuf = (const char __user __force *)buf;
103280+ const char __user *ubuf = (const char __force_user *)buf;
103281 int exp_digit, in_range;
103282
103283 totaldigits = c = 0;
103284@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
103285 {
103286 if (!access_ok(VERIFY_READ, ubuf, ulen))
103287 return -EFAULT;
103288- return __bitmap_parselist((const char __force *)ubuf,
103289+ return __bitmap_parselist((const char __force_kernel *)ubuf,
103290 ulen, 1, maskp, nmaskbits);
103291 }
103292 EXPORT_SYMBOL(bitmap_parselist_user);
103293diff --git a/lib/bug.c b/lib/bug.c
103294index 0c3bd95..5a615a1 100644
103295--- a/lib/bug.c
103296+++ b/lib/bug.c
103297@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
103298 return BUG_TRAP_TYPE_NONE;
103299
103300 bug = find_bug(bugaddr);
103301+ if (!bug)
103302+ return BUG_TRAP_TYPE_NONE;
103303
103304 file = NULL;
103305 line = 0;
103306diff --git a/lib/debugobjects.c b/lib/debugobjects.c
103307index 547f7f9..a6d4ba0 100644
103308--- a/lib/debugobjects.c
103309+++ b/lib/debugobjects.c
103310@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
103311 if (limit > 4)
103312 return;
103313
103314- is_on_stack = object_is_on_stack(addr);
103315+ is_on_stack = object_starts_on_stack(addr);
103316 if (is_on_stack == onstack)
103317 return;
103318
103319diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
103320index 6dd0335..1e9c239 100644
103321--- a/lib/decompress_bunzip2.c
103322+++ b/lib/decompress_bunzip2.c
103323@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
103324
103325 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
103326 uncompressed data. Allocate intermediate buffer for block. */
103327- bd->dbufSize = 100000*(i-BZh0);
103328+ i -= BZh0;
103329+ bd->dbufSize = 100000 * i;
103330
103331 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
103332 if (!bd->dbuf)
103333diff --git a/lib/div64.c b/lib/div64.c
103334index 4382ad7..08aa558 100644
103335--- a/lib/div64.c
103336+++ b/lib/div64.c
103337@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
103338 EXPORT_SYMBOL(__div64_32);
103339
103340 #ifndef div_s64_rem
103341-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103342+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103343 {
103344 u64 quotient;
103345
103346@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
103347 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
103348 */
103349 #ifndef div64_u64
103350-u64 div64_u64(u64 dividend, u64 divisor)
103351+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
103352 {
103353 u32 high = divisor >> 32;
103354 u64 quot;
103355diff --git a/lib/dma-debug.c b/lib/dma-debug.c
103356index 9722bd2..0d826f4 100644
103357--- a/lib/dma-debug.c
103358+++ b/lib/dma-debug.c
103359@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
103360
103361 void dma_debug_add_bus(struct bus_type *bus)
103362 {
103363- struct notifier_block *nb;
103364+ notifier_block_no_const *nb;
103365
103366 if (dma_debug_disabled())
103367 return;
103368@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
103369
103370 static void check_for_stack(struct device *dev, void *addr)
103371 {
103372- if (object_is_on_stack(addr))
103373+ if (object_starts_on_stack(addr))
103374 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
103375 "stack [addr=%p]\n", addr);
103376 }
103377diff --git a/lib/inflate.c b/lib/inflate.c
103378index 013a761..c28f3fc 100644
103379--- a/lib/inflate.c
103380+++ b/lib/inflate.c
103381@@ -269,7 +269,7 @@ static void free(void *where)
103382 malloc_ptr = free_mem_ptr;
103383 }
103384 #else
103385-#define malloc(a) kmalloc(a, GFP_KERNEL)
103386+#define malloc(a) kmalloc((a), GFP_KERNEL)
103387 #define free(a) kfree(a)
103388 #endif
103389
103390diff --git a/lib/ioremap.c b/lib/ioremap.c
103391index 0c9216c..863bd89 100644
103392--- a/lib/ioremap.c
103393+++ b/lib/ioremap.c
103394@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
103395 unsigned long next;
103396
103397 phys_addr -= addr;
103398- pmd = pmd_alloc(&init_mm, pud, addr);
103399+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
103400 if (!pmd)
103401 return -ENOMEM;
103402 do {
103403@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
103404 unsigned long next;
103405
103406 phys_addr -= addr;
103407- pud = pud_alloc(&init_mm, pgd, addr);
103408+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
103409 if (!pud)
103410 return -ENOMEM;
103411 do {
103412diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
103413index bd2bea9..6b3c95e 100644
103414--- a/lib/is_single_threaded.c
103415+++ b/lib/is_single_threaded.c
103416@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
103417 struct task_struct *p, *t;
103418 bool ret;
103419
103420+ if (!mm)
103421+ return true;
103422+
103423 if (atomic_read(&task->signal->live) != 1)
103424 return false;
103425
103426diff --git a/lib/kobject.c b/lib/kobject.c
103427index 03d4ab3..46f6374 100644
103428--- a/lib/kobject.c
103429+++ b/lib/kobject.c
103430@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
103431
103432
103433 static DEFINE_SPINLOCK(kobj_ns_type_lock);
103434-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
103435+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
103436
103437-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103438+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103439 {
103440 enum kobj_ns_type type = ops->type;
103441 int error;
103442diff --git a/lib/list_debug.c b/lib/list_debug.c
103443index c24c2f7..f0296f4 100644
103444--- a/lib/list_debug.c
103445+++ b/lib/list_debug.c
103446@@ -11,7 +11,9 @@
103447 #include <linux/bug.h>
103448 #include <linux/kernel.h>
103449 #include <linux/rculist.h>
103450+#include <linux/mm.h>
103451
103452+#ifdef CONFIG_DEBUG_LIST
103453 /*
103454 * Insert a new entry between two known consecutive entries.
103455 *
103456@@ -19,21 +21,40 @@
103457 * the prev/next entries already!
103458 */
103459
103460+static bool __list_add_debug(struct list_head *new,
103461+ struct list_head *prev,
103462+ struct list_head *next)
103463+{
103464+ if (unlikely(next->prev != prev)) {
103465+ printk(KERN_ERR "list_add corruption. next->prev should be "
103466+ "prev (%p), but was %p. (next=%p).\n",
103467+ prev, next->prev, next);
103468+ BUG();
103469+ return false;
103470+ }
103471+ if (unlikely(prev->next != next)) {
103472+ printk(KERN_ERR "list_add corruption. prev->next should be "
103473+ "next (%p), but was %p. (prev=%p).\n",
103474+ next, prev->next, prev);
103475+ BUG();
103476+ return false;
103477+ }
103478+ if (unlikely(new == prev || new == next)) {
103479+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
103480+ new, prev, next);
103481+ BUG();
103482+ return false;
103483+ }
103484+ return true;
103485+}
103486+
103487 void __list_add(struct list_head *new,
103488- struct list_head *prev,
103489- struct list_head *next)
103490+ struct list_head *prev,
103491+ struct list_head *next)
103492 {
103493- WARN(next->prev != prev,
103494- "list_add corruption. next->prev should be "
103495- "prev (%p), but was %p. (next=%p).\n",
103496- prev, next->prev, next);
103497- WARN(prev->next != next,
103498- "list_add corruption. prev->next should be "
103499- "next (%p), but was %p. (prev=%p).\n",
103500- next, prev->next, prev);
103501- WARN(new == prev || new == next,
103502- "list_add double add: new=%p, prev=%p, next=%p.\n",
103503- new, prev, next);
103504+ if (!__list_add_debug(new, prev, next))
103505+ return;
103506+
103507 next->prev = new;
103508 new->next = next;
103509 new->prev = prev;
103510@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
103511 }
103512 EXPORT_SYMBOL(__list_add);
103513
103514-void __list_del_entry(struct list_head *entry)
103515+static bool __list_del_entry_debug(struct list_head *entry)
103516 {
103517 struct list_head *prev, *next;
103518
103519 prev = entry->prev;
103520 next = entry->next;
103521
103522- if (WARN(next == LIST_POISON1,
103523- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103524- entry, LIST_POISON1) ||
103525- WARN(prev == LIST_POISON2,
103526- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103527- entry, LIST_POISON2) ||
103528- WARN(prev->next != entry,
103529- "list_del corruption. prev->next should be %p, "
103530- "but was %p\n", entry, prev->next) ||
103531- WARN(next->prev != entry,
103532- "list_del corruption. next->prev should be %p, "
103533- "but was %p\n", entry, next->prev))
103534+ if (unlikely(next == LIST_POISON1)) {
103535+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103536+ entry, LIST_POISON1);
103537+ BUG();
103538+ return false;
103539+ }
103540+ if (unlikely(prev == LIST_POISON2)) {
103541+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103542+ entry, LIST_POISON2);
103543+ BUG();
103544+ return false;
103545+ }
103546+ if (unlikely(entry->prev->next != entry)) {
103547+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
103548+ "but was %p\n", entry, prev->next);
103549+ BUG();
103550+ return false;
103551+ }
103552+ if (unlikely(entry->next->prev != entry)) {
103553+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
103554+ "but was %p\n", entry, next->prev);
103555+ BUG();
103556+ return false;
103557+ }
103558+ return true;
103559+}
103560+
103561+void __list_del_entry(struct list_head *entry)
103562+{
103563+ if (!__list_del_entry_debug(entry))
103564 return;
103565
103566- __list_del(prev, next);
103567+ __list_del(entry->prev, entry->next);
103568 }
103569 EXPORT_SYMBOL(__list_del_entry);
103570
103571@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
103572 void __list_add_rcu(struct list_head *new,
103573 struct list_head *prev, struct list_head *next)
103574 {
103575- WARN(next->prev != prev,
103576- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
103577- prev, next->prev, next);
103578- WARN(prev->next != next,
103579- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
103580- next, prev->next, prev);
103581+ if (!__list_add_debug(new, prev, next))
103582+ return;
103583+
103584 new->next = next;
103585 new->prev = prev;
103586 rcu_assign_pointer(list_next_rcu(prev), new);
103587 next->prev = new;
103588 }
103589 EXPORT_SYMBOL(__list_add_rcu);
103590+#endif
103591+
103592+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
103593+{
103594+#ifdef CONFIG_DEBUG_LIST
103595+ if (!__list_add_debug(new, prev, next))
103596+ return;
103597+#endif
103598+
103599+ pax_open_kernel();
103600+ next->prev = new;
103601+ new->next = next;
103602+ new->prev = prev;
103603+ prev->next = new;
103604+ pax_close_kernel();
103605+}
103606+EXPORT_SYMBOL(__pax_list_add);
103607+
103608+void pax_list_del(struct list_head *entry)
103609+{
103610+#ifdef CONFIG_DEBUG_LIST
103611+ if (!__list_del_entry_debug(entry))
103612+ return;
103613+#endif
103614+
103615+ pax_open_kernel();
103616+ __list_del(entry->prev, entry->next);
103617+ entry->next = LIST_POISON1;
103618+ entry->prev = LIST_POISON2;
103619+ pax_close_kernel();
103620+}
103621+EXPORT_SYMBOL(pax_list_del);
103622+
103623+void pax_list_del_init(struct list_head *entry)
103624+{
103625+ pax_open_kernel();
103626+ __list_del(entry->prev, entry->next);
103627+ INIT_LIST_HEAD(entry);
103628+ pax_close_kernel();
103629+}
103630+EXPORT_SYMBOL(pax_list_del_init);
103631+
103632+void __pax_list_add_rcu(struct list_head *new,
103633+ struct list_head *prev, struct list_head *next)
103634+{
103635+#ifdef CONFIG_DEBUG_LIST
103636+ if (!__list_add_debug(new, prev, next))
103637+ return;
103638+#endif
103639+
103640+ pax_open_kernel();
103641+ new->next = next;
103642+ new->prev = prev;
103643+ rcu_assign_pointer(list_next_rcu(prev), new);
103644+ next->prev = new;
103645+ pax_close_kernel();
103646+}
103647+EXPORT_SYMBOL(__pax_list_add_rcu);
103648+
103649+void pax_list_del_rcu(struct list_head *entry)
103650+{
103651+#ifdef CONFIG_DEBUG_LIST
103652+ if (!__list_del_entry_debug(entry))
103653+ return;
103654+#endif
103655+
103656+ pax_open_kernel();
103657+ __list_del(entry->prev, entry->next);
103658+ entry->next = LIST_POISON1;
103659+ entry->prev = LIST_POISON2;
103660+ pax_close_kernel();
103661+}
103662+EXPORT_SYMBOL(pax_list_del_rcu);
103663diff --git a/lib/lockref.c b/lib/lockref.c
103664index ecb9a66..a044fc5 100644
103665--- a/lib/lockref.c
103666+++ b/lib/lockref.c
103667@@ -48,13 +48,13 @@
103668 void lockref_get(struct lockref *lockref)
103669 {
103670 CMPXCHG_LOOP(
103671- new.count++;
103672+ __lockref_inc(&new);
103673 ,
103674 return;
103675 );
103676
103677 spin_lock(&lockref->lock);
103678- lockref->count++;
103679+ __lockref_inc(lockref);
103680 spin_unlock(&lockref->lock);
103681 }
103682 EXPORT_SYMBOL(lockref_get);
103683@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103684 int retval;
103685
103686 CMPXCHG_LOOP(
103687- new.count++;
103688- if (old.count <= 0)
103689+ __lockref_inc(&new);
103690+ if (__lockref_read(&old) <= 0)
103691 return 0;
103692 ,
103693 return 1;
103694@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103695
103696 spin_lock(&lockref->lock);
103697 retval = 0;
103698- if (lockref->count > 0) {
103699- lockref->count++;
103700+ if (__lockref_read(lockref) > 0) {
103701+ __lockref_inc(lockref);
103702 retval = 1;
103703 }
103704 spin_unlock(&lockref->lock);
103705@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
103706 int lockref_get_or_lock(struct lockref *lockref)
103707 {
103708 CMPXCHG_LOOP(
103709- new.count++;
103710- if (old.count <= 0)
103711+ __lockref_inc(&new);
103712+ if (__lockref_read(&old) <= 0)
103713 break;
103714 ,
103715 return 1;
103716 );
103717
103718 spin_lock(&lockref->lock);
103719- if (lockref->count <= 0)
103720+ if (__lockref_read(lockref) <= 0)
103721 return 0;
103722- lockref->count++;
103723+ __lockref_inc(lockref);
103724 spin_unlock(&lockref->lock);
103725 return 1;
103726 }
103727@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
103728 int lockref_put_return(struct lockref *lockref)
103729 {
103730 CMPXCHG_LOOP(
103731- new.count--;
103732- if (old.count <= 0)
103733+ __lockref_dec(&new);
103734+ if (__lockref_read(&old) <= 0)
103735 return -1;
103736 ,
103737- return new.count;
103738+ return __lockref_read(&new);
103739 );
103740 return -1;
103741 }
103742@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
103743 int lockref_put_or_lock(struct lockref *lockref)
103744 {
103745 CMPXCHG_LOOP(
103746- new.count--;
103747- if (old.count <= 1)
103748+ __lockref_dec(&new);
103749+ if (__lockref_read(&old) <= 1)
103750 break;
103751 ,
103752 return 1;
103753 );
103754
103755 spin_lock(&lockref->lock);
103756- if (lockref->count <= 1)
103757+ if (__lockref_read(lockref) <= 1)
103758 return 0;
103759- lockref->count--;
103760+ __lockref_dec(lockref);
103761 spin_unlock(&lockref->lock);
103762 return 1;
103763 }
103764@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
103765 void lockref_mark_dead(struct lockref *lockref)
103766 {
103767 assert_spin_locked(&lockref->lock);
103768- lockref->count = -128;
103769+ __lockref_set(lockref, -128);
103770 }
103771 EXPORT_SYMBOL(lockref_mark_dead);
103772
103773@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
103774 int retval;
103775
103776 CMPXCHG_LOOP(
103777- new.count++;
103778- if (old.count < 0)
103779+ __lockref_inc(&new);
103780+ if (__lockref_read(&old) < 0)
103781 return 0;
103782 ,
103783 return 1;
103784@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
103785
103786 spin_lock(&lockref->lock);
103787 retval = 0;
103788- if (lockref->count >= 0) {
103789- lockref->count++;
103790+ if (__lockref_read(lockref) >= 0) {
103791+ __lockref_inc(lockref);
103792 retval = 1;
103793 }
103794 spin_unlock(&lockref->lock);
103795diff --git a/lib/nlattr.c b/lib/nlattr.c
103796index f5907d2..36072be 100644
103797--- a/lib/nlattr.c
103798+++ b/lib/nlattr.c
103799@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
103800 {
103801 int minlen = min_t(int, count, nla_len(src));
103802
103803+ BUG_ON(minlen < 0);
103804+
103805 memcpy(dest, nla_data(src), minlen);
103806 if (count > minlen)
103807 memset(dest + minlen, 0, count - minlen);
103808diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
103809index 6111bcb..02e816b 100644
103810--- a/lib/percpu-refcount.c
103811+++ b/lib/percpu-refcount.c
103812@@ -31,7 +31,7 @@
103813 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
103814 */
103815
103816-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
103817+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
103818
103819 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
103820
103821diff --git a/lib/radix-tree.c b/lib/radix-tree.c
103822index 3d2aa27..a472f20 100644
103823--- a/lib/radix-tree.c
103824+++ b/lib/radix-tree.c
103825@@ -67,7 +67,7 @@ struct radix_tree_preload {
103826 int nr;
103827 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
103828 };
103829-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
103830+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
103831
103832 static inline void *ptr_to_indirect(void *ptr)
103833 {
103834diff --git a/lib/random32.c b/lib/random32.c
103835index 0bee183..526f12f 100644
103836--- a/lib/random32.c
103837+++ b/lib/random32.c
103838@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
103839 }
103840 #endif
103841
103842-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
103843+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
103844
103845 /**
103846 * prandom_u32_state - seeded pseudo-random number generator.
103847diff --git a/lib/rbtree.c b/lib/rbtree.c
103848index c16c81a..4dcbda1 100644
103849--- a/lib/rbtree.c
103850+++ b/lib/rbtree.c
103851@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
103852 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
103853
103854 static const struct rb_augment_callbacks dummy_callbacks = {
103855- dummy_propagate, dummy_copy, dummy_rotate
103856+ .propagate = dummy_propagate,
103857+ .copy = dummy_copy,
103858+ .rotate = dummy_rotate
103859 };
103860
103861 void rb_insert_color(struct rb_node *node, struct rb_root *root)
103862diff --git a/lib/show_mem.c b/lib/show_mem.c
103863index adc98e18..0ce83c2 100644
103864--- a/lib/show_mem.c
103865+++ b/lib/show_mem.c
103866@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
103867 quicklist_total_size());
103868 #endif
103869 #ifdef CONFIG_MEMORY_FAILURE
103870- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
103871+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
103872 #endif
103873 }
103874diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
103875index e0af6ff..fcc9f15 100644
103876--- a/lib/strncpy_from_user.c
103877+++ b/lib/strncpy_from_user.c
103878@@ -22,7 +22,7 @@
103879 */
103880 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
103881 {
103882- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103883+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103884 long res = 0;
103885
103886 /*
103887diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
103888index 1164961..02dccaa 100644
103889--- a/lib/strnlen_user.c
103890+++ b/lib/strnlen_user.c
103891@@ -26,7 +26,7 @@
103892 */
103893 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
103894 {
103895- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103896+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
103897 long align, res = 0;
103898 unsigned long c;
103899
103900diff --git a/lib/swiotlb.c b/lib/swiotlb.c
103901index 4abda07..b9d3765 100644
103902--- a/lib/swiotlb.c
103903+++ b/lib/swiotlb.c
103904@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
103905
103906 void
103907 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
103908- dma_addr_t dev_addr)
103909+ dma_addr_t dev_addr, struct dma_attrs *attrs)
103910 {
103911 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
103912
103913diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
103914index daf29a39..56f44ac 100644
103915--- a/lib/test-hexdump.c
103916+++ b/lib/test-hexdump.c
103917@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
103918
103919 static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
103920
103921-static const char *test_data_1_le[] __initconst = {
103922+static const char * const test_data_1_le[] __initconst = {
103923 "be", "32", "db", "7b", "0a", "18", "93", "b2",
103924 "70", "ba", "c4", "24", "7d", "83", "34", "9b",
103925 "a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
103926 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
103927 };
103928
103929-static const char *test_data_2_le[] __initconst = {
103930+static const char * const test_data_2_le[] __initconst = {
103931 "32be", "7bdb", "180a", "b293",
103932 "ba70", "24c4", "837d", "9b34",
103933 "9ca6", "ad31", "0f9c", "e9ac",
103934 "d14c", "9919", "b143", "0caf",
103935 };
103936
103937-static const char *test_data_4_le[] __initconst = {
103938+static const char * const test_data_4_le[] __initconst = {
103939 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
103940 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
103941 };
103942
103943-static const char *test_data_8_le[] __initconst = {
103944+static const char * const test_data_8_le[] __initconst = {
103945 "b293180a7bdb32be", "9b34837d24c4ba70",
103946 "e9ac0f9cad319ca6", "0cafb1439919d14c",
103947 };
103948diff --git a/lib/usercopy.c b/lib/usercopy.c
103949index 4f5b1dd..7cab418 100644
103950--- a/lib/usercopy.c
103951+++ b/lib/usercopy.c
103952@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
103953 WARN(1, "Buffer overflow detected!\n");
103954 }
103955 EXPORT_SYMBOL(copy_from_user_overflow);
103956+
103957+void copy_to_user_overflow(void)
103958+{
103959+ WARN(1, "Buffer overflow detected!\n");
103960+}
103961+EXPORT_SYMBOL(copy_to_user_overflow);
103962diff --git a/lib/vsprintf.c b/lib/vsprintf.c
103963index b235c96..343ffc1 100644
103964--- a/lib/vsprintf.c
103965+++ b/lib/vsprintf.c
103966@@ -16,6 +16,9 @@
103967 * - scnprintf and vscnprintf
103968 */
103969
103970+#ifdef CONFIG_GRKERNSEC_HIDESYM
103971+#define __INCLUDED_BY_HIDESYM 1
103972+#endif
103973 #include <stdarg.h>
103974 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
103975 #include <linux/types.h>
103976@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
103977 #ifdef CONFIG_KALLSYMS
103978 if (*fmt == 'B')
103979 sprint_backtrace(sym, value);
103980- else if (*fmt != 'f' && *fmt != 's')
103981+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
103982 sprint_symbol(sym, value);
103983 else
103984 sprint_symbol_no_offset(sym, value);
103985@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
103986 return number(buf, end, num, spec);
103987 }
103988
103989+#ifdef CONFIG_GRKERNSEC_HIDESYM
103990+int kptr_restrict __read_mostly = 2;
103991+#else
103992 int kptr_restrict __read_mostly;
103993+#endif
103994
103995 /*
103996 * Show a '%p' thing. A kernel extension is that the '%p' is followed
103997@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
103998 *
103999 * - 'F' For symbolic function descriptor pointers with offset
104000 * - 'f' For simple symbolic function names without offset
104001+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
104002 * - 'S' For symbolic direct pointers with offset
104003 * - 's' For symbolic direct pointers without offset
104004+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
104005 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
104006 * - 'B' For backtraced symbolic direct pointers with offset
104007 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
104008@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104009
104010 if (!ptr && *fmt != 'K') {
104011 /*
104012- * Print (null) with the same width as a pointer so it makes
104013+ * Print (nil) with the same width as a pointer so it makes
104014 * tabular output look nice.
104015 */
104016 if (spec.field_width == -1)
104017 spec.field_width = default_width;
104018- return string(buf, end, "(null)", spec);
104019+ return string(buf, end, "(nil)", spec);
104020 }
104021
104022 switch (*fmt) {
104023@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104024 /* Fallthrough */
104025 case 'S':
104026 case 's':
104027+#ifdef CONFIG_GRKERNSEC_HIDESYM
104028+ break;
104029+#else
104030+ return symbol_string(buf, end, ptr, spec, fmt);
104031+#endif
104032+ case 'X':
104033+ ptr = dereference_function_descriptor(ptr);
104034+ case 'A':
104035 case 'B':
104036 return symbol_string(buf, end, ptr, spec, fmt);
104037 case 'R':
104038@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104039 va_end(va);
104040 return buf;
104041 }
104042+ case 'P':
104043+ break;
104044 case 'K':
104045 /*
104046 * %pK cannot be used in IRQ context because its test
104047@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104048 ((const struct file *)ptr)->f_path.dentry,
104049 spec, fmt);
104050 }
104051+
104052+#ifdef CONFIG_GRKERNSEC_HIDESYM
104053+ /* 'P' = approved pointers to copy to userland,
104054+ as in the /proc/kallsyms case, as we make it display nothing
104055+ for non-root users, and the real contents for root users
104056+ 'X' = approved simple symbols
104057+ Also ignore 'K' pointers, since we force their NULLing for non-root users
104058+ above
104059+ */
104060+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
104061+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
104062+ dump_stack();
104063+ ptr = NULL;
104064+ }
104065+#endif
104066+
104067 spec.flags |= SMALL;
104068 if (spec.field_width == -1) {
104069 spec.field_width = default_width;
104070@@ -2254,11 +2289,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104071 typeof(type) value; \
104072 if (sizeof(type) == 8) { \
104073 args = PTR_ALIGN(args, sizeof(u32)); \
104074- *(u32 *)&value = *(u32 *)args; \
104075- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
104076+ *(u32 *)&value = *(const u32 *)args; \
104077+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
104078 } else { \
104079 args = PTR_ALIGN(args, sizeof(type)); \
104080- value = *(typeof(type) *)args; \
104081+ value = *(const typeof(type) *)args; \
104082 } \
104083 args += sizeof(type); \
104084 value; \
104085@@ -2321,7 +2356,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104086 case FORMAT_TYPE_STR: {
104087 const char *str_arg = args;
104088 args += strlen(str_arg) + 1;
104089- str = string(str, end, (char *)str_arg, spec);
104090+ str = string(str, end, str_arg, spec);
104091 break;
104092 }
104093
104094diff --git a/localversion-grsec b/localversion-grsec
104095new file mode 100644
104096index 0000000..7cd6065
104097--- /dev/null
104098+++ b/localversion-grsec
104099@@ -0,0 +1 @@
104100+-grsec
104101diff --git a/mm/Kconfig b/mm/Kconfig
104102index a03131b..1b1bafb 100644
104103--- a/mm/Kconfig
104104+++ b/mm/Kconfig
104105@@ -342,10 +342,11 @@ config KSM
104106 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
104107
104108 config DEFAULT_MMAP_MIN_ADDR
104109- int "Low address space to protect from user allocation"
104110+ int "Low address space to protect from user allocation"
104111 depends on MMU
104112- default 4096
104113- help
104114+ default 32768 if ALPHA || ARM || PARISC || SPARC32
104115+ default 65536
104116+ help
104117 This is the portion of low virtual memory which should be protected
104118 from userspace allocation. Keeping a user from writing to low pages
104119 can help reduce the impact of kernel NULL pointer bugs.
104120@@ -376,7 +377,7 @@ config MEMORY_FAILURE
104121
104122 config HWPOISON_INJECT
104123 tristate "HWPoison pages injector"
104124- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
104125+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
104126 select PROC_PAGE_MONITOR
104127
104128 config NOMMU_INITIAL_TRIM_EXCESS
104129diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
104130index 957d3da..1d34e20 100644
104131--- a/mm/Kconfig.debug
104132+++ b/mm/Kconfig.debug
104133@@ -10,6 +10,7 @@ config PAGE_EXTENSION
104134 config DEBUG_PAGEALLOC
104135 bool "Debug page memory allocations"
104136 depends on DEBUG_KERNEL
104137+ depends on !PAX_MEMORY_SANITIZE
104138 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
104139 depends on !KMEMCHECK
104140 select PAGE_EXTENSION
104141diff --git a/mm/backing-dev.c b/mm/backing-dev.c
104142index 6dc4580..e031ec1 100644
104143--- a/mm/backing-dev.c
104144+++ b/mm/backing-dev.c
104145@@ -12,7 +12,7 @@
104146 #include <linux/device.h>
104147 #include <trace/events/writeback.h>
104148
104149-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
104150+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
104151
104152 struct backing_dev_info noop_backing_dev_info = {
104153 .name = "noop",
104154@@ -474,7 +474,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
104155 return err;
104156
104157 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
104158- atomic_long_inc_return(&bdi_seq));
104159+ atomic_long_inc_return_unchecked(&bdi_seq));
104160 if (err) {
104161 bdi_destroy(bdi);
104162 return err;
104163diff --git a/mm/filemap.c b/mm/filemap.c
104164index ad72420..0a20ef2 100644
104165--- a/mm/filemap.c
104166+++ b/mm/filemap.c
104167@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
104168 struct address_space *mapping = file->f_mapping;
104169
104170 if (!mapping->a_ops->readpage)
104171- return -ENOEXEC;
104172+ return -ENODEV;
104173 file_accessed(file);
104174 vma->vm_ops = &generic_file_vm_ops;
104175 return 0;
104176@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
104177 *pos = i_size_read(inode);
104178
104179 if (limit != RLIM_INFINITY) {
104180+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
104181 if (*pos >= limit) {
104182 send_sig(SIGXFSZ, current, 0);
104183 return -EFBIG;
104184diff --git a/mm/gup.c b/mm/gup.c
104185index a6e24e2..72dd2cf 100644
104186--- a/mm/gup.c
104187+++ b/mm/gup.c
104188@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
104189 unsigned int fault_flags = 0;
104190 int ret;
104191
104192- /* For mlock, just skip the stack guard page. */
104193- if ((*flags & FOLL_MLOCK) &&
104194- (stack_guard_page_start(vma, address) ||
104195- stack_guard_page_end(vma, address + PAGE_SIZE)))
104196- return -ENOENT;
104197 if (*flags & FOLL_WRITE)
104198 fault_flags |= FAULT_FLAG_WRITE;
104199 if (nonblocking)
104200@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104201 if (!(gup_flags & FOLL_FORCE))
104202 gup_flags |= FOLL_NUMA;
104203
104204- do {
104205+ while (nr_pages) {
104206 struct page *page;
104207 unsigned int foll_flags = gup_flags;
104208 unsigned int page_increm;
104209
104210 /* first iteration or cross vma bound */
104211 if (!vma || start >= vma->vm_end) {
104212- vma = find_extend_vma(mm, start);
104213+ vma = find_vma(mm, start);
104214 if (!vma && in_gate_area(mm, start)) {
104215 int ret;
104216 ret = get_gate_page(mm, start & PAGE_MASK,
104217@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104218 goto next_page;
104219 }
104220
104221- if (!vma || check_vma_flags(vma, gup_flags))
104222+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
104223 return i ? : -EFAULT;
104224 if (is_vm_hugetlb_page(vma)) {
104225 i = follow_hugetlb_page(mm, vma, pages, vmas,
104226@@ -509,7 +504,7 @@ next_page:
104227 i += page_increm;
104228 start += page_increm * PAGE_SIZE;
104229 nr_pages -= page_increm;
104230- } while (nr_pages);
104231+ }
104232 return i;
104233 }
104234 EXPORT_SYMBOL(__get_user_pages);
104235diff --git a/mm/highmem.c b/mm/highmem.c
104236index 123bcd3..0de52ba 100644
104237--- a/mm/highmem.c
104238+++ b/mm/highmem.c
104239@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
104240 * So no dangers, even with speculative execution.
104241 */
104242 page = pte_page(pkmap_page_table[i]);
104243+ pax_open_kernel();
104244 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
104245-
104246+ pax_close_kernel();
104247 set_page_address(page, NULL);
104248 need_flush = 1;
104249 }
104250@@ -259,9 +260,11 @@ start:
104251 }
104252 }
104253 vaddr = PKMAP_ADDR(last_pkmap_nr);
104254+
104255+ pax_open_kernel();
104256 set_pte_at(&init_mm, vaddr,
104257 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
104258-
104259+ pax_close_kernel();
104260 pkmap_count[last_pkmap_nr] = 1;
104261 set_page_address(page, (void *)vaddr);
104262
104263diff --git a/mm/hugetlb.c b/mm/hugetlb.c
104264index caad3c5..4f68807 100644
104265--- a/mm/hugetlb.c
104266+++ b/mm/hugetlb.c
104267@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104268 struct ctl_table *table, int write,
104269 void __user *buffer, size_t *length, loff_t *ppos)
104270 {
104271+ ctl_table_no_const t;
104272 struct hstate *h = &default_hstate;
104273 unsigned long tmp = h->max_huge_pages;
104274 int ret;
104275@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104276 if (!hugepages_supported())
104277 return -ENOTSUPP;
104278
104279- table->data = &tmp;
104280- table->maxlen = sizeof(unsigned long);
104281- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104282+ t = *table;
104283+ t.data = &tmp;
104284+ t.maxlen = sizeof(unsigned long);
104285+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
104286 if (ret)
104287 goto out;
104288
104289@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104290 struct hstate *h = &default_hstate;
104291 unsigned long tmp;
104292 int ret;
104293+ ctl_table_no_const hugetlb_table;
104294
104295 if (!hugepages_supported())
104296 return -ENOTSUPP;
104297@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104298 if (write && hstate_is_gigantic(h))
104299 return -EINVAL;
104300
104301- table->data = &tmp;
104302- table->maxlen = sizeof(unsigned long);
104303- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104304+ hugetlb_table = *table;
104305+ hugetlb_table.data = &tmp;
104306+ hugetlb_table.maxlen = sizeof(unsigned long);
104307+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
104308 if (ret)
104309 goto out;
104310
104311@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
104312 i_mmap_unlock_write(mapping);
104313 }
104314
104315+#ifdef CONFIG_PAX_SEGMEXEC
104316+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
104317+{
104318+ struct mm_struct *mm = vma->vm_mm;
104319+ struct vm_area_struct *vma_m;
104320+ unsigned long address_m;
104321+ pte_t *ptep_m;
104322+
104323+ vma_m = pax_find_mirror_vma(vma);
104324+ if (!vma_m)
104325+ return;
104326+
104327+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104328+ address_m = address + SEGMEXEC_TASK_SIZE;
104329+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
104330+ get_page(page_m);
104331+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
104332+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
104333+}
104334+#endif
104335+
104336 /*
104337 * Hugetlb_cow() should be called with page lock of the original hugepage held.
104338 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
104339@@ -2912,6 +2937,11 @@ retry_avoidcopy:
104340 make_huge_pte(vma, new_page, 1));
104341 page_remove_rmap(old_page);
104342 hugepage_add_new_anon_rmap(new_page, vma, address);
104343+
104344+#ifdef CONFIG_PAX_SEGMEXEC
104345+ pax_mirror_huge_pte(vma, address, new_page);
104346+#endif
104347+
104348 /* Make the old page be freed below */
104349 new_page = old_page;
104350 }
104351@@ -3072,6 +3102,10 @@ retry:
104352 && (vma->vm_flags & VM_SHARED)));
104353 set_huge_pte_at(mm, address, ptep, new_pte);
104354
104355+#ifdef CONFIG_PAX_SEGMEXEC
104356+ pax_mirror_huge_pte(vma, address, page);
104357+#endif
104358+
104359 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
104360 /* Optimization, do the COW without a second fault */
104361 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
104362@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104363 struct address_space *mapping;
104364 int need_wait_lock = 0;
104365
104366+#ifdef CONFIG_PAX_SEGMEXEC
104367+ struct vm_area_struct *vma_m;
104368+#endif
104369+
104370 address &= huge_page_mask(h);
104371
104372 ptep = huge_pte_offset(mm, address);
104373@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104374 VM_FAULT_SET_HINDEX(hstate_index(h));
104375 }
104376
104377+#ifdef CONFIG_PAX_SEGMEXEC
104378+ vma_m = pax_find_mirror_vma(vma);
104379+ if (vma_m) {
104380+ unsigned long address_m;
104381+
104382+ if (vma->vm_start > vma_m->vm_start) {
104383+ address_m = address;
104384+ address -= SEGMEXEC_TASK_SIZE;
104385+ vma = vma_m;
104386+ h = hstate_vma(vma);
104387+ } else
104388+ address_m = address + SEGMEXEC_TASK_SIZE;
104389+
104390+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
104391+ return VM_FAULT_OOM;
104392+ address_m &= HPAGE_MASK;
104393+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
104394+ }
104395+#endif
104396+
104397 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
104398 if (!ptep)
104399 return VM_FAULT_OOM;
104400diff --git a/mm/internal.h b/mm/internal.h
104401index a96da5b..42ebd54 100644
104402--- a/mm/internal.h
104403+++ b/mm/internal.h
104404@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
104405
104406 extern int __isolate_free_page(struct page *page, unsigned int order);
104407 extern void __free_pages_bootmem(struct page *page, unsigned int order);
104408+extern void free_compound_page(struct page *page);
104409 extern void prep_compound_page(struct page *page, unsigned long order);
104410 #ifdef CONFIG_MEMORY_FAILURE
104411 extern bool is_free_buddy_page(struct page *page);
104412@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
104413
104414 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
104415 unsigned long, unsigned long,
104416- unsigned long, unsigned long);
104417+ unsigned long, unsigned long) __intentional_overflow(-1);
104418
104419 extern void set_pageblock_order(void);
104420 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
104421diff --git a/mm/kmemleak.c b/mm/kmemleak.c
104422index f0fe4f2..898208c 100644
104423--- a/mm/kmemleak.c
104424+++ b/mm/kmemleak.c
104425@@ -366,7 +366,7 @@ static void print_unreferenced(struct seq_file *seq,
104426
104427 for (i = 0; i < object->trace_len; i++) {
104428 void *ptr = (void *)object->trace[i];
104429- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
104430+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
104431 }
104432 }
104433
104434@@ -1912,7 +1912,7 @@ static int __init kmemleak_late_init(void)
104435 return -ENOMEM;
104436 }
104437
104438- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
104439+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
104440 &kmemleak_fops);
104441 if (!dentry)
104442 pr_warning("Failed to create the debugfs kmemleak file\n");
104443diff --git a/mm/maccess.c b/mm/maccess.c
104444index d53adf9..03a24bf 100644
104445--- a/mm/maccess.c
104446+++ b/mm/maccess.c
104447@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
104448 set_fs(KERNEL_DS);
104449 pagefault_disable();
104450 ret = __copy_from_user_inatomic(dst,
104451- (__force const void __user *)src, size);
104452+ (const void __force_user *)src, size);
104453 pagefault_enable();
104454 set_fs(old_fs);
104455
104456@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
104457
104458 set_fs(KERNEL_DS);
104459 pagefault_disable();
104460- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
104461+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
104462 pagefault_enable();
104463 set_fs(old_fs);
104464
104465diff --git a/mm/madvise.c b/mm/madvise.c
104466index d551475..8fdd7f3 100644
104467--- a/mm/madvise.c
104468+++ b/mm/madvise.c
104469@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
104470 pgoff_t pgoff;
104471 unsigned long new_flags = vma->vm_flags;
104472
104473+#ifdef CONFIG_PAX_SEGMEXEC
104474+ struct vm_area_struct *vma_m;
104475+#endif
104476+
104477 switch (behavior) {
104478 case MADV_NORMAL:
104479 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
104480@@ -126,6 +130,13 @@ success:
104481 /*
104482 * vm_flags is protected by the mmap_sem held in write mode.
104483 */
104484+
104485+#ifdef CONFIG_PAX_SEGMEXEC
104486+ vma_m = pax_find_mirror_vma(vma);
104487+ if (vma_m)
104488+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
104489+#endif
104490+
104491 vma->vm_flags = new_flags;
104492
104493 out:
104494@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
104495 struct vm_area_struct **prev,
104496 unsigned long start, unsigned long end)
104497 {
104498+
104499+#ifdef CONFIG_PAX_SEGMEXEC
104500+ struct vm_area_struct *vma_m;
104501+#endif
104502+
104503 *prev = vma;
104504 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104505 return -EINVAL;
104506
104507 zap_page_range(vma, start, end - start, NULL);
104508+
104509+#ifdef CONFIG_PAX_SEGMEXEC
104510+ vma_m = pax_find_mirror_vma(vma);
104511+ if (vma_m) {
104512+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104513+ return -EINVAL;
104514+
104515+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
104516+ }
104517+#endif
104518+
104519 return 0;
104520 }
104521
104522@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
104523 if (end < start)
104524 return error;
104525
104526+#ifdef CONFIG_PAX_SEGMEXEC
104527+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
104528+ if (end > SEGMEXEC_TASK_SIZE)
104529+ return error;
104530+ } else
104531+#endif
104532+
104533+ if (end > TASK_SIZE)
104534+ return error;
104535+
104536 error = 0;
104537 if (end == start)
104538 return error;
104539diff --git a/mm/memory-failure.c b/mm/memory-failure.c
104540index 72a5224..51ba846 100644
104541--- a/mm/memory-failure.c
104542+++ b/mm/memory-failure.c
104543@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
104544
104545 int sysctl_memory_failure_recovery __read_mostly = 1;
104546
104547-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104548+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104549
104550 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
104551
104552@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
104553 pfn, t->comm, t->pid);
104554 si.si_signo = SIGBUS;
104555 si.si_errno = 0;
104556- si.si_addr = (void *)addr;
104557+ si.si_addr = (void __user *)addr;
104558 #ifdef __ARCH_SI_TRAPNO
104559 si.si_trapno = trapno;
104560 #endif
104561@@ -779,7 +779,7 @@ static struct page_state {
104562 unsigned long res;
104563 char *msg;
104564 int (*action)(struct page *p, unsigned long pfn);
104565-} error_states[] = {
104566+} __do_const error_states[] = {
104567 { reserved, reserved, "reserved kernel", me_kernel },
104568 /*
104569 * free pages are specially detected outside this table:
104570@@ -1087,7 +1087,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104571 nr_pages = 1 << compound_order(hpage);
104572 else /* normal page or thp */
104573 nr_pages = 1;
104574- atomic_long_add(nr_pages, &num_poisoned_pages);
104575+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
104576
104577 /*
104578 * We need/can do nothing about count=0 pages.
104579@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104580 if (PageHWPoison(hpage)) {
104581 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
104582 || (p != hpage && TestSetPageHWPoison(hpage))) {
104583- atomic_long_sub(nr_pages, &num_poisoned_pages);
104584+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104585 unlock_page(hpage);
104586 return 0;
104587 }
104588@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104589 */
104590 if (!PageHWPoison(p)) {
104591 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
104592- atomic_long_sub(nr_pages, &num_poisoned_pages);
104593+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104594 put_page(hpage);
104595 res = 0;
104596 goto out;
104597 }
104598 if (hwpoison_filter(p)) {
104599 if (TestClearPageHWPoison(p))
104600- atomic_long_sub(nr_pages, &num_poisoned_pages);
104601+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104602 unlock_page(hpage);
104603 put_page(hpage);
104604 return 0;
104605@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
104606 return 0;
104607 }
104608 if (TestClearPageHWPoison(p))
104609- atomic_long_dec(&num_poisoned_pages);
104610+ atomic_long_dec_unchecked(&num_poisoned_pages);
104611 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
104612 return 0;
104613 }
104614@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
104615 */
104616 if (TestClearPageHWPoison(page)) {
104617 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
104618- atomic_long_sub(nr_pages, &num_poisoned_pages);
104619+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104620 freeit = 1;
104621 if (PageHuge(page))
104622 clear_page_hwpoison_huge_page(page);
104623@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
104624 if (PageHuge(page)) {
104625 set_page_hwpoison_huge_page(hpage);
104626 dequeue_hwpoisoned_huge_page(hpage);
104627- atomic_long_add(1 << compound_order(hpage),
104628+ atomic_long_add_unchecked(1 << compound_order(hpage),
104629 &num_poisoned_pages);
104630 } else {
104631 SetPageHWPoison(page);
104632- atomic_long_inc(&num_poisoned_pages);
104633+ atomic_long_inc_unchecked(&num_poisoned_pages);
104634 }
104635 }
104636 return ret;
104637@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
104638 put_page(page);
104639 pr_info("soft_offline: %#lx: invalidated\n", pfn);
104640 SetPageHWPoison(page);
104641- atomic_long_inc(&num_poisoned_pages);
104642+ atomic_long_inc_unchecked(&num_poisoned_pages);
104643 return 0;
104644 }
104645
104646@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
104647 if (!is_free_buddy_page(page))
104648 pr_info("soft offline: %#lx: page leaked\n",
104649 pfn);
104650- atomic_long_inc(&num_poisoned_pages);
104651+ atomic_long_inc_unchecked(&num_poisoned_pages);
104652 }
104653 } else {
104654 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
104655@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
104656 if (PageHuge(page)) {
104657 set_page_hwpoison_huge_page(hpage);
104658 if (!dequeue_hwpoisoned_huge_page(hpage))
104659- atomic_long_add(1 << compound_order(hpage),
104660+ atomic_long_add_unchecked(1 << compound_order(hpage),
104661 &num_poisoned_pages);
104662 } else {
104663 if (!TestSetPageHWPoison(page))
104664- atomic_long_inc(&num_poisoned_pages);
104665+ atomic_long_inc_unchecked(&num_poisoned_pages);
104666 }
104667 }
104668 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
104669diff --git a/mm/memory.c b/mm/memory.c
104670index 97839f5..4bc5530 100644
104671--- a/mm/memory.c
104672+++ b/mm/memory.c
104673@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104674 free_pte_range(tlb, pmd, addr);
104675 } while (pmd++, addr = next, addr != end);
104676
104677+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
104678 start &= PUD_MASK;
104679 if (start < floor)
104680 return;
104681@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104682 pud_clear(pud);
104683 pmd_free_tlb(tlb, pmd, start);
104684 mm_dec_nr_pmds(tlb->mm);
104685+#endif
104686 }
104687
104688 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104689@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104690 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
104691 } while (pud++, addr = next, addr != end);
104692
104693+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
104694 start &= PGDIR_MASK;
104695 if (start < floor)
104696 return;
104697@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104698 pud = pud_offset(pgd, start);
104699 pgd_clear(pgd);
104700 pud_free_tlb(tlb, pud, start);
104701+#endif
104702+
104703 }
104704
104705 /*
104706@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
104707 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
104708 */
104709 if (vma->vm_ops)
104710- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
104711+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
104712 vma->vm_ops->fault);
104713 if (vma->vm_file)
104714- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
104715+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
104716 vma->vm_file->f_op->mmap);
104717 dump_stack();
104718 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
104719@@ -1464,6 +1469,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
104720 page_add_file_rmap(page);
104721 set_pte_at(mm, addr, pte, mk_pte(page, prot));
104722
104723+#ifdef CONFIG_PAX_SEGMEXEC
104724+ pax_mirror_file_pte(vma, addr, page, ptl);
104725+#endif
104726+
104727 retval = 0;
104728 pte_unmap_unlock(pte, ptl);
104729 return retval;
104730@@ -1508,9 +1517,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
104731 if (!page_count(page))
104732 return -EINVAL;
104733 if (!(vma->vm_flags & VM_MIXEDMAP)) {
104734+
104735+#ifdef CONFIG_PAX_SEGMEXEC
104736+ struct vm_area_struct *vma_m;
104737+#endif
104738+
104739 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
104740 BUG_ON(vma->vm_flags & VM_PFNMAP);
104741 vma->vm_flags |= VM_MIXEDMAP;
104742+
104743+#ifdef CONFIG_PAX_SEGMEXEC
104744+ vma_m = pax_find_mirror_vma(vma);
104745+ if (vma_m)
104746+ vma_m->vm_flags |= VM_MIXEDMAP;
104747+#endif
104748+
104749 }
104750 return insert_page(vma, addr, page, vma->vm_page_prot);
104751 }
104752@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
104753 unsigned long pfn)
104754 {
104755 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
104756+ BUG_ON(vma->vm_mirror);
104757
104758 if (addr < vma->vm_start || addr >= vma->vm_end)
104759 return -EFAULT;
104760@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
104761
104762 BUG_ON(pud_huge(*pud));
104763
104764- pmd = pmd_alloc(mm, pud, addr);
104765+ pmd = (mm == &init_mm) ?
104766+ pmd_alloc_kernel(mm, pud, addr) :
104767+ pmd_alloc(mm, pud, addr);
104768 if (!pmd)
104769 return -ENOMEM;
104770 do {
104771@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
104772 unsigned long next;
104773 int err;
104774
104775- pud = pud_alloc(mm, pgd, addr);
104776+ pud = (mm == &init_mm) ?
104777+ pud_alloc_kernel(mm, pgd, addr) :
104778+ pud_alloc(mm, pgd, addr);
104779 if (!pud)
104780 return -ENOMEM;
104781 do {
104782@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
104783 return ret;
104784 }
104785
104786+#ifdef CONFIG_PAX_SEGMEXEC
104787+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
104788+{
104789+ struct mm_struct *mm = vma->vm_mm;
104790+ spinlock_t *ptl;
104791+ pte_t *pte, entry;
104792+
104793+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
104794+ entry = *pte;
104795+ if (!pte_present(entry)) {
104796+ if (!pte_none(entry)) {
104797+ free_swap_and_cache(pte_to_swp_entry(entry));
104798+ pte_clear_not_present_full(mm, address, pte, 0);
104799+ }
104800+ } else {
104801+ struct page *page;
104802+
104803+ flush_cache_page(vma, address, pte_pfn(entry));
104804+ entry = ptep_clear_flush(vma, address, pte);
104805+ BUG_ON(pte_dirty(entry));
104806+ page = vm_normal_page(vma, address, entry);
104807+ if (page) {
104808+ update_hiwater_rss(mm);
104809+ if (PageAnon(page))
104810+ dec_mm_counter_fast(mm, MM_ANONPAGES);
104811+ else
104812+ dec_mm_counter_fast(mm, MM_FILEPAGES);
104813+ page_remove_rmap(page);
104814+ page_cache_release(page);
104815+ }
104816+ }
104817+ pte_unmap_unlock(pte, ptl);
104818+}
104819+
104820+/* PaX: if vma is mirrored, synchronize the mirror's PTE
104821+ *
104822+ * the ptl of the lower mapped page is held on entry and is not released on exit
104823+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
104824+ */
104825+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
104826+{
104827+ struct mm_struct *mm = vma->vm_mm;
104828+ unsigned long address_m;
104829+ spinlock_t *ptl_m;
104830+ struct vm_area_struct *vma_m;
104831+ pmd_t *pmd_m;
104832+ pte_t *pte_m, entry_m;
104833+
104834+ BUG_ON(!page_m || !PageAnon(page_m));
104835+
104836+ vma_m = pax_find_mirror_vma(vma);
104837+ if (!vma_m)
104838+ return;
104839+
104840+ BUG_ON(!PageLocked(page_m));
104841+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104842+ address_m = address + SEGMEXEC_TASK_SIZE;
104843+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104844+ pte_m = pte_offset_map(pmd_m, address_m);
104845+ ptl_m = pte_lockptr(mm, pmd_m);
104846+ if (ptl != ptl_m) {
104847+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104848+ if (!pte_none(*pte_m))
104849+ goto out;
104850+ }
104851+
104852+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
104853+ page_cache_get(page_m);
104854+ page_add_anon_rmap(page_m, vma_m, address_m);
104855+ inc_mm_counter_fast(mm, MM_ANONPAGES);
104856+ set_pte_at(mm, address_m, pte_m, entry_m);
104857+ update_mmu_cache(vma_m, address_m, pte_m);
104858+out:
104859+ if (ptl != ptl_m)
104860+ spin_unlock(ptl_m);
104861+ pte_unmap(pte_m);
104862+ unlock_page(page_m);
104863+}
104864+
104865+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
104866+{
104867+ struct mm_struct *mm = vma->vm_mm;
104868+ unsigned long address_m;
104869+ spinlock_t *ptl_m;
104870+ struct vm_area_struct *vma_m;
104871+ pmd_t *pmd_m;
104872+ pte_t *pte_m, entry_m;
104873+
104874+ BUG_ON(!page_m || PageAnon(page_m));
104875+
104876+ vma_m = pax_find_mirror_vma(vma);
104877+ if (!vma_m)
104878+ return;
104879+
104880+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104881+ address_m = address + SEGMEXEC_TASK_SIZE;
104882+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104883+ pte_m = pte_offset_map(pmd_m, address_m);
104884+ ptl_m = pte_lockptr(mm, pmd_m);
104885+ if (ptl != ptl_m) {
104886+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104887+ if (!pte_none(*pte_m))
104888+ goto out;
104889+ }
104890+
104891+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
104892+ page_cache_get(page_m);
104893+ page_add_file_rmap(page_m);
104894+ inc_mm_counter_fast(mm, MM_FILEPAGES);
104895+ set_pte_at(mm, address_m, pte_m, entry_m);
104896+ update_mmu_cache(vma_m, address_m, pte_m);
104897+out:
104898+ if (ptl != ptl_m)
104899+ spin_unlock(ptl_m);
104900+ pte_unmap(pte_m);
104901+}
104902+
104903+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
104904+{
104905+ struct mm_struct *mm = vma->vm_mm;
104906+ unsigned long address_m;
104907+ spinlock_t *ptl_m;
104908+ struct vm_area_struct *vma_m;
104909+ pmd_t *pmd_m;
104910+ pte_t *pte_m, entry_m;
104911+
104912+ vma_m = pax_find_mirror_vma(vma);
104913+ if (!vma_m)
104914+ return;
104915+
104916+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104917+ address_m = address + SEGMEXEC_TASK_SIZE;
104918+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104919+ pte_m = pte_offset_map(pmd_m, address_m);
104920+ ptl_m = pte_lockptr(mm, pmd_m);
104921+ if (ptl != ptl_m) {
104922+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104923+ if (!pte_none(*pte_m))
104924+ goto out;
104925+ }
104926+
104927+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
104928+ set_pte_at(mm, address_m, pte_m, entry_m);
104929+out:
104930+ if (ptl != ptl_m)
104931+ spin_unlock(ptl_m);
104932+ pte_unmap(pte_m);
104933+}
104934+
104935+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
104936+{
104937+ struct page *page_m;
104938+ pte_t entry;
104939+
104940+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
104941+ goto out;
104942+
104943+ entry = *pte;
104944+ page_m = vm_normal_page(vma, address, entry);
104945+ if (!page_m)
104946+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
104947+ else if (PageAnon(page_m)) {
104948+ if (pax_find_mirror_vma(vma)) {
104949+ pte_unmap_unlock(pte, ptl);
104950+ lock_page(page_m);
104951+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
104952+ if (pte_same(entry, *pte))
104953+ pax_mirror_anon_pte(vma, address, page_m, ptl);
104954+ else
104955+ unlock_page(page_m);
104956+ }
104957+ } else
104958+ pax_mirror_file_pte(vma, address, page_m, ptl);
104959+
104960+out:
104961+ pte_unmap_unlock(pte, ptl);
104962+}
104963+#endif
104964+
104965 /*
104966 * This routine handles present pages, when users try to write
104967 * to a shared page. It is done by copying the page to a new address
104968@@ -2172,6 +2377,12 @@ gotten:
104969 */
104970 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
104971 if (likely(pte_same(*page_table, orig_pte))) {
104972+
104973+#ifdef CONFIG_PAX_SEGMEXEC
104974+ if (pax_find_mirror_vma(vma))
104975+ BUG_ON(!trylock_page(new_page));
104976+#endif
104977+
104978 if (old_page) {
104979 if (!PageAnon(old_page)) {
104980 dec_mm_counter_fast(mm, MM_FILEPAGES);
104981@@ -2225,6 +2436,10 @@ gotten:
104982 page_remove_rmap(old_page);
104983 }
104984
104985+#ifdef CONFIG_PAX_SEGMEXEC
104986+ pax_mirror_anon_pte(vma, address, new_page, ptl);
104987+#endif
104988+
104989 /* Free the old page.. */
104990 new_page = old_page;
104991 ret |= VM_FAULT_WRITE;
104992@@ -2483,6 +2698,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
104993 swap_free(entry);
104994 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
104995 try_to_free_swap(page);
104996+
104997+#ifdef CONFIG_PAX_SEGMEXEC
104998+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
104999+#endif
105000+
105001 unlock_page(page);
105002 if (page != swapcache) {
105003 /*
105004@@ -2506,6 +2726,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105005
105006 /* No need to invalidate - it was non-present before */
105007 update_mmu_cache(vma, address, page_table);
105008+
105009+#ifdef CONFIG_PAX_SEGMEXEC
105010+ pax_mirror_anon_pte(vma, address, page, ptl);
105011+#endif
105012+
105013 unlock:
105014 pte_unmap_unlock(page_table, ptl);
105015 out:
105016@@ -2525,40 +2750,6 @@ out_release:
105017 }
105018
105019 /*
105020- * This is like a special single-page "expand_{down|up}wards()",
105021- * except we must first make sure that 'address{-|+}PAGE_SIZE'
105022- * doesn't hit another vma.
105023- */
105024-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
105025-{
105026- address &= PAGE_MASK;
105027- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
105028- struct vm_area_struct *prev = vma->vm_prev;
105029-
105030- /*
105031- * Is there a mapping abutting this one below?
105032- *
105033- * That's only ok if it's the same stack mapping
105034- * that has gotten split..
105035- */
105036- if (prev && prev->vm_end == address)
105037- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
105038-
105039- return expand_downwards(vma, address - PAGE_SIZE);
105040- }
105041- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
105042- struct vm_area_struct *next = vma->vm_next;
105043-
105044- /* As VM_GROWSDOWN but s/below/above/ */
105045- if (next && next->vm_start == address + PAGE_SIZE)
105046- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
105047-
105048- return expand_upwards(vma, address + PAGE_SIZE);
105049- }
105050- return 0;
105051-}
105052-
105053-/*
105054 * We enter with non-exclusive mmap_sem (to exclude vma changes,
105055 * but allow concurrent faults), and pte mapped but not yet locked.
105056 * We return with mmap_sem still held, but pte unmapped and unlocked.
105057@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105058 unsigned int flags)
105059 {
105060 struct mem_cgroup *memcg;
105061- struct page *page;
105062+ struct page *page = NULL;
105063 spinlock_t *ptl;
105064 pte_t entry;
105065
105066- pte_unmap(page_table);
105067-
105068- /* Check if we need to add a guard page to the stack */
105069- if (check_stack_guard_page(vma, address) < 0)
105070- return VM_FAULT_SIGSEGV;
105071-
105072- /* Use the zero-page for reads */
105073 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
105074 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
105075 vma->vm_page_prot));
105076- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105077+ ptl = pte_lockptr(mm, pmd);
105078+ spin_lock(ptl);
105079 if (!pte_none(*page_table))
105080 goto unlock;
105081 goto setpte;
105082 }
105083
105084 /* Allocate our own private page. */
105085+ pte_unmap(page_table);
105086+
105087 if (unlikely(anon_vma_prepare(vma)))
105088 goto oom;
105089 page = alloc_zeroed_user_highpage_movable(vma, address);
105090@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105091 if (!pte_none(*page_table))
105092 goto release;
105093
105094+#ifdef CONFIG_PAX_SEGMEXEC
105095+ if (pax_find_mirror_vma(vma))
105096+ BUG_ON(!trylock_page(page));
105097+#endif
105098+
105099 inc_mm_counter_fast(mm, MM_ANONPAGES);
105100 page_add_new_anon_rmap(page, vma, address);
105101 mem_cgroup_commit_charge(page, memcg, false);
105102@@ -2621,6 +2813,12 @@ setpte:
105103
105104 /* No need to invalidate - it was non-present before */
105105 update_mmu_cache(vma, address, page_table);
105106+
105107+#ifdef CONFIG_PAX_SEGMEXEC
105108+ if (page)
105109+ pax_mirror_anon_pte(vma, address, page, ptl);
105110+#endif
105111+
105112 unlock:
105113 pte_unmap_unlock(page_table, ptl);
105114 return 0;
105115@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105116 return ret;
105117 }
105118 do_set_pte(vma, address, fault_page, pte, false, false);
105119+
105120+#ifdef CONFIG_PAX_SEGMEXEC
105121+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105122+#endif
105123+
105124 unlock_page(fault_page);
105125 unlock_out:
105126 pte_unmap_unlock(pte, ptl);
105127@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105128 }
105129 goto uncharge_out;
105130 }
105131+
105132+#ifdef CONFIG_PAX_SEGMEXEC
105133+ if (pax_find_mirror_vma(vma))
105134+ BUG_ON(!trylock_page(new_page));
105135+#endif
105136+
105137 do_set_pte(vma, address, new_page, pte, true, true);
105138+
105139+#ifdef CONFIG_PAX_SEGMEXEC
105140+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105141+#endif
105142+
105143 mem_cgroup_commit_charge(new_page, memcg, false);
105144 lru_cache_add_active_or_unevictable(new_page, vma);
105145 pte_unmap_unlock(pte, ptl);
105146@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105147 return ret;
105148 }
105149 do_set_pte(vma, address, fault_page, pte, true, false);
105150+
105151+#ifdef CONFIG_PAX_SEGMEXEC
105152+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105153+#endif
105154+
105155 pte_unmap_unlock(pte, ptl);
105156
105157 if (set_page_dirty(fault_page))
105158@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
105159 if (flags & FAULT_FLAG_WRITE)
105160 flush_tlb_fix_spurious_fault(vma, address);
105161 }
105162+
105163+#ifdef CONFIG_PAX_SEGMEXEC
105164+ pax_mirror_pte(vma, address, pte, pmd, ptl);
105165+ return 0;
105166+#endif
105167+
105168 unlock:
105169 pte_unmap_unlock(pte, ptl);
105170 return 0;
105171@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105172 pmd_t *pmd;
105173 pte_t *pte;
105174
105175+#ifdef CONFIG_PAX_SEGMEXEC
105176+ struct vm_area_struct *vma_m;
105177+#endif
105178+
105179 if (unlikely(is_vm_hugetlb_page(vma)))
105180 return hugetlb_fault(mm, vma, address, flags);
105181
105182+#ifdef CONFIG_PAX_SEGMEXEC
105183+ vma_m = pax_find_mirror_vma(vma);
105184+ if (vma_m) {
105185+ unsigned long address_m;
105186+ pgd_t *pgd_m;
105187+ pud_t *pud_m;
105188+ pmd_t *pmd_m;
105189+
105190+ if (vma->vm_start > vma_m->vm_start) {
105191+ address_m = address;
105192+ address -= SEGMEXEC_TASK_SIZE;
105193+ vma = vma_m;
105194+ } else
105195+ address_m = address + SEGMEXEC_TASK_SIZE;
105196+
105197+ pgd_m = pgd_offset(mm, address_m);
105198+ pud_m = pud_alloc(mm, pgd_m, address_m);
105199+ if (!pud_m)
105200+ return VM_FAULT_OOM;
105201+ pmd_m = pmd_alloc(mm, pud_m, address_m);
105202+ if (!pmd_m)
105203+ return VM_FAULT_OOM;
105204+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
105205+ return VM_FAULT_OOM;
105206+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
105207+ }
105208+#endif
105209+
105210 pgd = pgd_offset(mm, address);
105211 pud = pud_alloc(mm, pgd, address);
105212 if (!pud)
105213@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105214 spin_unlock(&mm->page_table_lock);
105215 return 0;
105216 }
105217+
105218+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105219+{
105220+ pud_t *new = pud_alloc_one(mm, address);
105221+ if (!new)
105222+ return -ENOMEM;
105223+
105224+ smp_wmb(); /* See comment in __pte_alloc */
105225+
105226+ spin_lock(&mm->page_table_lock);
105227+ if (pgd_present(*pgd)) /* Another has populated it */
105228+ pud_free(mm, new);
105229+ else
105230+ pgd_populate_kernel(mm, pgd, new);
105231+ spin_unlock(&mm->page_table_lock);
105232+ return 0;
105233+}
105234 #endif /* __PAGETABLE_PUD_FOLDED */
105235
105236 #ifndef __PAGETABLE_PMD_FOLDED
105237@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
105238 spin_unlock(&mm->page_table_lock);
105239 return 0;
105240 }
105241+
105242+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
105243+{
105244+ pmd_t *new = pmd_alloc_one(mm, address);
105245+ if (!new)
105246+ return -ENOMEM;
105247+
105248+ smp_wmb(); /* See comment in __pte_alloc */
105249+
105250+ spin_lock(&mm->page_table_lock);
105251+#ifndef __ARCH_HAS_4LEVEL_HACK
105252+ if (!pud_present(*pud)) {
105253+ mm_inc_nr_pmds(mm);
105254+ pud_populate_kernel(mm, pud, new);
105255+ } else /* Another has populated it */
105256+ pmd_free(mm, new);
105257+#else
105258+ if (!pgd_present(*pud)) {
105259+ mm_inc_nr_pmds(mm);
105260+ pgd_populate_kernel(mm, pud, new);
105261+ } else /* Another has populated it */
105262+ pmd_free(mm, new);
105263+#endif /* __ARCH_HAS_4LEVEL_HACK */
105264+ spin_unlock(&mm->page_table_lock);
105265+ return 0;
105266+}
105267 #endif /* __PAGETABLE_PMD_FOLDED */
105268
105269 static int __follow_pte(struct mm_struct *mm, unsigned long address,
105270@@ -3482,8 +3782,8 @@ out:
105271 return ret;
105272 }
105273
105274-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105275- void *buf, int len, int write)
105276+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105277+ void *buf, size_t len, int write)
105278 {
105279 resource_size_t phys_addr;
105280 unsigned long prot = 0;
105281@@ -3509,8 +3809,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
105282 * Access another process' address space as given in mm. If non-NULL, use the
105283 * given task for page fault accounting.
105284 */
105285-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105286- unsigned long addr, void *buf, int len, int write)
105287+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105288+ unsigned long addr, void *buf, size_t len, int write)
105289 {
105290 struct vm_area_struct *vma;
105291 void *old_buf = buf;
105292@@ -3518,7 +3818,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105293 down_read(&mm->mmap_sem);
105294 /* ignore errors, just check how much was successfully transferred */
105295 while (len) {
105296- int bytes, ret, offset;
105297+ ssize_t bytes, ret, offset;
105298 void *maddr;
105299 struct page *page = NULL;
105300
105301@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105302 *
105303 * The caller must hold a reference on @mm.
105304 */
105305-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105306- void *buf, int len, int write)
105307+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
105308+ void *buf, size_t len, int write)
105309 {
105310 return __access_remote_vm(NULL, mm, addr, buf, len, write);
105311 }
105312@@ -3590,11 +3890,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105313 * Source/target buffer must be kernel space,
105314 * Do not walk the page table directly, use get_user_pages
105315 */
105316-int access_process_vm(struct task_struct *tsk, unsigned long addr,
105317- void *buf, int len, int write)
105318+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
105319+ void *buf, size_t len, int write)
105320 {
105321 struct mm_struct *mm;
105322- int ret;
105323+ ssize_t ret;
105324
105325 mm = get_task_mm(tsk);
105326 if (!mm)
105327diff --git a/mm/mempolicy.c b/mm/mempolicy.c
105328index 0f7d73b..737047f 100644
105329--- a/mm/mempolicy.c
105330+++ b/mm/mempolicy.c
105331@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105332 unsigned long vmstart;
105333 unsigned long vmend;
105334
105335+#ifdef CONFIG_PAX_SEGMEXEC
105336+ struct vm_area_struct *vma_m;
105337+#endif
105338+
105339 vma = find_vma(mm, start);
105340 if (!vma || vma->vm_start > start)
105341 return -EFAULT;
105342@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105343 err = vma_replace_policy(vma, new_pol);
105344 if (err)
105345 goto out;
105346+
105347+#ifdef CONFIG_PAX_SEGMEXEC
105348+ vma_m = pax_find_mirror_vma(vma);
105349+ if (vma_m) {
105350+ err = vma_replace_policy(vma_m, new_pol);
105351+ if (err)
105352+ goto out;
105353+ }
105354+#endif
105355+
105356 }
105357
105358 out:
105359@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
105360
105361 if (end < start)
105362 return -EINVAL;
105363+
105364+#ifdef CONFIG_PAX_SEGMEXEC
105365+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
105366+ if (end > SEGMEXEC_TASK_SIZE)
105367+ return -EINVAL;
105368+ } else
105369+#endif
105370+
105371+ if (end > TASK_SIZE)
105372+ return -EINVAL;
105373+
105374 if (end == start)
105375 return 0;
105376
105377@@ -1385,8 +1410,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105378 */
105379 tcred = __task_cred(task);
105380 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105381- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105382- !capable(CAP_SYS_NICE)) {
105383+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105384 rcu_read_unlock();
105385 err = -EPERM;
105386 goto out_put;
105387@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105388 goto out;
105389 }
105390
105391+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105392+ if (mm != current->mm &&
105393+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
105394+ mmput(mm);
105395+ err = -EPERM;
105396+ goto out;
105397+ }
105398+#endif
105399+
105400 err = do_migrate_pages(mm, old, new,
105401 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
105402
105403diff --git a/mm/migrate.c b/mm/migrate.c
105404index 85e0426..be49beb 100644
105405--- a/mm/migrate.c
105406+++ b/mm/migrate.c
105407@@ -1472,8 +1472,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
105408 */
105409 tcred = __task_cred(task);
105410 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105411- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105412- !capable(CAP_SYS_NICE)) {
105413+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105414 rcu_read_unlock();
105415 err = -EPERM;
105416 goto out;
105417diff --git a/mm/mlock.c b/mm/mlock.c
105418index 8a54cd2..92f1747 100644
105419--- a/mm/mlock.c
105420+++ b/mm/mlock.c
105421@@ -14,6 +14,7 @@
105422 #include <linux/pagevec.h>
105423 #include <linux/mempolicy.h>
105424 #include <linux/syscalls.h>
105425+#include <linux/security.h>
105426 #include <linux/sched.h>
105427 #include <linux/export.h>
105428 #include <linux/rmap.h>
105429@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
105430 {
105431 unsigned long nstart, end, tmp;
105432 struct vm_area_struct * vma, * prev;
105433- int error;
105434+ int error = 0;
105435
105436 VM_BUG_ON(start & ~PAGE_MASK);
105437 VM_BUG_ON(len != PAGE_ALIGN(len));
105438@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
105439 return -EINVAL;
105440 if (end == start)
105441 return 0;
105442+ if (end > TASK_SIZE)
105443+ return -EINVAL;
105444+
105445 vma = find_vma(current->mm, start);
105446 if (!vma || vma->vm_start > start)
105447 return -ENOMEM;
105448@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
105449 for (nstart = start ; ; ) {
105450 vm_flags_t newflags;
105451
105452+#ifdef CONFIG_PAX_SEGMEXEC
105453+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105454+ break;
105455+#endif
105456+
105457 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
105458
105459 newflags = vma->vm_flags & ~VM_LOCKED;
105460@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
105461 locked += current->mm->locked_vm;
105462
105463 /* check against resource limits */
105464+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
105465 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
105466 error = do_mlock(start, len, 1);
105467
105468@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
105469 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
105470 vm_flags_t newflags;
105471
105472+#ifdef CONFIG_PAX_SEGMEXEC
105473+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105474+ break;
105475+#endif
105476+
105477 newflags = vma->vm_flags & ~VM_LOCKED;
105478 if (flags & MCL_CURRENT)
105479 newflags |= VM_LOCKED;
105480@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
105481 lock_limit >>= PAGE_SHIFT;
105482
105483 ret = -ENOMEM;
105484+
105485+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
105486+
105487 down_write(&current->mm->mmap_sem);
105488-
105489 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
105490 capable(CAP_IPC_LOCK))
105491 ret = do_mlockall(flags);
105492diff --git a/mm/mm_init.c b/mm/mm_init.c
105493index 5f420f7..dd42fb1b 100644
105494--- a/mm/mm_init.c
105495+++ b/mm/mm_init.c
105496@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
105497 return NOTIFY_OK;
105498 }
105499
105500-static struct notifier_block compute_batch_nb __meminitdata = {
105501+static struct notifier_block compute_batch_nb __meminitconst = {
105502 .notifier_call = mm_compute_batch_notifier,
105503 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
105504 };
105505diff --git a/mm/mmap.c b/mm/mmap.c
105506index 9ec50a3..0476e2d 100644
105507--- a/mm/mmap.c
105508+++ b/mm/mmap.c
105509@@ -41,6 +41,7 @@
105510 #include <linux/notifier.h>
105511 #include <linux/memory.h>
105512 #include <linux/printk.h>
105513+#include <linux/random.h>
105514
105515 #include <asm/uaccess.h>
105516 #include <asm/cacheflush.h>
105517@@ -57,6 +58,16 @@
105518 #define arch_rebalance_pgtables(addr, len) (addr)
105519 #endif
105520
105521+static inline void verify_mm_writelocked(struct mm_struct *mm)
105522+{
105523+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
105524+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
105525+ up_read(&mm->mmap_sem);
105526+ BUG();
105527+ }
105528+#endif
105529+}
105530+
105531 static void unmap_region(struct mm_struct *mm,
105532 struct vm_area_struct *vma, struct vm_area_struct *prev,
105533 unsigned long start, unsigned long end);
105534@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
105535 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
105536 *
105537 */
105538-pgprot_t protection_map[16] = {
105539+pgprot_t protection_map[16] __read_only = {
105540 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
105541 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
105542 };
105543
105544-pgprot_t vm_get_page_prot(unsigned long vm_flags)
105545+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
105546 {
105547- return __pgprot(pgprot_val(protection_map[vm_flags &
105548+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
105549 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
105550 pgprot_val(arch_vm_get_page_prot(vm_flags)));
105551+
105552+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105553+ if (!(__supported_pte_mask & _PAGE_NX) &&
105554+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
105555+ (vm_flags & (VM_READ | VM_WRITE)))
105556+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
105557+#endif
105558+
105559+ return prot;
105560 }
105561 EXPORT_SYMBOL(vm_get_page_prot);
105562
105563@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
105564 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
105565 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
105566 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
105567+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
105568 /*
105569 * Make sure vm_committed_as in one cacheline and not cacheline shared with
105570 * other variables. It can be updated by several CPUs frequently.
105571@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
105572 struct vm_area_struct *next = vma->vm_next;
105573
105574 might_sleep();
105575+ BUG_ON(vma->vm_mirror);
105576 if (vma->vm_ops && vma->vm_ops->close)
105577 vma->vm_ops->close(vma);
105578 if (vma->vm_file)
105579@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
105580
105581 SYSCALL_DEFINE1(brk, unsigned long, brk)
105582 {
105583+ unsigned long rlim;
105584 unsigned long retval;
105585 unsigned long newbrk, oldbrk;
105586 struct mm_struct *mm = current->mm;
105587@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
105588 * segment grow beyond its set limit the in case where the limit is
105589 * not page aligned -Ram Gupta
105590 */
105591- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
105592+ rlim = rlimit(RLIMIT_DATA);
105593+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105594+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
105595+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
105596+ rlim = 4096 * PAGE_SIZE;
105597+#endif
105598+ if (check_data_rlimit(rlim, brk, mm->start_brk,
105599 mm->end_data, mm->start_data))
105600 goto out;
105601
105602@@ -967,6 +996,12 @@ static int
105603 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
105604 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105605 {
105606+
105607+#ifdef CONFIG_PAX_SEGMEXEC
105608+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
105609+ return 0;
105610+#endif
105611+
105612 if (is_mergeable_vma(vma, file, vm_flags) &&
105613 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105614 if (vma->vm_pgoff == vm_pgoff)
105615@@ -986,6 +1021,12 @@ static int
105616 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
105617 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105618 {
105619+
105620+#ifdef CONFIG_PAX_SEGMEXEC
105621+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
105622+ return 0;
105623+#endif
105624+
105625 if (is_mergeable_vma(vma, file, vm_flags) &&
105626 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105627 pgoff_t vm_pglen;
105628@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105629 struct vm_area_struct *area, *next;
105630 int err;
105631
105632+#ifdef CONFIG_PAX_SEGMEXEC
105633+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
105634+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
105635+
105636+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
105637+#endif
105638+
105639 /*
105640 * We later require that vma->vm_flags == vm_flags,
105641 * so this tests vma->vm_flags & VM_SPECIAL, too.
105642@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105643 if (next && next->vm_end == end) /* cases 6, 7, 8 */
105644 next = next->vm_next;
105645
105646+#ifdef CONFIG_PAX_SEGMEXEC
105647+ if (prev)
105648+ prev_m = pax_find_mirror_vma(prev);
105649+ if (area)
105650+ area_m = pax_find_mirror_vma(area);
105651+ if (next)
105652+ next_m = pax_find_mirror_vma(next);
105653+#endif
105654+
105655 /*
105656 * Can it merge with the predecessor?
105657 */
105658@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105659 /* cases 1, 6 */
105660 err = vma_adjust(prev, prev->vm_start,
105661 next->vm_end, prev->vm_pgoff, NULL);
105662- } else /* cases 2, 5, 7 */
105663+
105664+#ifdef CONFIG_PAX_SEGMEXEC
105665+ if (!err && prev_m)
105666+ err = vma_adjust(prev_m, prev_m->vm_start,
105667+ next_m->vm_end, prev_m->vm_pgoff, NULL);
105668+#endif
105669+
105670+ } else { /* cases 2, 5, 7 */
105671 err = vma_adjust(prev, prev->vm_start,
105672 end, prev->vm_pgoff, NULL);
105673+
105674+#ifdef CONFIG_PAX_SEGMEXEC
105675+ if (!err && prev_m)
105676+ err = vma_adjust(prev_m, prev_m->vm_start,
105677+ end_m, prev_m->vm_pgoff, NULL);
105678+#endif
105679+
105680+ }
105681 if (err)
105682 return NULL;
105683 khugepaged_enter_vma_merge(prev, vm_flags);
105684@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105685 mpol_equal(policy, vma_policy(next)) &&
105686 can_vma_merge_before(next, vm_flags,
105687 anon_vma, file, pgoff+pglen)) {
105688- if (prev && addr < prev->vm_end) /* case 4 */
105689+ if (prev && addr < prev->vm_end) { /* case 4 */
105690 err = vma_adjust(prev, prev->vm_start,
105691 addr, prev->vm_pgoff, NULL);
105692- else /* cases 3, 8 */
105693+
105694+#ifdef CONFIG_PAX_SEGMEXEC
105695+ if (!err && prev_m)
105696+ err = vma_adjust(prev_m, prev_m->vm_start,
105697+ addr_m, prev_m->vm_pgoff, NULL);
105698+#endif
105699+
105700+ } else { /* cases 3, 8 */
105701 err = vma_adjust(area, addr, next->vm_end,
105702 next->vm_pgoff - pglen, NULL);
105703+
105704+#ifdef CONFIG_PAX_SEGMEXEC
105705+ if (!err && area_m)
105706+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
105707+ next_m->vm_pgoff - pglen, NULL);
105708+#endif
105709+
105710+ }
105711 if (err)
105712 return NULL;
105713 khugepaged_enter_vma_merge(area, vm_flags);
105714@@ -1199,8 +1286,10 @@ none:
105715 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105716 struct file *file, long pages)
105717 {
105718- const unsigned long stack_flags
105719- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
105720+
105721+#ifdef CONFIG_PAX_RANDMMAP
105722+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105723+#endif
105724
105725 mm->total_vm += pages;
105726
105727@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105728 mm->shared_vm += pages;
105729 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
105730 mm->exec_vm += pages;
105731- } else if (flags & stack_flags)
105732+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
105733 mm->stack_vm += pages;
105734 }
105735 #endif /* CONFIG_PROC_FS */
105736@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
105737 locked += mm->locked_vm;
105738 lock_limit = rlimit(RLIMIT_MEMLOCK);
105739 lock_limit >>= PAGE_SHIFT;
105740+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
105741 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
105742 return -EAGAIN;
105743 }
105744@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105745 * (the exception is when the underlying filesystem is noexec
105746 * mounted, in which case we dont add PROT_EXEC.)
105747 */
105748- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
105749+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
105750 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
105751 prot |= PROT_EXEC;
105752
105753@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105754 /* Obtain the address to map to. we verify (or select) it and ensure
105755 * that it represents a valid section of the address space.
105756 */
105757- addr = get_unmapped_area(file, addr, len, pgoff, flags);
105758+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
105759 if (addr & ~PAGE_MASK)
105760 return addr;
105761
105762@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105763 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
105764 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
105765
105766+#ifdef CONFIG_PAX_MPROTECT
105767+ if (mm->pax_flags & MF_PAX_MPROTECT) {
105768+
105769+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
105770+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
105771+ mm->binfmt->handle_mmap)
105772+ mm->binfmt->handle_mmap(file);
105773+#endif
105774+
105775+#ifndef CONFIG_PAX_MPROTECT_COMPAT
105776+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
105777+ gr_log_rwxmmap(file);
105778+
105779+#ifdef CONFIG_PAX_EMUPLT
105780+ vm_flags &= ~VM_EXEC;
105781+#else
105782+ return -EPERM;
105783+#endif
105784+
105785+ }
105786+
105787+ if (!(vm_flags & VM_EXEC))
105788+ vm_flags &= ~VM_MAYEXEC;
105789+#else
105790+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
105791+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
105792+#endif
105793+ else
105794+ vm_flags &= ~VM_MAYWRITE;
105795+ }
105796+#endif
105797+
105798+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105799+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
105800+ vm_flags &= ~VM_PAGEEXEC;
105801+#endif
105802+
105803 if (flags & MAP_LOCKED)
105804 if (!can_do_mlock())
105805 return -EPERM;
105806@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105807 vm_flags |= VM_NORESERVE;
105808 }
105809
105810+ if (!gr_acl_handle_mmap(file, prot))
105811+ return -EACCES;
105812+
105813 addr = mmap_region(file, addr, len, vm_flags, pgoff);
105814 if (!IS_ERR_VALUE(addr) &&
105815 ((vm_flags & VM_LOCKED) ||
105816@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
105817 vm_flags_t vm_flags = vma->vm_flags;
105818
105819 /* If it was private or non-writable, the write bit is already clear */
105820- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
105821+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
105822 return 0;
105823
105824 /* The backer wishes to know when pages are first written to? */
105825@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
105826 struct rb_node **rb_link, *rb_parent;
105827 unsigned long charged = 0;
105828
105829+#ifdef CONFIG_PAX_SEGMEXEC
105830+ struct vm_area_struct *vma_m = NULL;
105831+#endif
105832+
105833+ /*
105834+ * mm->mmap_sem is required to protect against another thread
105835+ * changing the mappings in case we sleep.
105836+ */
105837+ verify_mm_writelocked(mm);
105838+
105839 /* Check against address space limit. */
105840+
105841+#ifdef CONFIG_PAX_RANDMMAP
105842+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105843+#endif
105844+
105845 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
105846 unsigned long nr_pages;
105847
105848@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
105849
105850 /* Clear old maps */
105851 error = -ENOMEM;
105852-munmap_back:
105853 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
105854 if (do_munmap(mm, addr, len))
105855 return -ENOMEM;
105856- goto munmap_back;
105857+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
105858 }
105859
105860 /*
105861@@ -1586,6 +1730,16 @@ munmap_back:
105862 goto unacct_error;
105863 }
105864
105865+#ifdef CONFIG_PAX_SEGMEXEC
105866+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
105867+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
105868+ if (!vma_m) {
105869+ error = -ENOMEM;
105870+ goto free_vma;
105871+ }
105872+ }
105873+#endif
105874+
105875 vma->vm_mm = mm;
105876 vma->vm_start = addr;
105877 vma->vm_end = addr + len;
105878@@ -1616,6 +1770,13 @@ munmap_back:
105879 if (error)
105880 goto unmap_and_free_vma;
105881
105882+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105883+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
105884+ vma->vm_flags |= VM_PAGEEXEC;
105885+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
105886+ }
105887+#endif
105888+
105889 /* Can addr have changed??
105890 *
105891 * Answer: Yes, several device drivers can do it in their
105892@@ -1634,6 +1795,12 @@ munmap_back:
105893 }
105894
105895 vma_link(mm, vma, prev, rb_link, rb_parent);
105896+
105897+#ifdef CONFIG_PAX_SEGMEXEC
105898+ if (vma_m)
105899+ BUG_ON(pax_mirror_vma(vma_m, vma));
105900+#endif
105901+
105902 /* Once vma denies write, undo our temporary denial count */
105903 if (file) {
105904 if (vm_flags & VM_SHARED)
105905@@ -1646,6 +1813,7 @@ out:
105906 perf_event_mmap(vma);
105907
105908 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
105909+ track_exec_limit(mm, addr, addr + len, vm_flags);
105910 if (vm_flags & VM_LOCKED) {
105911 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
105912 vma == get_gate_vma(current->mm)))
105913@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
105914 if (vm_flags & VM_DENYWRITE)
105915 allow_write_access(file);
105916 free_vma:
105917+
105918+#ifdef CONFIG_PAX_SEGMEXEC
105919+ if (vma_m)
105920+ kmem_cache_free(vm_area_cachep, vma_m);
105921+#endif
105922+
105923 kmem_cache_free(vm_area_cachep, vma);
105924 unacct_error:
105925 if (charged)
105926@@ -1690,7 +1864,63 @@ unacct_error:
105927 return error;
105928 }
105929
105930-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
105931+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
105932+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
105933+{
105934+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
105935+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
105936+
105937+ return 0;
105938+}
105939+#endif
105940+
105941+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
105942+{
105943+ if (!vma) {
105944+#ifdef CONFIG_STACK_GROWSUP
105945+ if (addr > sysctl_heap_stack_gap)
105946+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
105947+ else
105948+ vma = find_vma(current->mm, 0);
105949+ if (vma && (vma->vm_flags & VM_GROWSUP))
105950+ return false;
105951+#endif
105952+ return true;
105953+ }
105954+
105955+ if (addr + len > vma->vm_start)
105956+ return false;
105957+
105958+ if (vma->vm_flags & VM_GROWSDOWN)
105959+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
105960+#ifdef CONFIG_STACK_GROWSUP
105961+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
105962+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
105963+#endif
105964+ else if (offset)
105965+ return offset <= vma->vm_start - addr - len;
105966+
105967+ return true;
105968+}
105969+
105970+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
105971+{
105972+ if (vma->vm_start < len)
105973+ return -ENOMEM;
105974+
105975+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
105976+ if (offset <= vma->vm_start - len)
105977+ return vma->vm_start - len - offset;
105978+ else
105979+ return -ENOMEM;
105980+ }
105981+
105982+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
105983+ return vma->vm_start - len - sysctl_heap_stack_gap;
105984+ return -ENOMEM;
105985+}
105986+
105987+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
105988 {
105989 /*
105990 * We implement the search by looking for an rbtree node that
105991@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
105992 }
105993 }
105994
105995- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
105996+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
105997 check_current:
105998 /* Check if current node has a suitable gap */
105999 if (gap_start > high_limit)
106000 return -ENOMEM;
106001+
106002+ if (gap_end - gap_start > info->threadstack_offset)
106003+ gap_start += info->threadstack_offset;
106004+ else
106005+ gap_start = gap_end;
106006+
106007+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106008+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106009+ gap_start += sysctl_heap_stack_gap;
106010+ else
106011+ gap_start = gap_end;
106012+ }
106013+ if (vma->vm_flags & VM_GROWSDOWN) {
106014+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106015+ gap_end -= sysctl_heap_stack_gap;
106016+ else
106017+ gap_end = gap_start;
106018+ }
106019 if (gap_end >= low_limit && gap_end - gap_start >= length)
106020 goto found;
106021
106022@@ -1792,7 +2040,7 @@ found:
106023 return gap_start;
106024 }
106025
106026-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
106027+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
106028 {
106029 struct mm_struct *mm = current->mm;
106030 struct vm_area_struct *vma;
106031@@ -1846,6 +2094,24 @@ check_current:
106032 gap_end = vma->vm_start;
106033 if (gap_end < low_limit)
106034 return -ENOMEM;
106035+
106036+ if (gap_end - gap_start > info->threadstack_offset)
106037+ gap_end -= info->threadstack_offset;
106038+ else
106039+ gap_end = gap_start;
106040+
106041+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106042+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106043+ gap_start += sysctl_heap_stack_gap;
106044+ else
106045+ gap_start = gap_end;
106046+ }
106047+ if (vma->vm_flags & VM_GROWSDOWN) {
106048+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106049+ gap_end -= sysctl_heap_stack_gap;
106050+ else
106051+ gap_end = gap_start;
106052+ }
106053 if (gap_start <= high_limit && gap_end - gap_start >= length)
106054 goto found;
106055
106056@@ -1909,6 +2175,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106057 struct mm_struct *mm = current->mm;
106058 struct vm_area_struct *vma;
106059 struct vm_unmapped_area_info info;
106060+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106061
106062 if (len > TASK_SIZE - mmap_min_addr)
106063 return -ENOMEM;
106064@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106065 if (flags & MAP_FIXED)
106066 return addr;
106067
106068+#ifdef CONFIG_PAX_RANDMMAP
106069+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106070+#endif
106071+
106072 if (addr) {
106073 addr = PAGE_ALIGN(addr);
106074 vma = find_vma(mm, addr);
106075 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106076- (!vma || addr + len <= vma->vm_start))
106077+ check_heap_stack_gap(vma, addr, len, offset))
106078 return addr;
106079 }
106080
106081@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106082 info.low_limit = mm->mmap_base;
106083 info.high_limit = TASK_SIZE;
106084 info.align_mask = 0;
106085+ info.threadstack_offset = offset;
106086 return vm_unmapped_area(&info);
106087 }
106088 #endif
106089@@ -1947,6 +2219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106090 struct mm_struct *mm = current->mm;
106091 unsigned long addr = addr0;
106092 struct vm_unmapped_area_info info;
106093+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106094
106095 /* requested length too big for entire address space */
106096 if (len > TASK_SIZE - mmap_min_addr)
106097@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106098 if (flags & MAP_FIXED)
106099 return addr;
106100
106101+#ifdef CONFIG_PAX_RANDMMAP
106102+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106103+#endif
106104+
106105 /* requesting a specific address */
106106 if (addr) {
106107 addr = PAGE_ALIGN(addr);
106108 vma = find_vma(mm, addr);
106109 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106110- (!vma || addr + len <= vma->vm_start))
106111+ check_heap_stack_gap(vma, addr, len, offset))
106112 return addr;
106113 }
106114
106115@@ -1969,6 +2246,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106116 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
106117 info.high_limit = mm->mmap_base;
106118 info.align_mask = 0;
106119+ info.threadstack_offset = offset;
106120 addr = vm_unmapped_area(&info);
106121
106122 /*
106123@@ -1981,6 +2259,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106124 VM_BUG_ON(addr != -ENOMEM);
106125 info.flags = 0;
106126 info.low_limit = TASK_UNMAPPED_BASE;
106127+
106128+#ifdef CONFIG_PAX_RANDMMAP
106129+ if (mm->pax_flags & MF_PAX_RANDMMAP)
106130+ info.low_limit += mm->delta_mmap;
106131+#endif
106132+
106133 info.high_limit = TASK_SIZE;
106134 addr = vm_unmapped_area(&info);
106135 }
106136@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
106137 return vma;
106138 }
106139
106140+#ifdef CONFIG_PAX_SEGMEXEC
106141+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
106142+{
106143+ struct vm_area_struct *vma_m;
106144+
106145+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
106146+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
106147+ BUG_ON(vma->vm_mirror);
106148+ return NULL;
106149+ }
106150+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
106151+ vma_m = vma->vm_mirror;
106152+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
106153+ BUG_ON(vma->vm_file != vma_m->vm_file);
106154+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
106155+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
106156+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
106157+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
106158+ return vma_m;
106159+}
106160+#endif
106161+
106162 /*
106163 * Verify that the stack growth is acceptable and
106164 * update accounting. This is shared with both the
106165@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106166
106167 /* Stack limit test */
106168 actual_size = size;
106169- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
106170- actual_size -= PAGE_SIZE;
106171+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
106172 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
106173 return -ENOMEM;
106174
106175@@ -2110,6 +2415,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106176 locked = mm->locked_vm + grow;
106177 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
106178 limit >>= PAGE_SHIFT;
106179+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
106180 if (locked > limit && !capable(CAP_IPC_LOCK))
106181 return -ENOMEM;
106182 }
106183@@ -2139,37 +2445,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106184 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
106185 * vma is the last one with address > vma->vm_end. Have to extend vma.
106186 */
106187+#ifndef CONFIG_IA64
106188+static
106189+#endif
106190 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106191 {
106192 int error;
106193+ bool locknext;
106194
106195 if (!(vma->vm_flags & VM_GROWSUP))
106196 return -EFAULT;
106197
106198+ /* Also guard against wrapping around to address 0. */
106199+ if (address < PAGE_ALIGN(address+1))
106200+ address = PAGE_ALIGN(address+1);
106201+ else
106202+ return -ENOMEM;
106203+
106204 /*
106205 * We must make sure the anon_vma is allocated
106206 * so that the anon_vma locking is not a noop.
106207 */
106208 if (unlikely(anon_vma_prepare(vma)))
106209 return -ENOMEM;
106210+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
106211+ if (locknext && anon_vma_prepare(vma->vm_next))
106212+ return -ENOMEM;
106213 vma_lock_anon_vma(vma);
106214+ if (locknext)
106215+ vma_lock_anon_vma(vma->vm_next);
106216
106217 /*
106218 * vma->vm_start/vm_end cannot change under us because the caller
106219 * is required to hold the mmap_sem in read mode. We need the
106220- * anon_vma lock to serialize against concurrent expand_stacks.
106221- * Also guard against wrapping around to address 0.
106222+ * anon_vma locks to serialize against concurrent expand_stacks
106223+ * and expand_upwards.
106224 */
106225- if (address < PAGE_ALIGN(address+4))
106226- address = PAGE_ALIGN(address+4);
106227- else {
106228- vma_unlock_anon_vma(vma);
106229- return -ENOMEM;
106230- }
106231 error = 0;
106232
106233 /* Somebody else might have raced and expanded it already */
106234- if (address > vma->vm_end) {
106235+ 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)
106236+ error = -ENOMEM;
106237+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
106238 unsigned long size, grow;
106239
106240 size = address - vma->vm_start;
106241@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106242 }
106243 }
106244 }
106245+ if (locknext)
106246+ vma_unlock_anon_vma(vma->vm_next);
106247 vma_unlock_anon_vma(vma);
106248 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106249 validate_mm(vma->vm_mm);
106250@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
106251 unsigned long address)
106252 {
106253 int error;
106254+ bool lockprev = false;
106255+ struct vm_area_struct *prev;
106256
106257 /*
106258 * We must make sure the anon_vma is allocated
106259@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
106260 if (error)
106261 return error;
106262
106263+ prev = vma->vm_prev;
106264+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
106265+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
106266+#endif
106267+ if (lockprev && anon_vma_prepare(prev))
106268+ return -ENOMEM;
106269+ if (lockprev)
106270+ vma_lock_anon_vma(prev);
106271+
106272 vma_lock_anon_vma(vma);
106273
106274 /*
106275@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
106276 */
106277
106278 /* Somebody else might have raced and expanded it already */
106279- if (address < vma->vm_start) {
106280+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
106281+ error = -ENOMEM;
106282+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
106283 unsigned long size, grow;
106284
106285+#ifdef CONFIG_PAX_SEGMEXEC
106286+ struct vm_area_struct *vma_m;
106287+
106288+ vma_m = pax_find_mirror_vma(vma);
106289+#endif
106290+
106291 size = vma->vm_end - address;
106292 grow = (vma->vm_start - address) >> PAGE_SHIFT;
106293
106294@@ -2267,13 +2605,27 @@ int expand_downwards(struct vm_area_struct *vma,
106295 vma->vm_pgoff -= grow;
106296 anon_vma_interval_tree_post_update_vma(vma);
106297 vma_gap_update(vma);
106298+
106299+#ifdef CONFIG_PAX_SEGMEXEC
106300+ if (vma_m) {
106301+ anon_vma_interval_tree_pre_update_vma(vma_m);
106302+ vma_m->vm_start -= grow << PAGE_SHIFT;
106303+ vma_m->vm_pgoff -= grow;
106304+ anon_vma_interval_tree_post_update_vma(vma_m);
106305+ vma_gap_update(vma_m);
106306+ }
106307+#endif
106308+
106309 spin_unlock(&vma->vm_mm->page_table_lock);
106310
106311+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
106312 perf_event_mmap(vma);
106313 }
106314 }
106315 }
106316 vma_unlock_anon_vma(vma);
106317+ if (lockprev)
106318+ vma_unlock_anon_vma(prev);
106319 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106320 validate_mm(vma->vm_mm);
106321 return error;
106322@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
106323 do {
106324 long nrpages = vma_pages(vma);
106325
106326+#ifdef CONFIG_PAX_SEGMEXEC
106327+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
106328+ vma = remove_vma(vma);
106329+ continue;
106330+ }
106331+#endif
106332+
106333 if (vma->vm_flags & VM_ACCOUNT)
106334 nr_accounted += nrpages;
106335 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
106336@@ -2417,6 +2776,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
106337 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
106338 vma->vm_prev = NULL;
106339 do {
106340+
106341+#ifdef CONFIG_PAX_SEGMEXEC
106342+ if (vma->vm_mirror) {
106343+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
106344+ vma->vm_mirror->vm_mirror = NULL;
106345+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
106346+ vma->vm_mirror = NULL;
106347+ }
106348+#endif
106349+
106350 vma_rb_erase(vma, &mm->mm_rb);
106351 mm->map_count--;
106352 tail_vma = vma;
106353@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106354 struct vm_area_struct *new;
106355 int err = -ENOMEM;
106356
106357+#ifdef CONFIG_PAX_SEGMEXEC
106358+ struct vm_area_struct *vma_m, *new_m = NULL;
106359+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
106360+#endif
106361+
106362 if (is_vm_hugetlb_page(vma) && (addr &
106363 ~(huge_page_mask(hstate_vma(vma)))))
106364 return -EINVAL;
106365
106366+#ifdef CONFIG_PAX_SEGMEXEC
106367+ vma_m = pax_find_mirror_vma(vma);
106368+#endif
106369+
106370 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106371 if (!new)
106372 goto out_err;
106373
106374+#ifdef CONFIG_PAX_SEGMEXEC
106375+ if (vma_m) {
106376+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106377+ if (!new_m) {
106378+ kmem_cache_free(vm_area_cachep, new);
106379+ goto out_err;
106380+ }
106381+ }
106382+#endif
106383+
106384 /* most fields are the same, copy all, and then fixup */
106385 *new = *vma;
106386
106387@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106388 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
106389 }
106390
106391+#ifdef CONFIG_PAX_SEGMEXEC
106392+ if (vma_m) {
106393+ *new_m = *vma_m;
106394+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
106395+ new_m->vm_mirror = new;
106396+ new->vm_mirror = new_m;
106397+
106398+ if (new_below)
106399+ new_m->vm_end = addr_m;
106400+ else {
106401+ new_m->vm_start = addr_m;
106402+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
106403+ }
106404+ }
106405+#endif
106406+
106407 err = vma_dup_policy(vma, new);
106408 if (err)
106409 goto out_free_vma;
106410@@ -2484,6 +2888,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106411 else
106412 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
106413
106414+#ifdef CONFIG_PAX_SEGMEXEC
106415+ if (!err && vma_m) {
106416+ struct mempolicy *pol = vma_policy(new);
106417+
106418+ if (anon_vma_clone(new_m, vma_m))
106419+ goto out_free_mpol;
106420+
106421+ mpol_get(pol);
106422+ set_vma_policy(new_m, pol);
106423+
106424+ if (new_m->vm_file)
106425+ get_file(new_m->vm_file);
106426+
106427+ if (new_m->vm_ops && new_m->vm_ops->open)
106428+ new_m->vm_ops->open(new_m);
106429+
106430+ if (new_below)
106431+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
106432+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
106433+ else
106434+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
106435+
106436+ if (err) {
106437+ if (new_m->vm_ops && new_m->vm_ops->close)
106438+ new_m->vm_ops->close(new_m);
106439+ if (new_m->vm_file)
106440+ fput(new_m->vm_file);
106441+ mpol_put(pol);
106442+ }
106443+ }
106444+#endif
106445+
106446 /* Success. */
106447 if (!err)
106448 return 0;
106449@@ -2493,10 +2929,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106450 new->vm_ops->close(new);
106451 if (new->vm_file)
106452 fput(new->vm_file);
106453- unlink_anon_vmas(new);
106454 out_free_mpol:
106455 mpol_put(vma_policy(new));
106456 out_free_vma:
106457+
106458+#ifdef CONFIG_PAX_SEGMEXEC
106459+ if (new_m) {
106460+ unlink_anon_vmas(new_m);
106461+ kmem_cache_free(vm_area_cachep, new_m);
106462+ }
106463+#endif
106464+
106465+ unlink_anon_vmas(new);
106466 kmem_cache_free(vm_area_cachep, new);
106467 out_err:
106468 return err;
106469@@ -2509,6 +2953,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106470 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106471 unsigned long addr, int new_below)
106472 {
106473+
106474+#ifdef CONFIG_PAX_SEGMEXEC
106475+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
106476+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
106477+ if (mm->map_count >= sysctl_max_map_count-1)
106478+ return -ENOMEM;
106479+ } else
106480+#endif
106481+
106482 if (mm->map_count >= sysctl_max_map_count)
106483 return -ENOMEM;
106484
106485@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106486 * work. This now handles partial unmappings.
106487 * Jeremy Fitzhardinge <jeremy@goop.org>
106488 */
106489+#ifdef CONFIG_PAX_SEGMEXEC
106490 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106491 {
106492+ int ret = __do_munmap(mm, start, len);
106493+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
106494+ return ret;
106495+
106496+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
106497+}
106498+
106499+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106500+#else
106501+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106502+#endif
106503+{
106504 unsigned long end;
106505 struct vm_area_struct *vma, *prev, *last;
106506
106507+ /*
106508+ * mm->mmap_sem is required to protect against another thread
106509+ * changing the mappings in case we sleep.
106510+ */
106511+ verify_mm_writelocked(mm);
106512+
106513 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
106514 return -EINVAL;
106515
106516@@ -2602,6 +3074,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106517 /* Fix up all other VM information */
106518 remove_vma_list(mm, vma);
106519
106520+ track_exec_limit(mm, start, end, 0UL);
106521+
106522 return 0;
106523 }
106524
106525@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
106526 int ret;
106527 struct mm_struct *mm = current->mm;
106528
106529+
106530+#ifdef CONFIG_PAX_SEGMEXEC
106531+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
106532+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
106533+ return -EINVAL;
106534+#endif
106535+
106536 down_write(&mm->mmap_sem);
106537 ret = do_munmap(mm, start, len);
106538 up_write(&mm->mmap_sem);
106539@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
106540 down_write(&mm->mmap_sem);
106541 vma = find_vma(mm, start);
106542
106543+#ifdef CONFIG_PAX_SEGMEXEC
106544+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
106545+ goto out;
106546+#endif
106547+
106548 if (!vma || !(vma->vm_flags & VM_SHARED))
106549 goto out;
106550
106551@@ -2692,16 +3178,6 @@ out:
106552 return ret;
106553 }
106554
106555-static inline void verify_mm_writelocked(struct mm_struct *mm)
106556-{
106557-#ifdef CONFIG_DEBUG_VM
106558- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
106559- WARN_ON(1);
106560- up_read(&mm->mmap_sem);
106561- }
106562-#endif
106563-}
106564-
106565 /*
106566 * this is really a simplified "do_mmap". it only handles
106567 * anonymous maps. eventually we may be able to do some
106568@@ -2715,6 +3191,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106569 struct rb_node **rb_link, *rb_parent;
106570 pgoff_t pgoff = addr >> PAGE_SHIFT;
106571 int error;
106572+ unsigned long charged;
106573
106574 len = PAGE_ALIGN(len);
106575 if (!len)
106576@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106577
106578 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
106579
106580+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
106581+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
106582+ flags &= ~VM_EXEC;
106583+
106584+#ifdef CONFIG_PAX_MPROTECT
106585+ if (mm->pax_flags & MF_PAX_MPROTECT)
106586+ flags &= ~VM_MAYEXEC;
106587+#endif
106588+
106589+ }
106590+#endif
106591+
106592 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
106593 if (error & ~PAGE_MASK)
106594 return error;
106595
106596+ charged = len >> PAGE_SHIFT;
106597+
106598 error = mlock_future_check(mm, mm->def_flags, len);
106599 if (error)
106600 return error;
106601@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106602 /*
106603 * Clear old maps. this also does some error checking for us
106604 */
106605- munmap_back:
106606 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106607 if (do_munmap(mm, addr, len))
106608 return -ENOMEM;
106609- goto munmap_back;
106610+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106611 }
106612
106613 /* Check against address space limits *after* clearing old maps... */
106614- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
106615+ if (!may_expand_vm(mm, charged))
106616 return -ENOMEM;
106617
106618 if (mm->map_count > sysctl_max_map_count)
106619 return -ENOMEM;
106620
106621- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
106622+ if (security_vm_enough_memory_mm(mm, charged))
106623 return -ENOMEM;
106624
106625 /* Can we just expand an old private anonymous mapping? */
106626@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106627 */
106628 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106629 if (!vma) {
106630- vm_unacct_memory(len >> PAGE_SHIFT);
106631+ vm_unacct_memory(charged);
106632 return -ENOMEM;
106633 }
106634
106635@@ -2781,10 +3271,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106636 vma_link(mm, vma, prev, rb_link, rb_parent);
106637 out:
106638 perf_event_mmap(vma);
106639- mm->total_vm += len >> PAGE_SHIFT;
106640+ mm->total_vm += charged;
106641 if (flags & VM_LOCKED)
106642- mm->locked_vm += (len >> PAGE_SHIFT);
106643+ mm->locked_vm += charged;
106644 vma->vm_flags |= VM_SOFTDIRTY;
106645+ track_exec_limit(mm, addr, addr + len, flags);
106646 return addr;
106647 }
106648
106649@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
106650 while (vma) {
106651 if (vma->vm_flags & VM_ACCOUNT)
106652 nr_accounted += vma_pages(vma);
106653+ vma->vm_mirror = NULL;
106654 vma = remove_vma(vma);
106655 }
106656 vm_unacct_memory(nr_accounted);
106657@@ -2860,6 +3352,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106658 struct vm_area_struct *prev;
106659 struct rb_node **rb_link, *rb_parent;
106660
106661+#ifdef CONFIG_PAX_SEGMEXEC
106662+ struct vm_area_struct *vma_m = NULL;
106663+#endif
106664+
106665+ if (security_mmap_addr(vma->vm_start))
106666+ return -EPERM;
106667+
106668 /*
106669 * The vm_pgoff of a purely anonymous vma should be irrelevant
106670 * until its first write fault, when page's anon_vma and index
106671@@ -2883,7 +3382,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106672 security_vm_enough_memory_mm(mm, vma_pages(vma)))
106673 return -ENOMEM;
106674
106675+#ifdef CONFIG_PAX_SEGMEXEC
106676+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
106677+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106678+ if (!vma_m)
106679+ return -ENOMEM;
106680+ }
106681+#endif
106682+
106683 vma_link(mm, vma, prev, rb_link, rb_parent);
106684+
106685+#ifdef CONFIG_PAX_SEGMEXEC
106686+ if (vma_m)
106687+ BUG_ON(pax_mirror_vma(vma_m, vma));
106688+#endif
106689+
106690 return 0;
106691 }
106692
106693@@ -2902,6 +3415,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106694 struct rb_node **rb_link, *rb_parent;
106695 bool faulted_in_anon_vma = true;
106696
106697+ BUG_ON(vma->vm_mirror);
106698+
106699 /*
106700 * If anonymous vma has not yet been faulted, update new pgoff
106701 * to match new location, to increase its chance of merging.
106702@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106703 return NULL;
106704 }
106705
106706+#ifdef CONFIG_PAX_SEGMEXEC
106707+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
106708+{
106709+ struct vm_area_struct *prev_m;
106710+ struct rb_node **rb_link_m, *rb_parent_m;
106711+ struct mempolicy *pol_m;
106712+
106713+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
106714+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
106715+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
106716+ *vma_m = *vma;
106717+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
106718+ if (anon_vma_clone(vma_m, vma))
106719+ return -ENOMEM;
106720+ pol_m = vma_policy(vma_m);
106721+ mpol_get(pol_m);
106722+ set_vma_policy(vma_m, pol_m);
106723+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
106724+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
106725+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
106726+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
106727+ if (vma_m->vm_file)
106728+ get_file(vma_m->vm_file);
106729+ if (vma_m->vm_ops && vma_m->vm_ops->open)
106730+ vma_m->vm_ops->open(vma_m);
106731+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
106732+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
106733+ vma_m->vm_mirror = vma;
106734+ vma->vm_mirror = vma_m;
106735+ return 0;
106736+}
106737+#endif
106738+
106739 /*
106740 * Return true if the calling process may expand its vm space by the passed
106741 * number of pages
106742@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
106743
106744 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
106745
106746+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
106747 if (cur + npages > lim)
106748 return 0;
106749 return 1;
106750@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
106751 vma->vm_start = addr;
106752 vma->vm_end = addr + len;
106753
106754+#ifdef CONFIG_PAX_MPROTECT
106755+ if (mm->pax_flags & MF_PAX_MPROTECT) {
106756+#ifndef CONFIG_PAX_MPROTECT_COMPAT
106757+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
106758+ return ERR_PTR(-EPERM);
106759+ if (!(vm_flags & VM_EXEC))
106760+ vm_flags &= ~VM_MAYEXEC;
106761+#else
106762+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
106763+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
106764+#endif
106765+ else
106766+ vm_flags &= ~VM_MAYWRITE;
106767+ }
106768+#endif
106769+
106770 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
106771 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
106772
106773diff --git a/mm/mprotect.c b/mm/mprotect.c
106774index 8858483..8145fa5 100644
106775--- a/mm/mprotect.c
106776+++ b/mm/mprotect.c
106777@@ -24,10 +24,18 @@
106778 #include <linux/migrate.h>
106779 #include <linux/perf_event.h>
106780 #include <linux/ksm.h>
106781+#include <linux/sched/sysctl.h>
106782+
106783+#ifdef CONFIG_PAX_MPROTECT
106784+#include <linux/elf.h>
106785+#include <linux/binfmts.h>
106786+#endif
106787+
106788 #include <asm/uaccess.h>
106789 #include <asm/pgtable.h>
106790 #include <asm/cacheflush.h>
106791 #include <asm/tlbflush.h>
106792+#include <asm/mmu_context.h>
106793
106794 /*
106795 * For a prot_numa update we only hold mmap_sem for read so there is a
106796@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
106797 return pages;
106798 }
106799
106800+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
106801+/* called while holding the mmap semaphor for writing except stack expansion */
106802+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
106803+{
106804+ unsigned long oldlimit, newlimit = 0UL;
106805+
106806+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
106807+ return;
106808+
106809+ spin_lock(&mm->page_table_lock);
106810+ oldlimit = mm->context.user_cs_limit;
106811+ if ((prot & VM_EXEC) && oldlimit < end)
106812+ /* USER_CS limit moved up */
106813+ newlimit = end;
106814+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
106815+ /* USER_CS limit moved down */
106816+ newlimit = start;
106817+
106818+ if (newlimit) {
106819+ mm->context.user_cs_limit = newlimit;
106820+
106821+#ifdef CONFIG_SMP
106822+ wmb();
106823+ cpus_clear(mm->context.cpu_user_cs_mask);
106824+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
106825+#endif
106826+
106827+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
106828+ }
106829+ spin_unlock(&mm->page_table_lock);
106830+ if (newlimit == end) {
106831+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
106832+
106833+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
106834+ if (is_vm_hugetlb_page(vma))
106835+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
106836+ else
106837+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
106838+ }
106839+}
106840+#endif
106841+
106842 int
106843 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106844 unsigned long start, unsigned long end, unsigned long newflags)
106845@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106846 int error;
106847 int dirty_accountable = 0;
106848
106849+#ifdef CONFIG_PAX_SEGMEXEC
106850+ struct vm_area_struct *vma_m = NULL;
106851+ unsigned long start_m, end_m;
106852+
106853+ start_m = start + SEGMEXEC_TASK_SIZE;
106854+ end_m = end + SEGMEXEC_TASK_SIZE;
106855+#endif
106856+
106857 if (newflags == oldflags) {
106858 *pprev = vma;
106859 return 0;
106860 }
106861
106862+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
106863+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
106864+
106865+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
106866+ return -ENOMEM;
106867+
106868+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
106869+ return -ENOMEM;
106870+ }
106871+
106872 /*
106873 * If we make a private mapping writable we increase our commit;
106874 * but (without finer accounting) cannot reduce our commit if we
106875@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106876 }
106877 }
106878
106879+#ifdef CONFIG_PAX_SEGMEXEC
106880+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
106881+ if (start != vma->vm_start) {
106882+ error = split_vma(mm, vma, start, 1);
106883+ if (error)
106884+ goto fail;
106885+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
106886+ *pprev = (*pprev)->vm_next;
106887+ }
106888+
106889+ if (end != vma->vm_end) {
106890+ error = split_vma(mm, vma, end, 0);
106891+ if (error)
106892+ goto fail;
106893+ }
106894+
106895+ if (pax_find_mirror_vma(vma)) {
106896+ error = __do_munmap(mm, start_m, end_m - start_m);
106897+ if (error)
106898+ goto fail;
106899+ } else {
106900+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106901+ if (!vma_m) {
106902+ error = -ENOMEM;
106903+ goto fail;
106904+ }
106905+ vma->vm_flags = newflags;
106906+ error = pax_mirror_vma(vma_m, vma);
106907+ if (error) {
106908+ vma->vm_flags = oldflags;
106909+ goto fail;
106910+ }
106911+ }
106912+ }
106913+#endif
106914+
106915 /*
106916 * First try to merge with previous and/or next vma.
106917 */
106918@@ -315,7 +419,19 @@ success:
106919 * vm_flags and vm_page_prot are protected by the mmap_sem
106920 * held in write mode.
106921 */
106922+
106923+#ifdef CONFIG_PAX_SEGMEXEC
106924+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
106925+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
106926+#endif
106927+
106928 vma->vm_flags = newflags;
106929+
106930+#ifdef CONFIG_PAX_MPROTECT
106931+ if (mm->binfmt && mm->binfmt->handle_mprotect)
106932+ mm->binfmt->handle_mprotect(vma, newflags);
106933+#endif
106934+
106935 dirty_accountable = vma_wants_writenotify(vma);
106936 vma_set_page_prot(vma);
106937
106938@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106939 end = start + len;
106940 if (end <= start)
106941 return -ENOMEM;
106942+
106943+#ifdef CONFIG_PAX_SEGMEXEC
106944+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
106945+ if (end > SEGMEXEC_TASK_SIZE)
106946+ return -EINVAL;
106947+ } else
106948+#endif
106949+
106950+ if (end > TASK_SIZE)
106951+ return -EINVAL;
106952+
106953 if (!arch_validate_prot(prot))
106954 return -EINVAL;
106955
106956@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106957 /*
106958 * Does the application expect PROT_READ to imply PROT_EXEC:
106959 */
106960- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
106961+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
106962 prot |= PROT_EXEC;
106963
106964 vm_flags = calc_vm_prot_bits(prot);
106965@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106966 if (start > vma->vm_start)
106967 prev = vma;
106968
106969+#ifdef CONFIG_PAX_MPROTECT
106970+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
106971+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
106972+#endif
106973+
106974 for (nstart = start ; ; ) {
106975 unsigned long newflags;
106976
106977@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106978
106979 /* newflags >> 4 shift VM_MAY% in place of VM_% */
106980 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
106981+ if (prot & (PROT_WRITE | PROT_EXEC))
106982+ gr_log_rwxmprotect(vma);
106983+
106984+ error = -EACCES;
106985+ goto out;
106986+ }
106987+
106988+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
106989 error = -EACCES;
106990 goto out;
106991 }
106992@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
106993 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
106994 if (error)
106995 goto out;
106996+
106997+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
106998+
106999 nstart = tmp;
107000
107001 if (nstart < prev->vm_end)
107002diff --git a/mm/mremap.c b/mm/mremap.c
107003index 2dc44b1..caa1819 100644
107004--- a/mm/mremap.c
107005+++ b/mm/mremap.c
107006@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
107007 continue;
107008 pte = ptep_get_and_clear(mm, old_addr, old_pte);
107009 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
107010+
107011+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107012+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
107013+ pte = pte_exprotect(pte);
107014+#endif
107015+
107016 pte = move_soft_dirty_pte(pte);
107017 set_pte_at(mm, new_addr, new_pte, pte);
107018 }
107019@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
107020 if (is_vm_hugetlb_page(vma))
107021 goto Einval;
107022
107023+#ifdef CONFIG_PAX_SEGMEXEC
107024+ if (pax_find_mirror_vma(vma))
107025+ goto Einval;
107026+#endif
107027+
107028 /* We can't remap across vm area boundaries */
107029 if (old_len > vma->vm_end - addr)
107030 goto Efault;
107031@@ -405,20 +416,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
107032 unsigned long ret = -EINVAL;
107033 unsigned long charged = 0;
107034 unsigned long map_flags;
107035+ unsigned long pax_task_size = TASK_SIZE;
107036
107037 if (new_addr & ~PAGE_MASK)
107038 goto out;
107039
107040- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
107041+#ifdef CONFIG_PAX_SEGMEXEC
107042+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107043+ pax_task_size = SEGMEXEC_TASK_SIZE;
107044+#endif
107045+
107046+ pax_task_size -= PAGE_SIZE;
107047+
107048+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
107049 goto out;
107050
107051 /* Check if the location we're moving into overlaps the
107052 * old location at all, and fail if it does.
107053 */
107054- if ((new_addr <= addr) && (new_addr+new_len) > addr)
107055- goto out;
107056-
107057- if ((addr <= new_addr) && (addr+old_len) > new_addr)
107058+ if (addr + old_len > new_addr && new_addr + new_len > addr)
107059 goto out;
107060
107061 ret = do_munmap(mm, new_addr, new_len);
107062@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107063 unsigned long ret = -EINVAL;
107064 unsigned long charged = 0;
107065 bool locked = false;
107066+ unsigned long pax_task_size = TASK_SIZE;
107067
107068 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
107069 return ret;
107070@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107071 if (!new_len)
107072 return ret;
107073
107074+#ifdef CONFIG_PAX_SEGMEXEC
107075+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107076+ pax_task_size = SEGMEXEC_TASK_SIZE;
107077+#endif
107078+
107079+ pax_task_size -= PAGE_SIZE;
107080+
107081+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
107082+ old_len > pax_task_size || addr > pax_task_size-old_len)
107083+ return ret;
107084+
107085 down_write(&current->mm->mmap_sem);
107086
107087 if (flags & MREMAP_FIXED) {
107088@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107089 new_addr = addr;
107090 }
107091 ret = addr;
107092+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
107093 goto out;
107094 }
107095 }
107096@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107097 goto out;
107098 }
107099
107100+ map_flags = vma->vm_flags;
107101 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
107102+ if (!(ret & ~PAGE_MASK)) {
107103+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
107104+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
107105+ }
107106 }
107107 out:
107108 if (ret & ~PAGE_MASK)
107109diff --git a/mm/nommu.c b/mm/nommu.c
107110index 3fba2dc..fdad748 100644
107111--- a/mm/nommu.c
107112+++ b/mm/nommu.c
107113@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
107114 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
107115 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
107116 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
107117-int heap_stack_gap = 0;
107118
107119 atomic_long_t mmap_pages_allocated;
107120
107121@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
107122 EXPORT_SYMBOL(find_vma);
107123
107124 /*
107125- * find a VMA
107126- * - we don't extend stack VMAs under NOMMU conditions
107127- */
107128-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
107129-{
107130- return find_vma(mm, addr);
107131-}
107132-
107133-/*
107134 * expand a stack to a given address
107135 * - not supported under NOMMU conditions
107136 */
107137@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
107138
107139 /* most fields are the same, copy all, and then fixup */
107140 *new = *vma;
107141+ INIT_LIST_HEAD(&new->anon_vma_chain);
107142 *region = *vma->vm_region;
107143 new->vm_region = region;
107144
107145@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
107146 }
107147 EXPORT_SYMBOL(filemap_map_pages);
107148
107149-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107150- unsigned long addr, void *buf, int len, int write)
107151+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107152+ unsigned long addr, void *buf, size_t len, int write)
107153 {
107154 struct vm_area_struct *vma;
107155
107156@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107157 *
107158 * The caller must hold a reference on @mm.
107159 */
107160-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107161- void *buf, int len, int write)
107162+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
107163+ void *buf, size_t len, int write)
107164 {
107165 return __access_remote_vm(NULL, mm, addr, buf, len, write);
107166 }
107167@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107168 * Access another process' address space.
107169 * - source/target buffer must be kernel space
107170 */
107171-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
107172+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
107173 {
107174 struct mm_struct *mm;
107175
107176diff --git a/mm/page-writeback.c b/mm/page-writeback.c
107177index ad05f2f..cee723a 100644
107178--- a/mm/page-writeback.c
107179+++ b/mm/page-writeback.c
107180@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
107181 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
107182 * - the bdi dirty thresh drops quickly due to change of JBOD workload
107183 */
107184-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
107185+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
107186 unsigned long thresh,
107187 unsigned long bg_thresh,
107188 unsigned long dirty,
107189diff --git a/mm/page_alloc.c b/mm/page_alloc.c
107190index 40e2942..0eb29a2 100644
107191--- a/mm/page_alloc.c
107192+++ b/mm/page_alloc.c
107193@@ -61,6 +61,7 @@
107194 #include <linux/hugetlb.h>
107195 #include <linux/sched/rt.h>
107196 #include <linux/page_owner.h>
107197+#include <linux/random.h>
107198
107199 #include <asm/sections.h>
107200 #include <asm/tlbflush.h>
107201@@ -357,7 +358,7 @@ out:
107202 * This usage means that zero-order pages may not be compound.
107203 */
107204
107205-static void free_compound_page(struct page *page)
107206+void free_compound_page(struct page *page)
107207 {
107208 __free_pages_ok(page, compound_order(page));
107209 }
107210@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
107211 __mod_zone_freepage_state(zone, (1 << order), migratetype);
107212 }
107213 #else
107214-struct page_ext_operations debug_guardpage_ops = { NULL, };
107215+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
107216 static inline void set_page_guard(struct zone *zone, struct page *page,
107217 unsigned int order, int migratetype) {}
107218 static inline void clear_page_guard(struct zone *zone, struct page *page,
107219@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107220 bool compound = PageCompound(page);
107221 int i, bad = 0;
107222
107223+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107224+ unsigned long index = 1UL << order;
107225+#endif
107226+
107227 VM_BUG_ON_PAGE(PageTail(page), page);
107228 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
107229
107230@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107231 debug_check_no_obj_freed(page_address(page),
107232 PAGE_SIZE << order);
107233 }
107234+
107235+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107236+ for (; index; --index)
107237+ sanitize_highpage(page + index - 1);
107238+#endif
107239+
107240 arch_free_page(page, order);
107241 kernel_map_pages(page, 1 << order, 0);
107242
107243@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
107244 local_irq_restore(flags);
107245 }
107246
107247+#ifdef CONFIG_PAX_LATENT_ENTROPY
107248+bool __meminitdata extra_latent_entropy;
107249+
107250+static int __init setup_pax_extra_latent_entropy(char *str)
107251+{
107252+ extra_latent_entropy = true;
107253+ return 0;
107254+}
107255+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
107256+
107257+volatile u64 latent_entropy __latent_entropy;
107258+EXPORT_SYMBOL(latent_entropy);
107259+#endif
107260+
107261 void __init __free_pages_bootmem(struct page *page, unsigned int order)
107262 {
107263 unsigned int nr_pages = 1 << order;
107264@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
107265 __ClearPageReserved(p);
107266 set_page_count(p, 0);
107267
107268+#ifdef CONFIG_PAX_LATENT_ENTROPY
107269+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
107270+ u64 hash = 0;
107271+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
107272+ const u64 *data = lowmem_page_address(page);
107273+
107274+ for (index = 0; index < end; index++)
107275+ hash ^= hash + data[index];
107276+ latent_entropy ^= hash;
107277+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
107278+ }
107279+#endif
107280+
107281 page_zone(page)->managed_pages += nr_pages;
107282 set_page_refcounted(page);
107283 __free_pages(page, order);
107284@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
107285 kernel_map_pages(page, 1 << order, 1);
107286 kasan_alloc_pages(page, order);
107287
107288+#ifndef CONFIG_PAX_MEMORY_SANITIZE
107289 if (gfp_flags & __GFP_ZERO)
107290 prep_zero_page(page, order, gfp_flags);
107291+#endif
107292
107293 if (order && (gfp_flags & __GFP_COMP))
107294 prep_compound_page(page, order);
107295@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
107296 }
107297
107298 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
107299- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107300+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107301 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
107302 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107303
107304@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
107305 do {
107306 mod_zone_page_state(zone, NR_ALLOC_BATCH,
107307 high_wmark_pages(zone) - low_wmark_pages(zone) -
107308- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107309+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107310 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107311 } while (zone++ != preferred_zone);
107312 }
107313@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
107314
107315 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
107316 high_wmark_pages(zone) - low_wmark_pages(zone) -
107317- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107318+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107319
107320 setup_zone_migrate_reserve(zone);
107321 spin_unlock_irqrestore(&zone->lock, flags);
107322diff --git a/mm/percpu.c b/mm/percpu.c
107323index 73c97a5..508ee25 100644
107324--- a/mm/percpu.c
107325+++ b/mm/percpu.c
107326@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
107327 static unsigned int pcpu_high_unit_cpu __read_mostly;
107328
107329 /* the address of the first chunk which starts with the kernel static area */
107330-void *pcpu_base_addr __read_mostly;
107331+void *pcpu_base_addr __read_only;
107332 EXPORT_SYMBOL_GPL(pcpu_base_addr);
107333
107334 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
107335diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
107336index b159769..d07037f 100644
107337--- a/mm/process_vm_access.c
107338+++ b/mm/process_vm_access.c
107339@@ -13,6 +13,7 @@
107340 #include <linux/uio.h>
107341 #include <linux/sched.h>
107342 #include <linux/highmem.h>
107343+#include <linux/security.h>
107344 #include <linux/ptrace.h>
107345 #include <linux/slab.h>
107346 #include <linux/syscalls.h>
107347@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107348 ssize_t iov_len;
107349 size_t total_len = iov_iter_count(iter);
107350
107351+ return -ENOSYS; // PaX: until properly audited
107352+
107353 /*
107354 * Work out how many pages of struct pages we're going to need
107355 * when eventually calling get_user_pages
107356 */
107357 for (i = 0; i < riovcnt; i++) {
107358 iov_len = rvec[i].iov_len;
107359- if (iov_len > 0) {
107360- nr_pages_iov = ((unsigned long)rvec[i].iov_base
107361- + iov_len)
107362- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
107363- / PAGE_SIZE + 1;
107364- nr_pages = max(nr_pages, nr_pages_iov);
107365- }
107366+ if (iov_len <= 0)
107367+ continue;
107368+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
107369+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
107370+ nr_pages = max(nr_pages, nr_pages_iov);
107371 }
107372
107373 if (nr_pages == 0)
107374@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107375 goto free_proc_pages;
107376 }
107377
107378+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
107379+ rc = -EPERM;
107380+ goto put_task_struct;
107381+ }
107382+
107383 mm = mm_access(task, PTRACE_MODE_ATTACH);
107384 if (!mm || IS_ERR(mm)) {
107385 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
107386diff --git a/mm/rmap.c b/mm/rmap.c
107387index c161a14..8a069bb 100644
107388--- a/mm/rmap.c
107389+++ b/mm/rmap.c
107390@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107391 struct anon_vma *anon_vma = vma->anon_vma;
107392 struct anon_vma_chain *avc;
107393
107394+#ifdef CONFIG_PAX_SEGMEXEC
107395+ struct anon_vma_chain *avc_m = NULL;
107396+#endif
107397+
107398 might_sleep();
107399 if (unlikely(!anon_vma)) {
107400 struct mm_struct *mm = vma->vm_mm;
107401@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107402 if (!avc)
107403 goto out_enomem;
107404
107405+#ifdef CONFIG_PAX_SEGMEXEC
107406+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
107407+ if (!avc_m)
107408+ goto out_enomem_free_avc;
107409+#endif
107410+
107411 anon_vma = find_mergeable_anon_vma(vma);
107412 allocated = NULL;
107413 if (!anon_vma) {
107414@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107415 /* page_table_lock to protect against threads */
107416 spin_lock(&mm->page_table_lock);
107417 if (likely(!vma->anon_vma)) {
107418+
107419+#ifdef CONFIG_PAX_SEGMEXEC
107420+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
107421+
107422+ if (vma_m) {
107423+ BUG_ON(vma_m->anon_vma);
107424+ vma_m->anon_vma = anon_vma;
107425+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
107426+ anon_vma->degree++;
107427+ avc_m = NULL;
107428+ }
107429+#endif
107430+
107431 vma->anon_vma = anon_vma;
107432 anon_vma_chain_link(vma, avc, anon_vma);
107433 /* vma reference or self-parent link for new root */
107434@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107435
107436 if (unlikely(allocated))
107437 put_anon_vma(allocated);
107438+
107439+#ifdef CONFIG_PAX_SEGMEXEC
107440+ if (unlikely(avc_m))
107441+ anon_vma_chain_free(avc_m);
107442+#endif
107443+
107444 if (unlikely(avc))
107445 anon_vma_chain_free(avc);
107446 }
107447 return 0;
107448
107449 out_enomem_free_avc:
107450+
107451+#ifdef CONFIG_PAX_SEGMEXEC
107452+ if (avc_m)
107453+ anon_vma_chain_free(avc_m);
107454+#endif
107455+
107456 anon_vma_chain_free(avc);
107457 out_enomem:
107458 return -ENOMEM;
107459@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
107460 * good chance of avoiding scanning the whole hierarchy when it searches where
107461 * page is mapped.
107462 */
107463-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107464+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
107465 {
107466 struct anon_vma_chain *avc, *pavc;
107467 struct anon_vma *root = NULL;
107468@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107469 * the corresponding VMA in the parent process is attached to.
107470 * Returns 0 on success, non-zero on failure.
107471 */
107472-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
107473+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
107474 {
107475 struct anon_vma_chain *avc;
107476 struct anon_vma *anon_vma;
107477@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
107478 void __init anon_vma_init(void)
107479 {
107480 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
107481- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
107482- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
107483+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
107484+ anon_vma_ctor);
107485+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
107486+ SLAB_PANIC|SLAB_NO_SANITIZE);
107487 }
107488
107489 /*
107490diff --git a/mm/shmem.c b/mm/shmem.c
107491index cf2d0ca..ec06b8b 100644
107492--- a/mm/shmem.c
107493+++ b/mm/shmem.c
107494@@ -33,7 +33,7 @@
107495 #include <linux/swap.h>
107496 #include <linux/aio.h>
107497
107498-static struct vfsmount *shm_mnt;
107499+struct vfsmount *shm_mnt;
107500
107501 #ifdef CONFIG_SHMEM
107502 /*
107503@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
107504 #define BOGO_DIRENT_SIZE 20
107505
107506 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
107507-#define SHORT_SYMLINK_LEN 128
107508+#define SHORT_SYMLINK_LEN 64
107509
107510 /*
107511 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
107512@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
107513 static int shmem_xattr_validate(const char *name)
107514 {
107515 struct { const char *prefix; size_t len; } arr[] = {
107516+
107517+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107518+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
107519+#endif
107520+
107521 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
107522 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
107523 };
107524@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
107525 if (err)
107526 return err;
107527
107528+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107529+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
107530+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
107531+ return -EOPNOTSUPP;
107532+ if (size > 8)
107533+ return -EINVAL;
107534+ }
107535+#endif
107536+
107537 return simple_xattr_set(&info->xattrs, name, value, size, flags);
107538 }
107539
107540@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
107541 int err = -ENOMEM;
107542
107543 /* Round up to L1_CACHE_BYTES to resist false sharing */
107544- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
107545- L1_CACHE_BYTES), GFP_KERNEL);
107546+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
107547 if (!sbinfo)
107548 return -ENOMEM;
107549
107550diff --git a/mm/slab.c b/mm/slab.c
107551index c4b89ea..20990be 100644
107552--- a/mm/slab.c
107553+++ b/mm/slab.c
107554@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107555 if ((x)->max_freeable < i) \
107556 (x)->max_freeable = i; \
107557 } while (0)
107558-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
107559-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
107560-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
107561-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
107562+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
107563+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
107564+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
107565+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
107566+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
107567+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
107568 #else
107569 #define STATS_INC_ACTIVE(x) do { } while (0)
107570 #define STATS_DEC_ACTIVE(x) do { } while (0)
107571@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107572 #define STATS_INC_ALLOCMISS(x) do { } while (0)
107573 #define STATS_INC_FREEHIT(x) do { } while (0)
107574 #define STATS_INC_FREEMISS(x) do { } while (0)
107575+#define STATS_INC_SANITIZED(x) do { } while (0)
107576+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
107577 #endif
107578
107579 #if DEBUG
107580@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
107581 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
107582 */
107583 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
107584- const struct page *page, void *obj)
107585+ const struct page *page, const void *obj)
107586 {
107587 u32 offset = (obj - page->s_mem);
107588 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
107589@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
107590 * structures first. Without this, further allocations will bug.
107591 */
107592 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
107593- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
107594+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
107595 slab_state = PARTIAL_NODE;
107596
107597 slab_early_init = 0;
107598@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
107599
107600 cachep = find_mergeable(size, align, flags, name, ctor);
107601 if (cachep) {
107602- cachep->refcount++;
107603+ atomic_inc(&cachep->refcount);
107604
107605 /*
107606 * Adjust the object sizes so that we clear
107607@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
107608 struct array_cache *ac = cpu_cache_get(cachep);
107609
107610 check_irq_off();
107611+
107612+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107613+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
107614+ STATS_INC_NOT_SANITIZED(cachep);
107615+ else {
107616+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
107617+
107618+ if (cachep->ctor)
107619+ cachep->ctor(objp);
107620+
107621+ STATS_INC_SANITIZED(cachep);
107622+ }
107623+#endif
107624+
107625 kmemleak_free_recursive(objp, cachep->flags);
107626 objp = cache_free_debugcheck(cachep, objp, caller);
107627
107628@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
107629 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
107630 }
107631
107632-void *__kmalloc_node(size_t size, gfp_t flags, int node)
107633+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
107634 {
107635 return __do_kmalloc_node(size, flags, node, _RET_IP_);
107636 }
107637@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
107638 * @flags: the type of memory to allocate (see kmalloc).
107639 * @caller: function caller for debug tracking of the caller
107640 */
107641-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
107642+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
107643 unsigned long caller)
107644 {
107645 struct kmem_cache *cachep;
107646@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
107647
107648 if (unlikely(ZERO_OR_NULL_PTR(objp)))
107649 return;
107650+ VM_BUG_ON(!virt_addr_valid(objp));
107651 local_irq_save(flags);
107652 kfree_debugcheck(objp);
107653 c = virt_to_cache(objp);
107654@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
107655 }
107656 /* cpu stats */
107657 {
107658- unsigned long allochit = atomic_read(&cachep->allochit);
107659- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
107660- unsigned long freehit = atomic_read(&cachep->freehit);
107661- unsigned long freemiss = atomic_read(&cachep->freemiss);
107662+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
107663+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
107664+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
107665+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
107666
107667 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
107668 allochit, allocmiss, freehit, freemiss);
107669 }
107670+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107671+ {
107672+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
107673+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
107674+
107675+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
107676+ }
107677+#endif
107678 #endif
107679 }
107680
107681@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
107682 static int __init slab_proc_init(void)
107683 {
107684 #ifdef CONFIG_DEBUG_SLAB_LEAK
107685- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
107686+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
107687 #endif
107688 return 0;
107689 }
107690 module_init(slab_proc_init);
107691 #endif
107692
107693+bool is_usercopy_object(const void *ptr)
107694+{
107695+ struct page *page;
107696+ struct kmem_cache *cachep;
107697+
107698+ if (ZERO_OR_NULL_PTR(ptr))
107699+ return false;
107700+
107701+ if (!slab_is_available())
107702+ return false;
107703+
107704+ if (!virt_addr_valid(ptr))
107705+ return false;
107706+
107707+ page = virt_to_head_page(ptr);
107708+
107709+ if (!PageSlab(page))
107710+ return false;
107711+
107712+ cachep = page->slab_cache;
107713+ return cachep->flags & SLAB_USERCOPY;
107714+}
107715+
107716+#ifdef CONFIG_PAX_USERCOPY
107717+const char *check_heap_object(const void *ptr, unsigned long n)
107718+{
107719+ struct page *page;
107720+ struct kmem_cache *cachep;
107721+ unsigned int objnr;
107722+ unsigned long offset;
107723+
107724+ if (ZERO_OR_NULL_PTR(ptr))
107725+ return "<null>";
107726+
107727+ if (!virt_addr_valid(ptr))
107728+ return NULL;
107729+
107730+ page = virt_to_head_page(ptr);
107731+
107732+ if (!PageSlab(page))
107733+ return NULL;
107734+
107735+ cachep = page->slab_cache;
107736+ if (!(cachep->flags & SLAB_USERCOPY))
107737+ return cachep->name;
107738+
107739+ objnr = obj_to_index(cachep, page, ptr);
107740+ BUG_ON(objnr >= cachep->num);
107741+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
107742+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
107743+ return NULL;
107744+
107745+ return cachep->name;
107746+}
107747+#endif
107748+
107749 /**
107750 * ksize - get the actual amount of memory allocated for a given object
107751 * @objp: Pointer to the object
107752diff --git a/mm/slab.h b/mm/slab.h
107753index 4c3ac12..7b2e470 100644
107754--- a/mm/slab.h
107755+++ b/mm/slab.h
107756@@ -22,7 +22,7 @@ struct kmem_cache {
107757 unsigned int align; /* Alignment as calculated */
107758 unsigned long flags; /* Active flags on the slab */
107759 const char *name; /* Slab name for sysfs */
107760- int refcount; /* Use counter */
107761+ atomic_t refcount; /* Use counter */
107762 void (*ctor)(void *); /* Called on object slot creation */
107763 struct list_head list; /* List of all slab caches on the system */
107764 };
107765@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
107766 /* The slab cache that manages slab cache information */
107767 extern struct kmem_cache *kmem_cache;
107768
107769+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107770+#ifdef CONFIG_X86_64
107771+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
107772+#else
107773+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
107774+#endif
107775+enum pax_sanitize_mode {
107776+ PAX_SANITIZE_SLAB_OFF = 0,
107777+ PAX_SANITIZE_SLAB_FAST,
107778+ PAX_SANITIZE_SLAB_FULL,
107779+};
107780+extern enum pax_sanitize_mode pax_sanitize_slab;
107781+#endif
107782+
107783 unsigned long calculate_alignment(unsigned long flags,
107784 unsigned long align, unsigned long size);
107785
107786@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
107787
107788 /* Legal flag mask for kmem_cache_create(), for various configurations */
107789 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
107790- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
107791+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
107792+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
107793
107794 #if defined(CONFIG_DEBUG_SLAB)
107795 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
107796@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
107797 return s;
107798
107799 page = virt_to_head_page(x);
107800+
107801+ BUG_ON(!PageSlab(page));
107802+
107803 cachep = page->slab_cache;
107804 if (slab_equal_or_root(cachep, s))
107805 return cachep;
107806diff --git a/mm/slab_common.c b/mm/slab_common.c
107807index 999bb34..9843aea 100644
107808--- a/mm/slab_common.c
107809+++ b/mm/slab_common.c
107810@@ -25,11 +25,35 @@
107811
107812 #include "slab.h"
107813
107814-enum slab_state slab_state;
107815+enum slab_state slab_state __read_only;
107816 LIST_HEAD(slab_caches);
107817 DEFINE_MUTEX(slab_mutex);
107818 struct kmem_cache *kmem_cache;
107819
107820+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107821+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
107822+static int __init pax_sanitize_slab_setup(char *str)
107823+{
107824+ if (!str)
107825+ return 0;
107826+
107827+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
107828+ pr_info("PaX slab sanitization: %s\n", "disabled");
107829+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
107830+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
107831+ pr_info("PaX slab sanitization: %s\n", "fast");
107832+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
107833+ } else if (!strcmp(str, "full")) {
107834+ pr_info("PaX slab sanitization: %s\n", "full");
107835+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
107836+ } else
107837+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
107838+
107839+ return 0;
107840+}
107841+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
107842+#endif
107843+
107844 /*
107845 * Set of flags that will prevent slab merging
107846 */
107847@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
107848 * Merge control. If this is set then no merging of slab caches will occur.
107849 * (Could be removed. This was introduced to pacify the merge skeptics.)
107850 */
107851-static int slab_nomerge;
107852+static int slab_nomerge = 1;
107853
107854 static int __init setup_slab_nomerge(char *str)
107855 {
107856@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
107857 /*
107858 * We may have set a slab to be unmergeable during bootstrap.
107859 */
107860- if (s->refcount < 0)
107861+ if (atomic_read(&s->refcount) < 0)
107862 return 1;
107863
107864 return 0;
107865@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
107866 if (err)
107867 goto out_free_cache;
107868
107869- s->refcount = 1;
107870+ atomic_set(&s->refcount, 1);
107871 list_add(&s->list, &slab_caches);
107872 out:
107873 if (err)
107874@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
107875 */
107876 flags &= CACHE_CREATE_MASK;
107877
107878+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107879+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
107880+ flags |= SLAB_NO_SANITIZE;
107881+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
107882+ flags &= ~SLAB_NO_SANITIZE;
107883+#endif
107884+
107885 s = __kmem_cache_alias(name, size, align, flags, ctor);
107886 if (s)
107887 goto out_unlock;
107888@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
107889 rcu_barrier();
107890
107891 list_for_each_entry_safe(s, s2, release, list) {
107892-#ifdef SLAB_SUPPORTS_SYSFS
107893+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
107894 sysfs_slab_remove(s);
107895 #else
107896 slab_kmem_cache_release(s);
107897@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
107898
107899 mutex_lock(&slab_mutex);
107900
107901- s->refcount--;
107902- if (s->refcount)
107903+ if (!atomic_dec_and_test(&s->refcount))
107904 goto out_unlock;
107905
107906 for_each_memcg_cache_safe(c, c2, s) {
107907@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
107908 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
107909 name, size, err);
107910
107911- s->refcount = -1; /* Exempt from merging for now */
107912+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
107913 }
107914
107915 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
107916@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
107917
107918 create_boot_cache(s, name, size, flags);
107919 list_add(&s->list, &slab_caches);
107920- s->refcount = 1;
107921+ atomic_set(&s->refcount, 1);
107922 return s;
107923 }
107924
107925@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
107926 EXPORT_SYMBOL(kmalloc_dma_caches);
107927 #endif
107928
107929+#ifdef CONFIG_PAX_USERCOPY_SLABS
107930+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
107931+EXPORT_SYMBOL(kmalloc_usercopy_caches);
107932+#endif
107933+
107934 /*
107935 * Conversion table for small slabs sizes / 8 to the index in the
107936 * kmalloc array. This is necessary for slabs < 192 since we have non power
107937@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
107938 return kmalloc_dma_caches[index];
107939
107940 #endif
107941+
107942+#ifdef CONFIG_PAX_USERCOPY_SLABS
107943+ if (unlikely((flags & GFP_USERCOPY)))
107944+ return kmalloc_usercopy_caches[index];
107945+
107946+#endif
107947+
107948 return kmalloc_caches[index];
107949 }
107950
107951@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
107952 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
107953 if (!kmalloc_caches[i]) {
107954 kmalloc_caches[i] = create_kmalloc_cache(NULL,
107955- 1 << i, flags);
107956+ 1 << i, SLAB_USERCOPY | flags);
107957 }
107958
107959 /*
107960@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
107961 * earlier power of two caches
107962 */
107963 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
107964- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
107965+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
107966
107967 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
107968- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
107969+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
107970 }
107971
107972 /* Kmalloc array is now usable */
107973@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
107974 }
107975 }
107976 #endif
107977+
107978+#ifdef CONFIG_PAX_USERCOPY_SLABS
107979+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
107980+ struct kmem_cache *s = kmalloc_caches[i];
107981+
107982+ if (s) {
107983+ int size = kmalloc_size(i);
107984+ char *n = kasprintf(GFP_NOWAIT,
107985+ "usercopy-kmalloc-%d", size);
107986+
107987+ BUG_ON(!n);
107988+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
107989+ size, SLAB_USERCOPY | flags);
107990+ }
107991+ }
107992+#endif
107993+
107994 }
107995 #endif /* !CONFIG_SLOB */
107996
107997@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
107998 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
107999 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
108000 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
108001+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108002+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
108003+#endif
108004 #endif
108005 seq_putc(m, '\n');
108006 }
108007@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
108008 module_init(slab_proc_init);
108009 #endif /* CONFIG_SLABINFO */
108010
108011-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
108012+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
108013 gfp_t flags)
108014 {
108015 void *ret;
108016diff --git a/mm/slob.c b/mm/slob.c
108017index 94a7fed..cf3fb1a 100644
108018--- a/mm/slob.c
108019+++ b/mm/slob.c
108020@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
108021 /*
108022 * Return the size of a slob block.
108023 */
108024-static slobidx_t slob_units(slob_t *s)
108025+static slobidx_t slob_units(const slob_t *s)
108026 {
108027 if (s->units > 0)
108028 return s->units;
108029@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
108030 /*
108031 * Return the next free slob block pointer after this one.
108032 */
108033-static slob_t *slob_next(slob_t *s)
108034+static slob_t *slob_next(const slob_t *s)
108035 {
108036 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
108037 slobidx_t next;
108038@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
108039 /*
108040 * Returns true if s is the last free block in its page.
108041 */
108042-static int slob_last(slob_t *s)
108043+static int slob_last(const slob_t *s)
108044 {
108045 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
108046 }
108047
108048-static void *slob_new_pages(gfp_t gfp, int order, int node)
108049+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
108050 {
108051- void *page;
108052+ struct page *page;
108053
108054 #ifdef CONFIG_NUMA
108055 if (node != NUMA_NO_NODE)
108056@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
108057 if (!page)
108058 return NULL;
108059
108060- return page_address(page);
108061+ __SetPageSlab(page);
108062+ return page;
108063 }
108064
108065-static void slob_free_pages(void *b, int order)
108066+static void slob_free_pages(struct page *sp, int order)
108067 {
108068 if (current->reclaim_state)
108069 current->reclaim_state->reclaimed_slab += 1 << order;
108070- free_pages((unsigned long)b, order);
108071+ __ClearPageSlab(sp);
108072+ page_mapcount_reset(sp);
108073+ sp->private = 0;
108074+ __free_pages(sp, order);
108075 }
108076
108077 /*
108078@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108079
108080 /* Not enough space: must allocate a new page */
108081 if (!b) {
108082- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108083- if (!b)
108084+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108085+ if (!sp)
108086 return NULL;
108087- sp = virt_to_page(b);
108088- __SetPageSlab(sp);
108089+ b = page_address(sp);
108090
108091 spin_lock_irqsave(&slob_lock, flags);
108092 sp->units = SLOB_UNITS(PAGE_SIZE);
108093 sp->freelist = b;
108094+ sp->private = 0;
108095 INIT_LIST_HEAD(&sp->lru);
108096 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
108097 set_slob_page_free(sp, slob_list);
108098@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108099 /*
108100 * slob_free: entry point into the slob allocator.
108101 */
108102-static void slob_free(void *block, int size)
108103+static void slob_free(struct kmem_cache *c, void *block, int size)
108104 {
108105 struct page *sp;
108106 slob_t *prev, *next, *b = (slob_t *)block;
108107@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
108108 if (slob_page_free(sp))
108109 clear_slob_page_free(sp);
108110 spin_unlock_irqrestore(&slob_lock, flags);
108111- __ClearPageSlab(sp);
108112- page_mapcount_reset(sp);
108113- slob_free_pages(b, 0);
108114+ slob_free_pages(sp, 0);
108115 return;
108116 }
108117
108118+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108119+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
108120+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
108121+#endif
108122+
108123 if (!slob_page_free(sp)) {
108124 /* This slob page is about to become partially free. Easy! */
108125 sp->units = units;
108126@@ -424,11 +431,10 @@ out:
108127 */
108128
108129 static __always_inline void *
108130-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108131+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
108132 {
108133- unsigned int *m;
108134- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108135- void *ret;
108136+ slob_t *m;
108137+ void *ret = NULL;
108138
108139 gfp &= gfp_allowed_mask;
108140
108141@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108142
108143 if (!m)
108144 return NULL;
108145- *m = size;
108146+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
108147+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
108148+ m[0].units = size;
108149+ m[1].units = align;
108150 ret = (void *)m + align;
108151
108152 trace_kmalloc_node(caller, ret,
108153 size, size + align, gfp, node);
108154 } else {
108155 unsigned int order = get_order(size);
108156+ struct page *page;
108157
108158 if (likely(order))
108159 gfp |= __GFP_COMP;
108160- ret = slob_new_pages(gfp, order, node);
108161+ page = slob_new_pages(gfp, order, node);
108162+ if (page) {
108163+ ret = page_address(page);
108164+ page->private = size;
108165+ }
108166
108167 trace_kmalloc_node(caller, ret,
108168 size, PAGE_SIZE << order, gfp, node);
108169 }
108170
108171- kmemleak_alloc(ret, size, 1, gfp);
108172 return ret;
108173 }
108174
108175-void *__kmalloc(size_t size, gfp_t gfp)
108176+static __always_inline void *
108177+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108178+{
108179+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108180+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
108181+
108182+ if (!ZERO_OR_NULL_PTR(ret))
108183+ kmemleak_alloc(ret, size, 1, gfp);
108184+ return ret;
108185+}
108186+
108187+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
108188 {
108189 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
108190 }
108191@@ -491,34 +515,112 @@ void kfree(const void *block)
108192 return;
108193 kmemleak_free(block);
108194
108195+ VM_BUG_ON(!virt_addr_valid(block));
108196 sp = virt_to_page(block);
108197- if (PageSlab(sp)) {
108198+ VM_BUG_ON(!PageSlab(sp));
108199+ if (!sp->private) {
108200 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108201- unsigned int *m = (unsigned int *)(block - align);
108202- slob_free(m, *m + align);
108203- } else
108204+ slob_t *m = (slob_t *)(block - align);
108205+ slob_free(NULL, m, m[0].units + align);
108206+ } else {
108207+ __ClearPageSlab(sp);
108208+ page_mapcount_reset(sp);
108209+ sp->private = 0;
108210 __free_pages(sp, compound_order(sp));
108211+ }
108212 }
108213 EXPORT_SYMBOL(kfree);
108214
108215+bool is_usercopy_object(const void *ptr)
108216+{
108217+ if (!slab_is_available())
108218+ return false;
108219+
108220+ // PAX: TODO
108221+
108222+ return false;
108223+}
108224+
108225+#ifdef CONFIG_PAX_USERCOPY
108226+const char *check_heap_object(const void *ptr, unsigned long n)
108227+{
108228+ struct page *page;
108229+ const slob_t *free;
108230+ const void *base;
108231+ unsigned long flags;
108232+
108233+ if (ZERO_OR_NULL_PTR(ptr))
108234+ return "<null>";
108235+
108236+ if (!virt_addr_valid(ptr))
108237+ return NULL;
108238+
108239+ page = virt_to_head_page(ptr);
108240+ if (!PageSlab(page))
108241+ return NULL;
108242+
108243+ if (page->private) {
108244+ base = page;
108245+ if (base <= ptr && n <= page->private - (ptr - base))
108246+ return NULL;
108247+ return "<slob>";
108248+ }
108249+
108250+ /* some tricky double walking to find the chunk */
108251+ spin_lock_irqsave(&slob_lock, flags);
108252+ base = (void *)((unsigned long)ptr & PAGE_MASK);
108253+ free = page->freelist;
108254+
108255+ while (!slob_last(free) && (void *)free <= ptr) {
108256+ base = free + slob_units(free);
108257+ free = slob_next(free);
108258+ }
108259+
108260+ while (base < (void *)free) {
108261+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
108262+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
108263+ int offset;
108264+
108265+ if (ptr < base + align)
108266+ break;
108267+
108268+ offset = ptr - base - align;
108269+ if (offset >= m) {
108270+ base += size;
108271+ continue;
108272+ }
108273+
108274+ if (n > m - offset)
108275+ break;
108276+
108277+ spin_unlock_irqrestore(&slob_lock, flags);
108278+ return NULL;
108279+ }
108280+
108281+ spin_unlock_irqrestore(&slob_lock, flags);
108282+ return "<slob>";
108283+}
108284+#endif
108285+
108286 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
108287 size_t ksize(const void *block)
108288 {
108289 struct page *sp;
108290 int align;
108291- unsigned int *m;
108292+ slob_t *m;
108293
108294 BUG_ON(!block);
108295 if (unlikely(block == ZERO_SIZE_PTR))
108296 return 0;
108297
108298 sp = virt_to_page(block);
108299- if (unlikely(!PageSlab(sp)))
108300- return PAGE_SIZE << compound_order(sp);
108301+ VM_BUG_ON(!PageSlab(sp));
108302+ if (sp->private)
108303+ return sp->private;
108304
108305 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108306- m = (unsigned int *)(block - align);
108307- return SLOB_UNITS(*m) * SLOB_UNIT;
108308+ m = (slob_t *)(block - align);
108309+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
108310 }
108311 EXPORT_SYMBOL(ksize);
108312
108313@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
108314
108315 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
108316 {
108317- void *b;
108318+ void *b = NULL;
108319
108320 flags &= gfp_allowed_mask;
108321
108322 lockdep_trace_alloc(flags);
108323
108324+#ifdef CONFIG_PAX_USERCOPY_SLABS
108325+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
108326+#else
108327 if (c->size < PAGE_SIZE) {
108328 b = slob_alloc(c->size, flags, c->align, node);
108329 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108330 SLOB_UNITS(c->size) * SLOB_UNIT,
108331 flags, node);
108332 } else {
108333- b = slob_new_pages(flags, get_order(c->size), node);
108334+ struct page *sp;
108335+
108336+ sp = slob_new_pages(flags, get_order(c->size), node);
108337+ if (sp) {
108338+ b = page_address(sp);
108339+ sp->private = c->size;
108340+ }
108341 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108342 PAGE_SIZE << get_order(c->size),
108343 flags, node);
108344 }
108345+#endif
108346
108347 if (b && c->ctor)
108348 c->ctor(b);
108349@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
108350 EXPORT_SYMBOL(kmem_cache_alloc);
108351
108352 #ifdef CONFIG_NUMA
108353-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
108354+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
108355 {
108356 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
108357 }
108358@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
108359 EXPORT_SYMBOL(kmem_cache_alloc_node);
108360 #endif
108361
108362-static void __kmem_cache_free(void *b, int size)
108363+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
108364 {
108365- if (size < PAGE_SIZE)
108366- slob_free(b, size);
108367+ struct page *sp;
108368+
108369+ sp = virt_to_page(b);
108370+ BUG_ON(!PageSlab(sp));
108371+ if (!sp->private)
108372+ slob_free(c, b, size);
108373 else
108374- slob_free_pages(b, get_order(size));
108375+ slob_free_pages(sp, get_order(size));
108376 }
108377
108378 static void kmem_rcu_free(struct rcu_head *head)
108379@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
108380 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
108381 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
108382
108383- __kmem_cache_free(b, slob_rcu->size);
108384+ __kmem_cache_free(NULL, b, slob_rcu->size);
108385 }
108386
108387 void kmem_cache_free(struct kmem_cache *c, void *b)
108388 {
108389+ int size = c->size;
108390+
108391+#ifdef CONFIG_PAX_USERCOPY_SLABS
108392+ if (size + c->align < PAGE_SIZE) {
108393+ size += c->align;
108394+ b -= c->align;
108395+ }
108396+#endif
108397+
108398 kmemleak_free_recursive(b, c->flags);
108399 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
108400 struct slob_rcu *slob_rcu;
108401- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
108402- slob_rcu->size = c->size;
108403+ slob_rcu = b + (size - sizeof(struct slob_rcu));
108404+ slob_rcu->size = size;
108405 call_rcu(&slob_rcu->head, kmem_rcu_free);
108406 } else {
108407- __kmem_cache_free(b, c->size);
108408+ __kmem_cache_free(c, b, size);
108409 }
108410
108411+#ifdef CONFIG_PAX_USERCOPY_SLABS
108412+ trace_kfree(_RET_IP_, b);
108413+#else
108414 trace_kmem_cache_free(_RET_IP_, b);
108415+#endif
108416+
108417 }
108418 EXPORT_SYMBOL(kmem_cache_free);
108419
108420diff --git a/mm/slub.c b/mm/slub.c
108421index 82c4737..55c316a 100644
108422--- a/mm/slub.c
108423+++ b/mm/slub.c
108424@@ -198,7 +198,7 @@ struct track {
108425
108426 enum track_item { TRACK_ALLOC, TRACK_FREE };
108427
108428-#ifdef CONFIG_SYSFS
108429+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108430 static int sysfs_slab_add(struct kmem_cache *);
108431 static int sysfs_slab_alias(struct kmem_cache *, const char *);
108432 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
108433@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
108434 if (!t->addr)
108435 return;
108436
108437- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
108438+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
108439 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
108440 #ifdef CONFIG_STACKTRACE
108441 {
108442@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
108443
108444 slab_free_hook(s, x);
108445
108446+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108447+ if (!(s->flags & SLAB_NO_SANITIZE)) {
108448+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
108449+ if (s->ctor)
108450+ s->ctor(x);
108451+ }
108452+#endif
108453+
108454 redo:
108455 /*
108456 * Determine the currently cpus per cpu slab.
108457@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
108458 s->inuse = size;
108459
108460 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
108461+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108462+ (!(flags & SLAB_NO_SANITIZE)) ||
108463+#endif
108464 s->ctor)) {
108465 /*
108466 * Relocate free pointer after the object if it is not
108467@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
108468
108469 __setup("slub_min_objects=", setup_slub_min_objects);
108470
108471-void *__kmalloc(size_t size, gfp_t flags)
108472+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
108473 {
108474 struct kmem_cache *s;
108475 void *ret;
108476@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
108477 return ptr;
108478 }
108479
108480-void *__kmalloc_node(size_t size, gfp_t flags, int node)
108481+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
108482 {
108483 struct kmem_cache *s;
108484 void *ret;
108485@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
108486 return slab_ksize(page->slab_cache);
108487 }
108488
108489+bool is_usercopy_object(const void *ptr)
108490+{
108491+ struct page *page;
108492+ struct kmem_cache *s;
108493+
108494+ if (ZERO_OR_NULL_PTR(ptr))
108495+ return false;
108496+
108497+ if (!slab_is_available())
108498+ return false;
108499+
108500+ if (!virt_addr_valid(ptr))
108501+ return false;
108502+
108503+ page = virt_to_head_page(ptr);
108504+
108505+ if (!PageSlab(page))
108506+ return false;
108507+
108508+ s = page->slab_cache;
108509+ return s->flags & SLAB_USERCOPY;
108510+}
108511+
108512+#ifdef CONFIG_PAX_USERCOPY
108513+const char *check_heap_object(const void *ptr, unsigned long n)
108514+{
108515+ struct page *page;
108516+ struct kmem_cache *s;
108517+ unsigned long offset;
108518+
108519+ if (ZERO_OR_NULL_PTR(ptr))
108520+ return "<null>";
108521+
108522+ if (!virt_addr_valid(ptr))
108523+ return NULL;
108524+
108525+ page = virt_to_head_page(ptr);
108526+
108527+ if (!PageSlab(page))
108528+ return NULL;
108529+
108530+ s = page->slab_cache;
108531+ if (!(s->flags & SLAB_USERCOPY))
108532+ return s->name;
108533+
108534+ offset = (ptr - page_address(page)) % s->size;
108535+ if (offset <= s->object_size && n <= s->object_size - offset)
108536+ return NULL;
108537+
108538+ return s->name;
108539+}
108540+#endif
108541+
108542 size_t ksize(const void *object)
108543 {
108544 size_t size = __ksize(object);
108545@@ -3410,6 +3474,7 @@ void kfree(const void *x)
108546 if (unlikely(ZERO_OR_NULL_PTR(x)))
108547 return;
108548
108549+ VM_BUG_ON(!virt_addr_valid(x));
108550 page = virt_to_head_page(x);
108551 if (unlikely(!PageSlab(page))) {
108552 BUG_ON(!PageCompound(page));
108553@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108554
108555 s = find_mergeable(size, align, flags, name, ctor);
108556 if (s) {
108557- s->refcount++;
108558+ atomic_inc(&s->refcount);
108559
108560 /*
108561 * Adjust the object sizes so that we clear
108562@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108563 }
108564
108565 if (sysfs_slab_alias(s, name)) {
108566- s->refcount--;
108567+ atomic_dec(&s->refcount);
108568 s = NULL;
108569 }
108570 }
108571@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
108572 }
108573 #endif
108574
108575-#ifdef CONFIG_SYSFS
108576+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108577 static int count_inuse(struct page *page)
108578 {
108579 return page->inuse;
108580@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
108581 len += sprintf(buf + len, "%7ld ", l->count);
108582
108583 if (l->addr)
108584+#ifdef CONFIG_GRKERNSEC_HIDESYM
108585+ len += sprintf(buf + len, "%pS", NULL);
108586+#else
108587 len += sprintf(buf + len, "%pS", (void *)l->addr);
108588+#endif
108589 else
108590 len += sprintf(buf + len, "<not-available>");
108591
108592@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
108593 validate_slab_cache(kmalloc_caches[9]);
108594 }
108595 #else
108596-#ifdef CONFIG_SYSFS
108597+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108598 static void resiliency_test(void) {};
108599 #endif
108600 #endif
108601
108602-#ifdef CONFIG_SYSFS
108603+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108604 enum slab_stat_type {
108605 SL_ALL, /* All slabs */
108606 SL_PARTIAL, /* Only partially allocated slabs */
108607@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
108608 {
108609 if (!s->ctor)
108610 return 0;
108611+#ifdef CONFIG_GRKERNSEC_HIDESYM
108612+ return sprintf(buf, "%pS\n", NULL);
108613+#else
108614 return sprintf(buf, "%pS\n", s->ctor);
108615+#endif
108616 }
108617 SLAB_ATTR_RO(ctor);
108618
108619 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
108620 {
108621- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
108622+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
108623 }
108624 SLAB_ATTR_RO(aliases);
108625
108626@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
108627 SLAB_ATTR_RO(cache_dma);
108628 #endif
108629
108630+#ifdef CONFIG_PAX_USERCOPY_SLABS
108631+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
108632+{
108633+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
108634+}
108635+SLAB_ATTR_RO(usercopy);
108636+#endif
108637+
108638+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108639+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
108640+{
108641+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
108642+}
108643+SLAB_ATTR_RO(sanitize);
108644+#endif
108645+
108646 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
108647 {
108648 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
108649@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
108650 * as well as cause other issues like converting a mergeable
108651 * cache into an umergeable one.
108652 */
108653- if (s->refcount > 1)
108654+ if (atomic_read(&s->refcount) > 1)
108655 return -EINVAL;
108656
108657 s->flags &= ~SLAB_TRACE;
108658@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
108659 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
108660 size_t length)
108661 {
108662- if (s->refcount > 1)
108663+ if (atomic_read(&s->refcount) > 1)
108664 return -EINVAL;
108665
108666 s->flags &= ~SLAB_FAILSLAB;
108667@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
108668 #ifdef CONFIG_ZONE_DMA
108669 &cache_dma_attr.attr,
108670 #endif
108671+#ifdef CONFIG_PAX_USERCOPY_SLABS
108672+ &usercopy_attr.attr,
108673+#endif
108674+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108675+ &sanitize_attr.attr,
108676+#endif
108677 #ifdef CONFIG_NUMA
108678 &remote_node_defrag_ratio_attr.attr,
108679 #endif
108680@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
108681 return name;
108682 }
108683
108684+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108685 static int sysfs_slab_add(struct kmem_cache *s)
108686 {
108687 int err;
108688@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
108689 kobject_del(&s->kobj);
108690 kobject_put(&s->kobj);
108691 }
108692+#endif
108693
108694 /*
108695 * Need to buffer aliases during bootup until sysfs becomes
108696@@ -5243,6 +5340,7 @@ struct saved_alias {
108697
108698 static struct saved_alias *alias_list;
108699
108700+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108701 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108702 {
108703 struct saved_alias *al;
108704@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108705 alias_list = al;
108706 return 0;
108707 }
108708+#endif
108709
108710 static int __init slab_sysfs_init(void)
108711 {
108712diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
108713index 4cba9c2..b4f9fcc 100644
108714--- a/mm/sparse-vmemmap.c
108715+++ b/mm/sparse-vmemmap.c
108716@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
108717 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108718 if (!p)
108719 return NULL;
108720- pud_populate(&init_mm, pud, p);
108721+ pud_populate_kernel(&init_mm, pud, p);
108722 }
108723 return pud;
108724 }
108725@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
108726 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108727 if (!p)
108728 return NULL;
108729- pgd_populate(&init_mm, pgd, p);
108730+ pgd_populate_kernel(&init_mm, pgd, p);
108731 }
108732 return pgd;
108733 }
108734diff --git a/mm/sparse.c b/mm/sparse.c
108735index d1b48b6..6e8590e 100644
108736--- a/mm/sparse.c
108737+++ b/mm/sparse.c
108738@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
108739
108740 for (i = 0; i < PAGES_PER_SECTION; i++) {
108741 if (PageHWPoison(&memmap[i])) {
108742- atomic_long_sub(1, &num_poisoned_pages);
108743+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
108744 ClearPageHWPoison(&memmap[i]);
108745 }
108746 }
108747diff --git a/mm/swap.c b/mm/swap.c
108748index cd3a5e6..40c0c8f 100644
108749--- a/mm/swap.c
108750+++ b/mm/swap.c
108751@@ -31,6 +31,7 @@
108752 #include <linux/memcontrol.h>
108753 #include <linux/gfp.h>
108754 #include <linux/uio.h>
108755+#include <linux/hugetlb.h>
108756
108757 #include "internal.h"
108758
108759@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
108760
108761 __page_cache_release(page);
108762 dtor = get_compound_page_dtor(page);
108763+ if (!PageHuge(page))
108764+ BUG_ON(dtor != free_compound_page);
108765 (*dtor)(page);
108766 }
108767
108768diff --git a/mm/swapfile.c b/mm/swapfile.c
108769index 63f55cc..31874e6 100644
108770--- a/mm/swapfile.c
108771+++ b/mm/swapfile.c
108772@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
108773
108774 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
108775 /* Activity counter to indicate that a swapon or swapoff has occurred */
108776-static atomic_t proc_poll_event = ATOMIC_INIT(0);
108777+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
108778
108779 static inline unsigned char swap_count(unsigned char ent)
108780 {
108781@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
108782 spin_unlock(&swap_lock);
108783
108784 err = 0;
108785- atomic_inc(&proc_poll_event);
108786+ atomic_inc_unchecked(&proc_poll_event);
108787 wake_up_interruptible(&proc_poll_wait);
108788
108789 out_dput:
108790@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
108791
108792 poll_wait(file, &proc_poll_wait, wait);
108793
108794- if (seq->poll_event != atomic_read(&proc_poll_event)) {
108795- seq->poll_event = atomic_read(&proc_poll_event);
108796+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
108797+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
108798 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
108799 }
108800
108801@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
108802 return ret;
108803
108804 seq = file->private_data;
108805- seq->poll_event = atomic_read(&proc_poll_event);
108806+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
108807 return 0;
108808 }
108809
108810@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
108811 (frontswap_map) ? "FS" : "");
108812
108813 mutex_unlock(&swapon_mutex);
108814- atomic_inc(&proc_poll_event);
108815+ atomic_inc_unchecked(&proc_poll_event);
108816 wake_up_interruptible(&proc_poll_wait);
108817
108818 if (S_ISREG(inode->i_mode))
108819diff --git a/mm/util.c b/mm/util.c
108820index 3981ae9..28b585b 100644
108821--- a/mm/util.c
108822+++ b/mm/util.c
108823@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
108824 void arch_pick_mmap_layout(struct mm_struct *mm)
108825 {
108826 mm->mmap_base = TASK_UNMAPPED_BASE;
108827+
108828+#ifdef CONFIG_PAX_RANDMMAP
108829+ if (mm->pax_flags & MF_PAX_RANDMMAP)
108830+ mm->mmap_base += mm->delta_mmap;
108831+#endif
108832+
108833 mm->get_unmapped_area = arch_get_unmapped_area;
108834 }
108835 #endif
108836@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
108837 if (!mm->arg_end)
108838 goto out_mm; /* Shh! No looking before we're done */
108839
108840+ if (gr_acl_handle_procpidmem(task))
108841+ goto out_mm;
108842+
108843 len = mm->arg_end - mm->arg_start;
108844
108845 if (len > buflen)
108846diff --git a/mm/vmalloc.c b/mm/vmalloc.c
108847index 49abccf..7bd1931 100644
108848--- a/mm/vmalloc.c
108849+++ b/mm/vmalloc.c
108850@@ -39,20 +39,65 @@ struct vfree_deferred {
108851 struct work_struct wq;
108852 };
108853 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
108854+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
108855+
108856+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
108857+struct stack_deferred_llist {
108858+ struct llist_head list;
108859+ void *stack;
108860+ void *lowmem_stack;
108861+};
108862+
108863+struct stack_deferred {
108864+ struct stack_deferred_llist list;
108865+ struct work_struct wq;
108866+};
108867+
108868+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
108869+#endif
108870
108871 static void __vunmap(const void *, int);
108872
108873-static void free_work(struct work_struct *w)
108874+static void vfree_work(struct work_struct *w)
108875 {
108876 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
108877 struct llist_node *llnode = llist_del_all(&p->list);
108878 while (llnode) {
108879- void *p = llnode;
108880+ void *x = llnode;
108881 llnode = llist_next(llnode);
108882- __vunmap(p, 1);
108883+ __vunmap(x, 1);
108884 }
108885 }
108886
108887+static void vunmap_work(struct work_struct *w)
108888+{
108889+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
108890+ struct llist_node *llnode = llist_del_all(&p->list);
108891+ while (llnode) {
108892+ void *x = llnode;
108893+ llnode = llist_next(llnode);
108894+ __vunmap(x, 0);
108895+ }
108896+}
108897+
108898+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
108899+static void unmap_work(struct work_struct *w)
108900+{
108901+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
108902+ struct llist_node *llnode = llist_del_all(&p->list.list);
108903+ while (llnode) {
108904+ struct stack_deferred_llist *x =
108905+ llist_entry((struct llist_head *)llnode,
108906+ struct stack_deferred_llist, list);
108907+ void *stack = ACCESS_ONCE(x->stack);
108908+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
108909+ llnode = llist_next(llnode);
108910+ __vunmap(stack, 0);
108911+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
108912+ }
108913+}
108914+#endif
108915+
108916 /*** Page table manipulation functions ***/
108917
108918 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
108919@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
108920
108921 pte = pte_offset_kernel(pmd, addr);
108922 do {
108923- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
108924- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
108925+
108926+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
108927+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
108928+ BUG_ON(!pte_exec(*pte));
108929+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
108930+ continue;
108931+ }
108932+#endif
108933+
108934+ {
108935+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
108936+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
108937+ }
108938 } while (pte++, addr += PAGE_SIZE, addr != end);
108939 }
108940
108941@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
108942 pte = pte_alloc_kernel(pmd, addr);
108943 if (!pte)
108944 return -ENOMEM;
108945+
108946+ pax_open_kernel();
108947 do {
108948 struct page *page = pages[*nr];
108949
108950- if (WARN_ON(!pte_none(*pte)))
108951+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
108952+ if (pgprot_val(prot) & _PAGE_NX)
108953+#endif
108954+
108955+ if (!pte_none(*pte)) {
108956+ pax_close_kernel();
108957+ WARN_ON(1);
108958 return -EBUSY;
108959- if (WARN_ON(!page))
108960+ }
108961+ if (!page) {
108962+ pax_close_kernel();
108963+ WARN_ON(1);
108964 return -ENOMEM;
108965+ }
108966 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
108967 (*nr)++;
108968 } while (pte++, addr += PAGE_SIZE, addr != end);
108969+ pax_close_kernel();
108970 return 0;
108971 }
108972
108973@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
108974 pmd_t *pmd;
108975 unsigned long next;
108976
108977- pmd = pmd_alloc(&init_mm, pud, addr);
108978+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
108979 if (!pmd)
108980 return -ENOMEM;
108981 do {
108982@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
108983 pud_t *pud;
108984 unsigned long next;
108985
108986- pud = pud_alloc(&init_mm, pgd, addr);
108987+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
108988 if (!pud)
108989 return -ENOMEM;
108990 do {
108991@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
108992 if (addr >= MODULES_VADDR && addr < MODULES_END)
108993 return 1;
108994 #endif
108995+
108996+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
108997+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
108998+ return 1;
108999+#endif
109000+
109001 return is_vmalloc_addr(x);
109002 }
109003
109004@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
109005
109006 if (!pgd_none(*pgd)) {
109007 pud_t *pud = pud_offset(pgd, addr);
109008+#ifdef CONFIG_X86
109009+ if (!pud_large(*pud))
109010+#endif
109011 if (!pud_none(*pud)) {
109012 pmd_t *pmd = pmd_offset(pud, addr);
109013+#ifdef CONFIG_X86
109014+ if (!pmd_large(*pmd))
109015+#endif
109016 if (!pmd_none(*pmd)) {
109017 pte_t *ptep, pte;
109018
109019@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
109020 * Allocate a region of KVA of the specified size and alignment, within the
109021 * vstart and vend.
109022 */
109023-static struct vmap_area *alloc_vmap_area(unsigned long size,
109024+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
109025 unsigned long align,
109026 unsigned long vstart, unsigned long vend,
109027 int node, gfp_t gfp_mask)
109028@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
109029 for_each_possible_cpu(i) {
109030 struct vmap_block_queue *vbq;
109031 struct vfree_deferred *p;
109032+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109033+ struct stack_deferred *p2;
109034+#endif
109035
109036 vbq = &per_cpu(vmap_block_queue, i);
109037 spin_lock_init(&vbq->lock);
109038 INIT_LIST_HEAD(&vbq->free);
109039+
109040 p = &per_cpu(vfree_deferred, i);
109041 init_llist_head(&p->list);
109042- INIT_WORK(&p->wq, free_work);
109043+ INIT_WORK(&p->wq, vfree_work);
109044+
109045+ p = &per_cpu(vunmap_deferred, i);
109046+ init_llist_head(&p->list);
109047+ INIT_WORK(&p->wq, vunmap_work);
109048+
109049+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109050+ p2 = &per_cpu(stack_deferred, i);
109051+ init_llist_head(&p2->list.list);
109052+ INIT_WORK(&p2->wq, unmap_work);
109053+#endif
109054 }
109055
109056 /* Import existing vmlist entries. */
109057@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
109058 struct vm_struct *area;
109059
109060 BUG_ON(in_interrupt());
109061+
109062+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109063+ if (flags & VM_KERNEXEC) {
109064+ if (start != VMALLOC_START || end != VMALLOC_END)
109065+ return NULL;
109066+ start = (unsigned long)MODULES_EXEC_VADDR;
109067+ end = (unsigned long)MODULES_EXEC_END;
109068+ }
109069+#endif
109070+
109071 if (flags & VM_IOREMAP)
109072 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
109073
109074@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
109075 */
109076 void vunmap(const void *addr)
109077 {
109078- BUG_ON(in_interrupt());
109079- might_sleep();
109080- if (addr)
109081+ if (!addr)
109082+ return;
109083+ if (unlikely(in_interrupt())) {
109084+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
109085+ if (llist_add((struct llist_node *)addr, &p->list))
109086+ schedule_work(&p->wq);
109087+ } else {
109088+ might_sleep();
109089 __vunmap(addr, 0);
109090+ }
109091 }
109092 EXPORT_SYMBOL(vunmap);
109093
109094+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109095+void unmap_process_stacks(struct task_struct *task)
109096+{
109097+ if (unlikely(in_interrupt())) {
109098+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
109099+ struct stack_deferred_llist *list = task->stack;
109100+ list->stack = task->stack;
109101+ list->lowmem_stack = task->lowmem_stack;
109102+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
109103+ schedule_work(&p->wq);
109104+ } else {
109105+ __vunmap(task->stack, 0);
109106+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
109107+ }
109108+}
109109+#endif
109110+
109111 /**
109112 * vmap - map an array of pages into virtually contiguous space
109113 * @pages: array of page pointers
109114@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
109115 if (count > totalram_pages)
109116 return NULL;
109117
109118+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109119+ if (!(pgprot_val(prot) & _PAGE_NX))
109120+ flags |= VM_KERNEXEC;
109121+#endif
109122+
109123 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
109124 __builtin_return_address(0));
109125 if (!area)
109126@@ -1641,6 +1774,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
109127 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
109128 goto fail;
109129
109130+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109131+ if (!(pgprot_val(prot) & _PAGE_NX)) {
109132+ vm_flags |= VM_KERNEXEC;
109133+ start = VMALLOC_START;
109134+ end = VMALLOC_END;
109135+ }
109136+#endif
109137+
109138 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
109139 vm_flags, start, end, node, gfp_mask, caller);
109140 if (!area)
109141@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
109142 * For tight control over page level allocator and protection flags
109143 * use __vmalloc() instead.
109144 */
109145-
109146 void *vmalloc_exec(unsigned long size)
109147 {
109148- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
109149+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
109150 NUMA_NO_NODE, __builtin_return_address(0));
109151 }
109152
109153@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
109154 {
109155 struct vm_struct *area;
109156
109157+ BUG_ON(vma->vm_mirror);
109158+
109159 size = PAGE_ALIGN(size);
109160
109161 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
109162@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
109163 v->addr, v->addr + v->size, v->size);
109164
109165 if (v->caller)
109166+#ifdef CONFIG_GRKERNSEC_HIDESYM
109167+ seq_printf(m, " %pK", v->caller);
109168+#else
109169 seq_printf(m, " %pS", v->caller);
109170+#endif
109171
109172 if (v->nr_pages)
109173 seq_printf(m, " pages=%d", v->nr_pages);
109174diff --git a/mm/vmstat.c b/mm/vmstat.c
109175index 4f5cd97..9fb715a 100644
109176--- a/mm/vmstat.c
109177+++ b/mm/vmstat.c
109178@@ -27,6 +27,7 @@
109179 #include <linux/mm_inline.h>
109180 #include <linux/page_ext.h>
109181 #include <linux/page_owner.h>
109182+#include <linux/grsecurity.h>
109183
109184 #include "internal.h"
109185
109186@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
109187 *
109188 * vm_stat contains the global counters
109189 */
109190-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109191+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109192 EXPORT_SYMBOL(vm_stat);
109193
109194 #ifdef CONFIG_SMP
109195@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
109196
109197 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109198 if (diff[i]) {
109199- atomic_long_add(diff[i], &vm_stat[i]);
109200+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
109201 changes++;
109202 }
109203 return changes;
109204@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
109205 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
109206 if (v) {
109207
109208- atomic_long_add(v, &zone->vm_stat[i]);
109209+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109210 global_diff[i] += v;
109211 #ifdef CONFIG_NUMA
109212 /* 3 seconds idle till flush */
109213@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
109214
109215 v = p->vm_stat_diff[i];
109216 p->vm_stat_diff[i] = 0;
109217- atomic_long_add(v, &zone->vm_stat[i]);
109218+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109219 global_diff[i] += v;
109220 }
109221 }
109222@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
109223 if (pset->vm_stat_diff[i]) {
109224 int v = pset->vm_stat_diff[i];
109225 pset->vm_stat_diff[i] = 0;
109226- atomic_long_add(v, &zone->vm_stat[i]);
109227- atomic_long_add(v, &vm_stat[i]);
109228+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109229+ atomic_long_add_unchecked(v, &vm_stat[i]);
109230 }
109231 }
109232 #endif
109233@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
109234 stat_items_size += sizeof(struct vm_event_state);
109235 #endif
109236
109237- v = kmalloc(stat_items_size, GFP_KERNEL);
109238+ v = kzalloc(stat_items_size, GFP_KERNEL);
109239 m->private = v;
109240 if (!v)
109241 return ERR_PTR(-ENOMEM);
109242+
109243+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109244+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
109245+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
109246+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
109247+ && !in_group_p(grsec_proc_gid)
109248+#endif
109249+ )
109250+ return (unsigned long *)m->private + *pos;
109251+#endif
109252+#endif
109253+
109254 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109255 v[i] = global_page_state(i);
109256 v += NR_VM_ZONE_STAT_ITEMS;
109257@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
109258 cpu_notifier_register_done();
109259 #endif
109260 #ifdef CONFIG_PROC_FS
109261- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
109262- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
109263- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109264- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
109265+ {
109266+ mode_t gr_mode = S_IRUGO;
109267+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109268+ gr_mode = S_IRUSR;
109269+#endif
109270+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
109271+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
109272+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109273+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
109274+ }
109275 #endif
109276 return 0;
109277 }
109278diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
109279index 64c6bed..b79a5de 100644
109280--- a/net/8021q/vlan.c
109281+++ b/net/8021q/vlan.c
109282@@ -481,7 +481,7 @@ out:
109283 return NOTIFY_DONE;
109284 }
109285
109286-static struct notifier_block vlan_notifier_block __read_mostly = {
109287+static struct notifier_block vlan_notifier_block = {
109288 .notifier_call = vlan_device_event,
109289 };
109290
109291@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
109292 err = -EPERM;
109293 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
109294 break;
109295- if ((args.u.name_type >= 0) &&
109296- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
109297+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
109298 struct vlan_net *vn;
109299
109300 vn = net_generic(net, vlan_net_id);
109301diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
109302index c92b52f..006c052 100644
109303--- a/net/8021q/vlan_netlink.c
109304+++ b/net/8021q/vlan_netlink.c
109305@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
109306 return dev_net(real_dev);
109307 }
109308
109309-struct rtnl_link_ops vlan_link_ops __read_mostly = {
109310+struct rtnl_link_ops vlan_link_ops = {
109311 .kind = "vlan",
109312 .maxtype = IFLA_VLAN_MAX,
109313 .policy = vlan_policy,
109314diff --git a/net/9p/client.c b/net/9p/client.c
109315index e86a9bea..e91f70e 100644
109316--- a/net/9p/client.c
109317+++ b/net/9p/client.c
109318@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
109319 len - inline_len);
109320 } else {
109321 err = copy_from_user(ename + inline_len,
109322- uidata, len - inline_len);
109323+ (char __force_user *)uidata, len - inline_len);
109324 if (err) {
109325 err = -EFAULT;
109326 goto out_err;
109327@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
109328 kernel_buf = 1;
109329 indata = data;
109330 } else
109331- indata = (__force char *)udata;
109332+ indata = (__force_kernel char *)udata;
109333 /*
109334 * response header len is 11
109335 * PDU Header(7) + IO Size (4)
109336@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
109337 kernel_buf = 1;
109338 odata = data;
109339 } else
109340- odata = (char *)udata;
109341+ odata = (char __force_kernel *)udata;
109342 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
109343 P9_ZC_HDR_SZ, kernel_buf, "dqd",
109344 fid->fid, offset, rsize);
109345diff --git a/net/9p/mod.c b/net/9p/mod.c
109346index 6ab36ae..6f1841b 100644
109347--- a/net/9p/mod.c
109348+++ b/net/9p/mod.c
109349@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
109350 void v9fs_register_trans(struct p9_trans_module *m)
109351 {
109352 spin_lock(&v9fs_trans_lock);
109353- list_add_tail(&m->list, &v9fs_trans_list);
109354+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
109355 spin_unlock(&v9fs_trans_lock);
109356 }
109357 EXPORT_SYMBOL(v9fs_register_trans);
109358@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
109359 void v9fs_unregister_trans(struct p9_trans_module *m)
109360 {
109361 spin_lock(&v9fs_trans_lock);
109362- list_del_init(&m->list);
109363+ pax_list_del_init((struct list_head *)&m->list);
109364 spin_unlock(&v9fs_trans_lock);
109365 }
109366 EXPORT_SYMBOL(v9fs_unregister_trans);
109367diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
109368index 80d08f6..de63fd1 100644
109369--- a/net/9p/trans_fd.c
109370+++ b/net/9p/trans_fd.c
109371@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
109372 oldfs = get_fs();
109373 set_fs(get_ds());
109374 /* The cast to a user pointer is valid due to the set_fs() */
109375- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
109376+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
109377 set_fs(oldfs);
109378
109379 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
109380diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
109381index af46bc4..f9adfcd 100644
109382--- a/net/appletalk/atalk_proc.c
109383+++ b/net/appletalk/atalk_proc.c
109384@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
109385 struct proc_dir_entry *p;
109386 int rc = -ENOMEM;
109387
109388- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
109389+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
109390 if (!atalk_proc_dir)
109391 goto out;
109392
109393diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
109394index 876fbe8..8bbea9f 100644
109395--- a/net/atm/atm_misc.c
109396+++ b/net/atm/atm_misc.c
109397@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
109398 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
109399 return 1;
109400 atm_return(vcc, truesize);
109401- atomic_inc(&vcc->stats->rx_drop);
109402+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109403 return 0;
109404 }
109405 EXPORT_SYMBOL(atm_charge);
109406@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
109407 }
109408 }
109409 atm_return(vcc, guess);
109410- atomic_inc(&vcc->stats->rx_drop);
109411+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109412 return NULL;
109413 }
109414 EXPORT_SYMBOL(atm_alloc_charge);
109415@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
109416
109417 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109418 {
109419-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109420+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109421 __SONET_ITEMS
109422 #undef __HANDLE_ITEM
109423 }
109424@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
109425
109426 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109427 {
109428-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109429+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
109430 __SONET_ITEMS
109431 #undef __HANDLE_ITEM
109432 }
109433diff --git a/net/atm/lec.c b/net/atm/lec.c
109434index 4b98f89..5a2f6cb 100644
109435--- a/net/atm/lec.c
109436+++ b/net/atm/lec.c
109437@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
109438 }
109439
109440 static struct lane2_ops lane2_ops = {
109441- lane2_resolve, /* resolve, spec 3.1.3 */
109442- lane2_associate_req, /* associate_req, spec 3.1.4 */
109443- NULL /* associate indicator, spec 3.1.5 */
109444+ .resolve = lane2_resolve,
109445+ .associate_req = lane2_associate_req,
109446+ .associate_indicator = NULL
109447 };
109448
109449 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
109450diff --git a/net/atm/lec.h b/net/atm/lec.h
109451index 4149db1..f2ab682 100644
109452--- a/net/atm/lec.h
109453+++ b/net/atm/lec.h
109454@@ -48,7 +48,7 @@ struct lane2_ops {
109455 const u8 *tlvs, u32 sizeoftlvs);
109456 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
109457 const u8 *tlvs, u32 sizeoftlvs);
109458-};
109459+} __no_const;
109460
109461 /*
109462 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
109463diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
109464index d1b2d9a..d549f7f 100644
109465--- a/net/atm/mpoa_caches.c
109466+++ b/net/atm/mpoa_caches.c
109467@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
109468
109469
109470 static struct in_cache_ops ingress_ops = {
109471- in_cache_add_entry, /* add_entry */
109472- in_cache_get, /* get */
109473- in_cache_get_with_mask, /* get_with_mask */
109474- in_cache_get_by_vcc, /* get_by_vcc */
109475- in_cache_put, /* put */
109476- in_cache_remove_entry, /* remove_entry */
109477- cache_hit, /* cache_hit */
109478- clear_count_and_expired, /* clear_count */
109479- check_resolving_entries, /* check_resolving */
109480- refresh_entries, /* refresh */
109481- in_destroy_cache /* destroy_cache */
109482+ .add_entry = in_cache_add_entry,
109483+ .get = in_cache_get,
109484+ .get_with_mask = in_cache_get_with_mask,
109485+ .get_by_vcc = in_cache_get_by_vcc,
109486+ .put = in_cache_put,
109487+ .remove_entry = in_cache_remove_entry,
109488+ .cache_hit = cache_hit,
109489+ .clear_count = clear_count_and_expired,
109490+ .check_resolving = check_resolving_entries,
109491+ .refresh = refresh_entries,
109492+ .destroy_cache = in_destroy_cache
109493 };
109494
109495 static struct eg_cache_ops egress_ops = {
109496- eg_cache_add_entry, /* add_entry */
109497- eg_cache_get_by_cache_id, /* get_by_cache_id */
109498- eg_cache_get_by_tag, /* get_by_tag */
109499- eg_cache_get_by_vcc, /* get_by_vcc */
109500- eg_cache_get_by_src_ip, /* get_by_src_ip */
109501- eg_cache_put, /* put */
109502- eg_cache_remove_entry, /* remove_entry */
109503- update_eg_cache_entry, /* update */
109504- clear_expired, /* clear_expired */
109505- eg_destroy_cache /* destroy_cache */
109506+ .add_entry = eg_cache_add_entry,
109507+ .get_by_cache_id = eg_cache_get_by_cache_id,
109508+ .get_by_tag = eg_cache_get_by_tag,
109509+ .get_by_vcc = eg_cache_get_by_vcc,
109510+ .get_by_src_ip = eg_cache_get_by_src_ip,
109511+ .put = eg_cache_put,
109512+ .remove_entry = eg_cache_remove_entry,
109513+ .update = update_eg_cache_entry,
109514+ .clear_expired = clear_expired,
109515+ .destroy_cache = eg_destroy_cache
109516 };
109517
109518
109519diff --git a/net/atm/proc.c b/net/atm/proc.c
109520index bbb6461..cf04016 100644
109521--- a/net/atm/proc.c
109522+++ b/net/atm/proc.c
109523@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
109524 const struct k_atm_aal_stats *stats)
109525 {
109526 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
109527- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
109528- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
109529- atomic_read(&stats->rx_drop));
109530+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
109531+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
109532+ atomic_read_unchecked(&stats->rx_drop));
109533 }
109534
109535 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
109536diff --git a/net/atm/resources.c b/net/atm/resources.c
109537index 0447d5d..3cf4728 100644
109538--- a/net/atm/resources.c
109539+++ b/net/atm/resources.c
109540@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
109541 static void copy_aal_stats(struct k_atm_aal_stats *from,
109542 struct atm_aal_stats *to)
109543 {
109544-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109545+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109546 __AAL_STAT_ITEMS
109547 #undef __HANDLE_ITEM
109548 }
109549@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
109550 static void subtract_aal_stats(struct k_atm_aal_stats *from,
109551 struct atm_aal_stats *to)
109552 {
109553-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109554+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
109555 __AAL_STAT_ITEMS
109556 #undef __HANDLE_ITEM
109557 }
109558diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
109559index 919a5ce..cc6b444 100644
109560--- a/net/ax25/sysctl_net_ax25.c
109561+++ b/net/ax25/sysctl_net_ax25.c
109562@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
109563 {
109564 char path[sizeof("net/ax25/") + IFNAMSIZ];
109565 int k;
109566- struct ctl_table *table;
109567+ ctl_table_no_const *table;
109568
109569 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
109570 if (!table)
109571diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
109572index 00e00e0..710fcd2 100644
109573--- a/net/batman-adv/bat_iv_ogm.c
109574+++ b/net/batman-adv/bat_iv_ogm.c
109575@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
109576
109577 /* randomize initial seqno to avoid collision */
109578 get_random_bytes(&random_seqno, sizeof(random_seqno));
109579- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109580+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109581
109582 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
109583 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
109584@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
109585 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
109586
109587 /* change sequence number to network order */
109588- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
109589+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
109590 batadv_ogm_packet->seqno = htonl(seqno);
109591- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
109592+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
109593
109594 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
109595
109596@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
109597 return;
109598
109599 /* could be changed by schedule_own_packet() */
109600- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
109601+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
109602
109603 if (ogm_packet->flags & BATADV_DIRECTLINK)
109604 has_directlink_flag = true;
109605diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
109606index 3d1dcaa..4699f4e 100644
109607--- a/net/batman-adv/fragmentation.c
109608+++ b/net/batman-adv/fragmentation.c
109609@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
109610 frag_header.packet_type = BATADV_UNICAST_FRAG;
109611 frag_header.version = BATADV_COMPAT_VERSION;
109612 frag_header.ttl = BATADV_TTL;
109613- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
109614+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
109615 frag_header.reserved = 0;
109616 frag_header.no = 0;
109617 frag_header.total_size = htons(skb->len);
109618diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
109619index 5ec31d7..e371631 100644
109620--- a/net/batman-adv/soft-interface.c
109621+++ b/net/batman-adv/soft-interface.c
109622@@ -295,7 +295,7 @@ send:
109623 primary_if->net_dev->dev_addr);
109624
109625 /* set broadcast sequence number */
109626- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
109627+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
109628 bcast_packet->seqno = htonl(seqno);
109629
109630 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
109631@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109632 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
109633
109634 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
109635- atomic_set(&bat_priv->bcast_seqno, 1);
109636+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
109637 atomic_set(&bat_priv->tt.vn, 0);
109638 atomic_set(&bat_priv->tt.local_changes, 0);
109639 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
109640@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109641
109642 /* randomize initial seqno to avoid collision */
109643 get_random_bytes(&random_seqno, sizeof(random_seqno));
109644- atomic_set(&bat_priv->frag_seqno, random_seqno);
109645+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
109646
109647 bat_priv->primary_if = NULL;
109648 bat_priv->num_ifaces = 0;
109649@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
109650 return 0;
109651 }
109652
109653-struct rtnl_link_ops batadv_link_ops __read_mostly = {
109654+struct rtnl_link_ops batadv_link_ops = {
109655 .kind = "batadv",
109656 .priv_size = sizeof(struct batadv_priv),
109657 .setup = batadv_softif_init_early,
109658diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
109659index 9398c3f..0e79657 100644
109660--- a/net/batman-adv/types.h
109661+++ b/net/batman-adv/types.h
109662@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
109663 struct batadv_hard_iface_bat_iv {
109664 unsigned char *ogm_buff;
109665 int ogm_buff_len;
109666- atomic_t ogm_seqno;
109667+ atomic_unchecked_t ogm_seqno;
109668 };
109669
109670 /**
109671@@ -766,7 +766,7 @@ struct batadv_priv {
109672 atomic_t bonding;
109673 atomic_t fragmentation;
109674 atomic_t packet_size_max;
109675- atomic_t frag_seqno;
109676+ atomic_unchecked_t frag_seqno;
109677 #ifdef CONFIG_BATMAN_ADV_BLA
109678 atomic_t bridge_loop_avoidance;
109679 #endif
109680@@ -785,7 +785,7 @@ struct batadv_priv {
109681 #endif
109682 uint32_t isolation_mark;
109683 uint32_t isolation_mark_mask;
109684- atomic_t bcast_seqno;
109685+ atomic_unchecked_t bcast_seqno;
109686 atomic_t bcast_queue_left;
109687 atomic_t batman_queue_left;
109688 char num_ifaces;
109689diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
109690index 1d65c5b..43e55fd 100644
109691--- a/net/bluetooth/hci_sock.c
109692+++ b/net/bluetooth/hci_sock.c
109693@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
109694 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
109695 }
109696
109697- len = min_t(unsigned int, len, sizeof(uf));
109698+ len = min((size_t)len, sizeof(uf));
109699 if (copy_from_user(&uf, optval, len)) {
109700 err = -EFAULT;
109701 break;
109702diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
109703index 6ba33f9..4afc26f 100644
109704--- a/net/bluetooth/l2cap_core.c
109705+++ b/net/bluetooth/l2cap_core.c
109706@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
109707 break;
109708
109709 case L2CAP_CONF_RFC:
109710- if (olen == sizeof(rfc))
109711- memcpy(&rfc, (void *)val, olen);
109712+ if (olen != sizeof(rfc))
109713+ break;
109714+
109715+ memcpy(&rfc, (void *)val, olen);
109716
109717 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
109718 rfc.mode != chan->mode)
109719diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
109720index 60694f0..32623ed 100644
109721--- a/net/bluetooth/l2cap_sock.c
109722+++ b/net/bluetooth/l2cap_sock.c
109723@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109724 struct sock *sk = sock->sk;
109725 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
109726 struct l2cap_options opts;
109727- int len, err = 0;
109728+ int err = 0;
109729+ size_t len = optlen;
109730 u32 opt;
109731
109732 BT_DBG("sk %p", sk);
109733@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109734 opts.max_tx = chan->max_tx;
109735 opts.txwin_size = chan->tx_win;
109736
109737- len = min_t(unsigned int, sizeof(opts), optlen);
109738+ len = min(sizeof(opts), len);
109739 if (copy_from_user((char *) &opts, optval, len)) {
109740 err = -EFAULT;
109741 break;
109742@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109743 struct bt_security sec;
109744 struct bt_power pwr;
109745 struct l2cap_conn *conn;
109746- int len, err = 0;
109747+ int err = 0;
109748+ size_t len = optlen;
109749 u32 opt;
109750
109751 BT_DBG("sk %p", sk);
109752@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109753
109754 sec.level = BT_SECURITY_LOW;
109755
109756- len = min_t(unsigned int, sizeof(sec), optlen);
109757+ len = min(sizeof(sec), len);
109758 if (copy_from_user((char *) &sec, optval, len)) {
109759 err = -EFAULT;
109760 break;
109761@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109762
109763 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
109764
109765- len = min_t(unsigned int, sizeof(pwr), optlen);
109766+ len = min(sizeof(pwr), len);
109767 if (copy_from_user((char *) &pwr, optval, len)) {
109768 err = -EFAULT;
109769 break;
109770diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
109771index 3c6d2c8..6afc970 100644
109772--- a/net/bluetooth/rfcomm/sock.c
109773+++ b/net/bluetooth/rfcomm/sock.c
109774@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
109775 struct sock *sk = sock->sk;
109776 struct bt_security sec;
109777 int err = 0;
109778- size_t len;
109779+ size_t len = optlen;
109780 u32 opt;
109781
109782 BT_DBG("sk %p", sk);
109783@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
109784
109785 sec.level = BT_SECURITY_LOW;
109786
109787- len = min_t(unsigned int, sizeof(sec), optlen);
109788+ len = min(sizeof(sec), len);
109789 if (copy_from_user((char *) &sec, optval, len)) {
109790 err = -EFAULT;
109791 break;
109792diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
109793index 8e385a0..a5bdd8e 100644
109794--- a/net/bluetooth/rfcomm/tty.c
109795+++ b/net/bluetooth/rfcomm/tty.c
109796@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
109797 BT_DBG("tty %p id %d", tty, tty->index);
109798
109799 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
109800- dev->channel, dev->port.count);
109801+ dev->channel, atomic_read(&dev->port.count));
109802
109803 err = tty_port_open(&dev->port, tty, filp);
109804 if (err)
109805@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
109806 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
109807
109808 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
109809- dev->port.count);
109810+ atomic_read(&dev->port.count));
109811
109812 tty_port_close(&dev->port, tty, filp);
109813 }
109814diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
109815index 4fbcea0..69a6786 100644
109816--- a/net/bridge/br_netlink.c
109817+++ b/net/bridge/br_netlink.c
109818@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
109819 .get_link_af_size = br_get_link_af_size,
109820 };
109821
109822-struct rtnl_link_ops br_link_ops __read_mostly = {
109823+struct rtnl_link_ops br_link_ops = {
109824 .kind = "bridge",
109825 .priv_size = sizeof(struct net_bridge),
109826 .setup = br_dev_setup,
109827diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
109828index 91180a7..1301daa 100644
109829--- a/net/bridge/netfilter/ebtables.c
109830+++ b/net/bridge/netfilter/ebtables.c
109831@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
109832 tmp.valid_hooks = t->table->valid_hooks;
109833 }
109834 mutex_unlock(&ebt_mutex);
109835- if (copy_to_user(user, &tmp, *len) != 0) {
109836+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109837 BUGPRINT("c2u Didn't work\n");
109838 ret = -EFAULT;
109839 break;
109840@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
109841 goto out;
109842 tmp.valid_hooks = t->valid_hooks;
109843
109844- if (copy_to_user(user, &tmp, *len) != 0) {
109845+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109846 ret = -EFAULT;
109847 break;
109848 }
109849@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
109850 tmp.entries_size = t->table->entries_size;
109851 tmp.valid_hooks = t->table->valid_hooks;
109852
109853- if (copy_to_user(user, &tmp, *len) != 0) {
109854+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109855 ret = -EFAULT;
109856 break;
109857 }
109858diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
109859index f5afda1..dcf770a 100644
109860--- a/net/caif/cfctrl.c
109861+++ b/net/caif/cfctrl.c
109862@@ -10,6 +10,7 @@
109863 #include <linux/spinlock.h>
109864 #include <linux/slab.h>
109865 #include <linux/pkt_sched.h>
109866+#include <linux/sched.h>
109867 #include <net/caif/caif_layer.h>
109868 #include <net/caif/cfpkt.h>
109869 #include <net/caif/cfctrl.h>
109870@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
109871 memset(&dev_info, 0, sizeof(dev_info));
109872 dev_info.id = 0xff;
109873 cfsrvl_init(&this->serv, 0, &dev_info, false);
109874- atomic_set(&this->req_seq_no, 1);
109875- atomic_set(&this->rsp_seq_no, 1);
109876+ atomic_set_unchecked(&this->req_seq_no, 1);
109877+ atomic_set_unchecked(&this->rsp_seq_no, 1);
109878 this->serv.layer.receive = cfctrl_recv;
109879 sprintf(this->serv.layer.name, "ctrl");
109880 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
109881@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
109882 struct cfctrl_request_info *req)
109883 {
109884 spin_lock_bh(&ctrl->info_list_lock);
109885- atomic_inc(&ctrl->req_seq_no);
109886- req->sequence_no = atomic_read(&ctrl->req_seq_no);
109887+ atomic_inc_unchecked(&ctrl->req_seq_no);
109888+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
109889 list_add_tail(&req->list, &ctrl->list);
109890 spin_unlock_bh(&ctrl->info_list_lock);
109891 }
109892@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
109893 if (p != first)
109894 pr_warn("Requests are not received in order\n");
109895
109896- atomic_set(&ctrl->rsp_seq_no,
109897+ atomic_set_unchecked(&ctrl->rsp_seq_no,
109898 p->sequence_no);
109899 list_del(&p->list);
109900 goto out;
109901diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
109902index 67a4a36..8d28068 100644
109903--- a/net/caif/chnl_net.c
109904+++ b/net/caif/chnl_net.c
109905@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
109906 };
109907
109908
109909-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
109910+static struct rtnl_link_ops ipcaif_link_ops = {
109911 .kind = "caif",
109912 .priv_size = sizeof(struct chnl_net),
109913 .setup = ipcaif_net_setup,
109914diff --git a/net/can/af_can.c b/net/can/af_can.c
109915index 32d710e..93bcf05 100644
109916--- a/net/can/af_can.c
109917+++ b/net/can/af_can.c
109918@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
109919 };
109920
109921 /* notifier block for netdevice event */
109922-static struct notifier_block can_netdev_notifier __read_mostly = {
109923+static struct notifier_block can_netdev_notifier = {
109924 .notifier_call = can_notifier,
109925 };
109926
109927diff --git a/net/can/bcm.c b/net/can/bcm.c
109928index ee9ffd9..dfdf3d4 100644
109929--- a/net/can/bcm.c
109930+++ b/net/can/bcm.c
109931@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
109932 }
109933
109934 /* create /proc/net/can-bcm directory */
109935- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
109936+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
109937 return 0;
109938 }
109939
109940diff --git a/net/can/gw.c b/net/can/gw.c
109941index a6f448e..5902171 100644
109942--- a/net/can/gw.c
109943+++ b/net/can/gw.c
109944@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
109945 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
109946
109947 static HLIST_HEAD(cgw_list);
109948-static struct notifier_block notifier;
109949
109950 static struct kmem_cache *cgw_cache __read_mostly;
109951
109952@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
109953 return err;
109954 }
109955
109956+static struct notifier_block notifier = {
109957+ .notifier_call = cgw_notifier
109958+};
109959+
109960 static __init int cgw_module_init(void)
109961 {
109962 /* sanitize given module parameter */
109963@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
109964 return -ENOMEM;
109965
109966 /* set notifier */
109967- notifier.notifier_call = cgw_notifier;
109968 register_netdevice_notifier(&notifier);
109969
109970 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
109971diff --git a/net/can/proc.c b/net/can/proc.c
109972index 1a19b98..df2b4ec 100644
109973--- a/net/can/proc.c
109974+++ b/net/can/proc.c
109975@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
109976 void can_init_proc(void)
109977 {
109978 /* create /proc/net/can directory */
109979- can_dir = proc_mkdir("can", init_net.proc_net);
109980+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
109981
109982 if (!can_dir) {
109983 printk(KERN_INFO "can: failed to create /proc/net/can . "
109984diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
109985index a9f4ae4..ee19b92 100644
109986--- a/net/ceph/messenger.c
109987+++ b/net/ceph/messenger.c
109988@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
109989 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
109990
109991 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
109992-static atomic_t addr_str_seq = ATOMIC_INIT(0);
109993+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
109994
109995 static struct page *zero_page; /* used in certain error cases */
109996
109997@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
109998 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
109999 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
110000
110001- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110002+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110003 s = addr_str[i];
110004
110005 switch (ss->ss_family) {
110006diff --git a/net/compat.c b/net/compat.c
110007index f7bd286..76ea56a 100644
110008--- a/net/compat.c
110009+++ b/net/compat.c
110010@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
110011
110012 #define CMSG_COMPAT_FIRSTHDR(msg) \
110013 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
110014- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
110015+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
110016 (struct compat_cmsghdr __user *)NULL)
110017
110018 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
110019 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
110020 (ucmlen) <= (unsigned long) \
110021 ((mhdr)->msg_controllen - \
110022- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
110023+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
110024
110025 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
110026 struct compat_cmsghdr __user *cmsg, int cmsg_len)
110027 {
110028 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
110029- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
110030+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
110031 msg->msg_controllen)
110032 return NULL;
110033 return (struct compat_cmsghdr __user *)ptr;
110034@@ -203,7 +203,7 @@ Efault:
110035
110036 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
110037 {
110038- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110039+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110040 struct compat_cmsghdr cmhdr;
110041 struct compat_timeval ctv;
110042 struct compat_timespec cts[3];
110043@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
110044
110045 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
110046 {
110047- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110048+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110049 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
110050 int fdnum = scm->fp->count;
110051 struct file **fp = scm->fp->fp;
110052@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
110053 return -EFAULT;
110054 old_fs = get_fs();
110055 set_fs(KERNEL_DS);
110056- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
110057+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
110058 set_fs(old_fs);
110059
110060 return err;
110061@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
110062 len = sizeof(ktime);
110063 old_fs = get_fs();
110064 set_fs(KERNEL_DS);
110065- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
110066+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
110067 set_fs(old_fs);
110068
110069 if (!err) {
110070@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110071 case MCAST_JOIN_GROUP:
110072 case MCAST_LEAVE_GROUP:
110073 {
110074- struct compat_group_req __user *gr32 = (void *)optval;
110075+ struct compat_group_req __user *gr32 = (void __user *)optval;
110076 struct group_req __user *kgr =
110077 compat_alloc_user_space(sizeof(struct group_req));
110078 u32 interface;
110079@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110080 case MCAST_BLOCK_SOURCE:
110081 case MCAST_UNBLOCK_SOURCE:
110082 {
110083- struct compat_group_source_req __user *gsr32 = (void *)optval;
110084+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
110085 struct group_source_req __user *kgsr = compat_alloc_user_space(
110086 sizeof(struct group_source_req));
110087 u32 interface;
110088@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110089 }
110090 case MCAST_MSFILTER:
110091 {
110092- struct compat_group_filter __user *gf32 = (void *)optval;
110093+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110094 struct group_filter __user *kgf;
110095 u32 interface, fmode, numsrc;
110096
110097@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
110098 char __user *optval, int __user *optlen,
110099 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
110100 {
110101- struct compat_group_filter __user *gf32 = (void *)optval;
110102+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110103 struct group_filter __user *kgf;
110104 int __user *koptlen;
110105 u32 interface, fmode, numsrc;
110106@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
110107
110108 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
110109 return -EINVAL;
110110- if (copy_from_user(a, args, nas[call]))
110111+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
110112 return -EFAULT;
110113 a0 = a[0];
110114 a1 = a[1];
110115diff --git a/net/core/datagram.c b/net/core/datagram.c
110116index df493d6..1145766 100644
110117--- a/net/core/datagram.c
110118+++ b/net/core/datagram.c
110119@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
110120 }
110121
110122 kfree_skb(skb);
110123- atomic_inc(&sk->sk_drops);
110124+ atomic_inc_unchecked(&sk->sk_drops);
110125 sk_mem_reclaim_partial(sk);
110126
110127 return err;
110128diff --git a/net/core/dev.c b/net/core/dev.c
110129index 22a53ac..1d19af7 100644
110130--- a/net/core/dev.c
110131+++ b/net/core/dev.c
110132@@ -1681,14 +1681,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
110133 {
110134 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
110135 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
110136- atomic_long_inc(&dev->rx_dropped);
110137+ atomic_long_inc_unchecked(&dev->rx_dropped);
110138 kfree_skb(skb);
110139 return NET_RX_DROP;
110140 }
110141 }
110142
110143 if (unlikely(!is_skb_forwardable(dev, skb))) {
110144- atomic_long_inc(&dev->rx_dropped);
110145+ atomic_long_inc_unchecked(&dev->rx_dropped);
110146 kfree_skb(skb);
110147 return NET_RX_DROP;
110148 }
110149@@ -2987,7 +2987,7 @@ recursion_alert:
110150 drop:
110151 rcu_read_unlock_bh();
110152
110153- atomic_long_inc(&dev->tx_dropped);
110154+ atomic_long_inc_unchecked(&dev->tx_dropped);
110155 kfree_skb_list(skb);
110156 return rc;
110157 out:
110158@@ -3336,7 +3336,7 @@ enqueue:
110159
110160 local_irq_restore(flags);
110161
110162- atomic_long_inc(&skb->dev->rx_dropped);
110163+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110164 kfree_skb(skb);
110165 return NET_RX_DROP;
110166 }
110167@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
110168 }
110169 EXPORT_SYMBOL(netif_rx_ni);
110170
110171-static void net_tx_action(struct softirq_action *h)
110172+static __latent_entropy void net_tx_action(void)
110173 {
110174 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110175
110176@@ -3751,7 +3751,7 @@ ncls:
110177 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
110178 } else {
110179 drop:
110180- atomic_long_inc(&skb->dev->rx_dropped);
110181+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110182 kfree_skb(skb);
110183 /* Jamal, now you will not able to escape explaining
110184 * me how you were going to use this. :-)
110185@@ -4640,7 +4640,7 @@ out_unlock:
110186 return work;
110187 }
110188
110189-static void net_rx_action(struct softirq_action *h)
110190+static __latent_entropy void net_rx_action(void)
110191 {
110192 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110193 unsigned long time_limit = jiffies + 2;
110194@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
110195 } else {
110196 netdev_stats_to_stats64(storage, &dev->stats);
110197 }
110198- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
110199- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
110200+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
110201+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
110202 return storage;
110203 }
110204 EXPORT_SYMBOL(dev_get_stats);
110205diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
110206index b94b1d2..da3ed7c 100644
110207--- a/net/core/dev_ioctl.c
110208+++ b/net/core/dev_ioctl.c
110209@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
110210 no_module = !dev;
110211 if (no_module && capable(CAP_NET_ADMIN))
110212 no_module = request_module("netdev-%s", name);
110213- if (no_module && capable(CAP_SYS_MODULE))
110214+ if (no_module && capable(CAP_SYS_MODULE)) {
110215+#ifdef CONFIG_GRKERNSEC_MODHARDEN
110216+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
110217+#else
110218 request_module("%s", name);
110219+#endif
110220+ }
110221 }
110222 EXPORT_SYMBOL(dev_load);
110223
110224diff --git a/net/core/filter.c b/net/core/filter.c
110225index f6bdc2b..76eba8e 100644
110226--- a/net/core/filter.c
110227+++ b/net/core/filter.c
110228@@ -533,7 +533,11 @@ do_pass:
110229
110230 /* Unknown instruction. */
110231 default:
110232- goto err;
110233+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
110234+ fp->code, fp->jt, fp->jf, fp->k);
110235+ kfree(addrs);
110236+ BUG();
110237+ return -EINVAL;
110238 }
110239
110240 insn++;
110241@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
110242 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
110243 int pc, ret = 0;
110244
110245- BUILD_BUG_ON(BPF_MEMWORDS > 16);
110246+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
110247
110248 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
110249 if (!masks)
110250@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
110251 if (!fp)
110252 return -ENOMEM;
110253
110254- memcpy(fp->insns, fprog->filter, fsize);
110255+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
110256
110257 fp->len = fprog->len;
110258 /* Since unattached filters are not copied back to user
110259diff --git a/net/core/flow.c b/net/core/flow.c
110260index 1033725..340f65d 100644
110261--- a/net/core/flow.c
110262+++ b/net/core/flow.c
110263@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
110264 static int flow_entry_valid(struct flow_cache_entry *fle,
110265 struct netns_xfrm *xfrm)
110266 {
110267- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
110268+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
110269 return 0;
110270 if (fle->object && !fle->object->ops->check(fle->object))
110271 return 0;
110272@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
110273 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
110274 fcp->hash_count++;
110275 }
110276- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
110277+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
110278 flo = fle->object;
110279 if (!flo)
110280 goto ret_object;
110281@@ -263,7 +263,7 @@ nocache:
110282 }
110283 flo = resolver(net, key, family, dir, flo, ctx);
110284 if (fle) {
110285- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
110286+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
110287 if (!IS_ERR(flo))
110288 fle->object = flo;
110289 else
110290diff --git a/net/core/neighbour.c b/net/core/neighbour.c
110291index 70fe9e1..926784c 100644
110292--- a/net/core/neighbour.c
110293+++ b/net/core/neighbour.c
110294@@ -2806,7 +2806,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
110295 void __user *buffer, size_t *lenp, loff_t *ppos)
110296 {
110297 int size, ret;
110298- struct ctl_table tmp = *ctl;
110299+ ctl_table_no_const tmp = *ctl;
110300
110301 tmp.extra1 = &zero;
110302 tmp.extra2 = &unres_qlen_max;
110303@@ -2868,7 +2868,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
110304 void __user *buffer,
110305 size_t *lenp, loff_t *ppos)
110306 {
110307- struct ctl_table tmp = *ctl;
110308+ ctl_table_no_const tmp = *ctl;
110309 int ret;
110310
110311 tmp.extra1 = &zero;
110312diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
110313index 2bf8329..2eb1423 100644
110314--- a/net/core/net-procfs.c
110315+++ b/net/core/net-procfs.c
110316@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
110317 struct rtnl_link_stats64 temp;
110318 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
110319
110320- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110321+ if (gr_proc_is_restricted())
110322+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110323+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110324+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
110325+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
110326+ else
110327+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110328 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110329 dev->name, stats->rx_bytes, stats->rx_packets,
110330 stats->rx_errors,
110331@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
110332 return 0;
110333 }
110334
110335-static const struct seq_operations dev_seq_ops = {
110336+const struct seq_operations dev_seq_ops = {
110337 .start = dev_seq_start,
110338 .next = dev_seq_next,
110339 .stop = dev_seq_stop,
110340@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
110341
110342 static int softnet_seq_open(struct inode *inode, struct file *file)
110343 {
110344- return seq_open(file, &softnet_seq_ops);
110345+ return seq_open_restrict(file, &softnet_seq_ops);
110346 }
110347
110348 static const struct file_operations softnet_seq_fops = {
110349@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
110350 else
110351 seq_printf(seq, "%04x", ntohs(pt->type));
110352
110353+#ifdef CONFIG_GRKERNSEC_HIDESYM
110354+ seq_printf(seq, " %-8s %pf\n",
110355+ pt->dev ? pt->dev->name : "", NULL);
110356+#else
110357 seq_printf(seq, " %-8s %pf\n",
110358 pt->dev ? pt->dev->name : "", pt->func);
110359+#endif
110360 }
110361
110362 return 0;
110363diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
110364index f2aa73b..0d1a1ea 100644
110365--- a/net/core/net-sysfs.c
110366+++ b/net/core/net-sysfs.c
110367@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
110368 {
110369 struct net_device *netdev = to_net_dev(dev);
110370 return sprintf(buf, fmt_dec,
110371- atomic_read(&netdev->carrier_changes));
110372+ atomic_read_unchecked(&netdev->carrier_changes));
110373 }
110374 static DEVICE_ATTR_RO(carrier_changes);
110375
110376diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
110377index 70d3450..eb7c528 100644
110378--- a/net/core/net_namespace.c
110379+++ b/net/core/net_namespace.c
110380@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
110381 int error;
110382 LIST_HEAD(net_exit_list);
110383
110384- list_add_tail(&ops->list, list);
110385+ pax_list_add_tail((struct list_head *)&ops->list, list);
110386 if (ops->init || (ops->id && ops->size)) {
110387 for_each_net(net) {
110388 error = ops_init(ops, net);
110389@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
110390
110391 out_undo:
110392 /* If I have an error cleanup all namespaces I initialized */
110393- list_del(&ops->list);
110394+ pax_list_del((struct list_head *)&ops->list);
110395 ops_exit_list(ops, &net_exit_list);
110396 ops_free_list(ops, &net_exit_list);
110397 return error;
110398@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
110399 struct net *net;
110400 LIST_HEAD(net_exit_list);
110401
110402- list_del(&ops->list);
110403+ pax_list_del((struct list_head *)&ops->list);
110404 for_each_net(net)
110405 list_add_tail(&net->exit_list, &net_exit_list);
110406 ops_exit_list(ops, &net_exit_list);
110407@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
110408 mutex_lock(&net_mutex);
110409 error = register_pernet_operations(&pernet_list, ops);
110410 if (!error && (first_device == &pernet_list))
110411- first_device = &ops->list;
110412+ first_device = (struct list_head *)&ops->list;
110413 mutex_unlock(&net_mutex);
110414 return error;
110415 }
110416diff --git a/net/core/netpoll.c b/net/core/netpoll.c
110417index c126a87..10ad89d 100644
110418--- a/net/core/netpoll.c
110419+++ b/net/core/netpoll.c
110420@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110421 struct udphdr *udph;
110422 struct iphdr *iph;
110423 struct ethhdr *eth;
110424- static atomic_t ip_ident;
110425+ static atomic_unchecked_t ip_ident;
110426 struct ipv6hdr *ip6h;
110427
110428 udp_len = len + sizeof(*udph);
110429@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110430 put_unaligned(0x45, (unsigned char *)iph);
110431 iph->tos = 0;
110432 put_unaligned(htons(ip_len), &(iph->tot_len));
110433- iph->id = htons(atomic_inc_return(&ip_ident));
110434+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
110435 iph->frag_off = 0;
110436 iph->ttl = 64;
110437 iph->protocol = IPPROTO_UDP;
110438diff --git a/net/core/pktgen.c b/net/core/pktgen.c
110439index 508155b..fad080f 100644
110440--- a/net/core/pktgen.c
110441+++ b/net/core/pktgen.c
110442@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
110443 pn->net = net;
110444 INIT_LIST_HEAD(&pn->pktgen_threads);
110445 pn->pktgen_exiting = false;
110446- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
110447+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
110448 if (!pn->proc_dir) {
110449 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
110450 return -ENODEV;
110451diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
110452index 7ebed55..378bf34 100644
110453--- a/net/core/rtnetlink.c
110454+++ b/net/core/rtnetlink.c
110455@@ -61,7 +61,7 @@ struct rtnl_link {
110456 rtnl_doit_func doit;
110457 rtnl_dumpit_func dumpit;
110458 rtnl_calcit_func calcit;
110459-};
110460+} __no_const;
110461
110462 static DEFINE_MUTEX(rtnl_mutex);
110463
110464@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
110465 * to use the ops for creating device. So do not
110466 * fill up dellink as well. That disables rtnl_dellink.
110467 */
110468- if (ops->setup && !ops->dellink)
110469- ops->dellink = unregister_netdevice_queue;
110470+ if (ops->setup && !ops->dellink) {
110471+ pax_open_kernel();
110472+ *(void **)&ops->dellink = unregister_netdevice_queue;
110473+ pax_close_kernel();
110474+ }
110475
110476- list_add_tail(&ops->list, &link_ops);
110477+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
110478 return 0;
110479 }
110480 EXPORT_SYMBOL_GPL(__rtnl_link_register);
110481@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
110482 for_each_net(net) {
110483 __rtnl_kill_links(net, ops);
110484 }
110485- list_del(&ops->list);
110486+ pax_list_del((struct list_head *)&ops->list);
110487 }
110488 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
110489
110490@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
110491 (dev->ifalias &&
110492 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
110493 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
110494- atomic_read(&dev->carrier_changes)))
110495+ atomic_read_unchecked(&dev->carrier_changes)))
110496 goto nla_put_failure;
110497
110498 if (1) {
110499diff --git a/net/core/scm.c b/net/core/scm.c
110500index 3b6899b..cf36238 100644
110501--- a/net/core/scm.c
110502+++ b/net/core/scm.c
110503@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
110504 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110505 {
110506 struct cmsghdr __user *cm
110507- = (__force struct cmsghdr __user *)msg->msg_control;
110508+ = (struct cmsghdr __force_user *)msg->msg_control;
110509 struct cmsghdr cmhdr;
110510 int cmlen = CMSG_LEN(len);
110511 int err;
110512@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110513 err = -EFAULT;
110514 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
110515 goto out;
110516- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
110517+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
110518 goto out;
110519 cmlen = CMSG_SPACE(len);
110520 if (msg->msg_controllen < cmlen)
110521@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
110522 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110523 {
110524 struct cmsghdr __user *cm
110525- = (__force struct cmsghdr __user*)msg->msg_control;
110526+ = (struct cmsghdr __force_user *)msg->msg_control;
110527
110528 int fdmax = 0;
110529 int fdnum = scm->fp->count;
110530@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110531 if (fdnum < fdmax)
110532 fdmax = fdnum;
110533
110534- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
110535+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
110536 i++, cmfptr++)
110537 {
110538 struct socket *sock;
110539diff --git a/net/core/skbuff.c b/net/core/skbuff.c
110540index e9f9a15..6eb024e 100644
110541--- a/net/core/skbuff.c
110542+++ b/net/core/skbuff.c
110543@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
110544 __wsum skb_checksum(const struct sk_buff *skb, int offset,
110545 int len, __wsum csum)
110546 {
110547- const struct skb_checksum_ops ops = {
110548+ static const struct skb_checksum_ops ops = {
110549 .update = csum_partial_ext,
110550 .combine = csum_block_add_ext,
110551 };
110552@@ -3379,12 +3379,14 @@ void __init skb_init(void)
110553 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
110554 sizeof(struct sk_buff),
110555 0,
110556- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110557+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110558+ SLAB_NO_SANITIZE,
110559 NULL);
110560 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
110561 sizeof(struct sk_buff_fclones),
110562 0,
110563- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110564+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110565+ SLAB_NO_SANITIZE,
110566 NULL);
110567 }
110568
110569diff --git a/net/core/sock.c b/net/core/sock.c
110570index 71e3e5f..ab90920 100644
110571--- a/net/core/sock.c
110572+++ b/net/core/sock.c
110573@@ -443,7 +443,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110574 struct sk_buff_head *list = &sk->sk_receive_queue;
110575
110576 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
110577- atomic_inc(&sk->sk_drops);
110578+ atomic_inc_unchecked(&sk->sk_drops);
110579 trace_sock_rcvqueue_full(sk, skb);
110580 return -ENOMEM;
110581 }
110582@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110583 return err;
110584
110585 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
110586- atomic_inc(&sk->sk_drops);
110587+ atomic_inc_unchecked(&sk->sk_drops);
110588 return -ENOBUFS;
110589 }
110590
110591@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110592 skb_dst_force(skb);
110593
110594 spin_lock_irqsave(&list->lock, flags);
110595- skb->dropcount = atomic_read(&sk->sk_drops);
110596+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
110597 __skb_queue_tail(list, skb);
110598 spin_unlock_irqrestore(&list->lock, flags);
110599
110600@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110601 skb->dev = NULL;
110602
110603 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
110604- atomic_inc(&sk->sk_drops);
110605+ atomic_inc_unchecked(&sk->sk_drops);
110606 goto discard_and_relse;
110607 }
110608 if (nested)
110609@@ -504,7 +504,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110610 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
110611 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
110612 bh_unlock_sock(sk);
110613- atomic_inc(&sk->sk_drops);
110614+ atomic_inc_unchecked(&sk->sk_drops);
110615 goto discard_and_relse;
110616 }
110617
110618@@ -910,6 +910,7 @@ set_rcvbuf:
110619 }
110620 break;
110621
110622+#ifndef GRKERNSEC_BPF_HARDEN
110623 case SO_ATTACH_BPF:
110624 ret = -EINVAL;
110625 if (optlen == sizeof(u32)) {
110626@@ -922,7 +923,7 @@ set_rcvbuf:
110627 ret = sk_attach_bpf(ufd, sk);
110628 }
110629 break;
110630-
110631+#endif
110632 case SO_DETACH_FILTER:
110633 ret = sk_detach_filter(sk);
110634 break;
110635@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110636 struct timeval tm;
110637 } v;
110638
110639- int lv = sizeof(int);
110640- int len;
110641+ unsigned int lv = sizeof(int);
110642+ unsigned int len;
110643
110644 if (get_user(len, optlen))
110645 return -EFAULT;
110646- if (len < 0)
110647+ if (len > INT_MAX)
110648 return -EINVAL;
110649
110650 memset(&v, 0, sizeof(v));
110651@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110652
110653 case SO_PEERNAME:
110654 {
110655- char address[128];
110656+ char address[_K_SS_MAXSIZE];
110657
110658 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
110659 return -ENOTCONN;
110660- if (lv < len)
110661+ if (lv < len || sizeof address < len)
110662 return -EINVAL;
110663 if (copy_to_user(optval, address, len))
110664 return -EFAULT;
110665@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110666
110667 if (len > lv)
110668 len = lv;
110669- if (copy_to_user(optval, &v, len))
110670+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
110671 return -EFAULT;
110672 lenout:
110673 if (put_user(len, optlen))
110674@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
110675 */
110676 smp_wmb();
110677 atomic_set(&sk->sk_refcnt, 1);
110678- atomic_set(&sk->sk_drops, 0);
110679+ atomic_set_unchecked(&sk->sk_drops, 0);
110680 }
110681 EXPORT_SYMBOL(sock_init_data);
110682
110683@@ -2503,6 +2504,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
110684 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110685 int level, int type)
110686 {
110687+ struct sock_extended_err ee;
110688 struct sock_exterr_skb *serr;
110689 struct sk_buff *skb;
110690 int copied, err;
110691@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110692 sock_recv_timestamp(msg, sk, skb);
110693
110694 serr = SKB_EXT_ERR(skb);
110695- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
110696+ ee = serr->ee;
110697+ put_cmsg(msg, level, type, sizeof ee, &ee);
110698
110699 msg->msg_flags |= MSG_ERRQUEUE;
110700 err = copied;
110701diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
110702index ad704c7..ca48aff 100644
110703--- a/net/core/sock_diag.c
110704+++ b/net/core/sock_diag.c
110705@@ -9,26 +9,33 @@
110706 #include <linux/inet_diag.h>
110707 #include <linux/sock_diag.h>
110708
110709-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
110710+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
110711 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
110712 static DEFINE_MUTEX(sock_diag_table_mutex);
110713
110714 int sock_diag_check_cookie(void *sk, __u32 *cookie)
110715 {
110716+#ifndef CONFIG_GRKERNSEC_HIDESYM
110717 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
110718 cookie[1] != INET_DIAG_NOCOOKIE) &&
110719 ((u32)(unsigned long)sk != cookie[0] ||
110720 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
110721 return -ESTALE;
110722 else
110723+#endif
110724 return 0;
110725 }
110726 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
110727
110728 void sock_diag_save_cookie(void *sk, __u32 *cookie)
110729 {
110730+#ifdef CONFIG_GRKERNSEC_HIDESYM
110731+ cookie[0] = 0;
110732+ cookie[1] = 0;
110733+#else
110734 cookie[0] = (u32)(unsigned long)sk;
110735 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
110736+#endif
110737 }
110738 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
110739
110740@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
110741 mutex_lock(&sock_diag_table_mutex);
110742 if (sock_diag_handlers[hndl->family])
110743 err = -EBUSY;
110744- else
110745+ else {
110746+ pax_open_kernel();
110747 sock_diag_handlers[hndl->family] = hndl;
110748+ pax_close_kernel();
110749+ }
110750 mutex_unlock(&sock_diag_table_mutex);
110751
110752 return err;
110753@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
110754
110755 mutex_lock(&sock_diag_table_mutex);
110756 BUG_ON(sock_diag_handlers[family] != hnld);
110757+ pax_open_kernel();
110758 sock_diag_handlers[family] = NULL;
110759+ pax_close_kernel();
110760 mutex_unlock(&sock_diag_table_mutex);
110761 }
110762 EXPORT_SYMBOL_GPL(sock_diag_unregister);
110763diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
110764index 8ce351f..2c388f7 100644
110765--- a/net/core/sysctl_net_core.c
110766+++ b/net/core/sysctl_net_core.c
110767@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
110768 {
110769 unsigned int orig_size, size;
110770 int ret, i;
110771- struct ctl_table tmp = {
110772+ ctl_table_no_const tmp = {
110773 .data = &size,
110774 .maxlen = sizeof(size),
110775 .mode = table->mode
110776@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
110777 void __user *buffer, size_t *lenp, loff_t *ppos)
110778 {
110779 char id[IFNAMSIZ];
110780- struct ctl_table tbl = {
110781+ ctl_table_no_const tbl = {
110782 .data = id,
110783 .maxlen = IFNAMSIZ,
110784 };
110785@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
110786 static int proc_do_rss_key(struct ctl_table *table, int write,
110787 void __user *buffer, size_t *lenp, loff_t *ppos)
110788 {
110789- struct ctl_table fake_table;
110790+ ctl_table_no_const fake_table;
110791 char buf[NETDEV_RSS_KEY_LEN * 3];
110792
110793 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
110794@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
110795 .mode = 0444,
110796 .proc_handler = proc_do_rss_key,
110797 },
110798-#ifdef CONFIG_BPF_JIT
110799+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
110800 {
110801 .procname = "bpf_jit_enable",
110802 .data = &bpf_jit_enable,
110803@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
110804
110805 static __net_init int sysctl_core_net_init(struct net *net)
110806 {
110807- struct ctl_table *tbl;
110808+ ctl_table_no_const *tbl = NULL;
110809
110810 net->core.sysctl_somaxconn = SOMAXCONN;
110811
110812- tbl = netns_core_table;
110813 if (!net_eq(net, &init_net)) {
110814- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
110815+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
110816 if (tbl == NULL)
110817 goto err_dup;
110818
110819@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
110820 if (net->user_ns != &init_user_ns) {
110821 tbl[0].procname = NULL;
110822 }
110823- }
110824-
110825- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
110826+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
110827+ } else
110828+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
110829 if (net->core.sysctl_hdr == NULL)
110830 goto err_reg;
110831
110832 return 0;
110833
110834 err_reg:
110835- if (tbl != netns_core_table)
110836- kfree(tbl);
110837+ kfree(tbl);
110838 err_dup:
110839 return -ENOMEM;
110840 }
110841@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
110842 kfree(tbl);
110843 }
110844
110845-static __net_initdata struct pernet_operations sysctl_core_ops = {
110846+static __net_initconst struct pernet_operations sysctl_core_ops = {
110847 .init = sysctl_core_net_init,
110848 .exit = sysctl_core_net_exit,
110849 };
110850diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
110851index 8102286..a0c2755 100644
110852--- a/net/decnet/af_decnet.c
110853+++ b/net/decnet/af_decnet.c
110854@@ -466,6 +466,7 @@ static struct proto dn_proto = {
110855 .sysctl_rmem = sysctl_decnet_rmem,
110856 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
110857 .obj_size = sizeof(struct dn_sock),
110858+ .slab_flags = SLAB_USERCOPY,
110859 };
110860
110861 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
110862diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
110863index b2c26b0..41f803e 100644
110864--- a/net/decnet/dn_dev.c
110865+++ b/net/decnet/dn_dev.c
110866@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
110867 .extra1 = &min_t3,
110868 .extra2 = &max_t3
110869 },
110870- {0}
110871+ { }
110872 },
110873 };
110874
110875diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
110876index 5325b54..a0d4d69 100644
110877--- a/net/decnet/sysctl_net_decnet.c
110878+++ b/net/decnet/sysctl_net_decnet.c
110879@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
110880
110881 if (len > *lenp) len = *lenp;
110882
110883- if (copy_to_user(buffer, addr, len))
110884+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
110885 return -EFAULT;
110886
110887 *lenp = len;
110888@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
110889
110890 if (len > *lenp) len = *lenp;
110891
110892- if (copy_to_user(buffer, devname, len))
110893+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
110894 return -EFAULT;
110895
110896 *lenp = len;
110897diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
110898index a2c7e4c..3dc9f67 100644
110899--- a/net/hsr/hsr_netlink.c
110900+++ b/net/hsr/hsr_netlink.c
110901@@ -102,7 +102,7 @@ nla_put_failure:
110902 return -EMSGSIZE;
110903 }
110904
110905-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
110906+static struct rtnl_link_ops hsr_link_ops = {
110907 .kind = "hsr",
110908 .maxtype = IFLA_HSR_MAX,
110909 .policy = hsr_policy,
110910diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
110911index 055fbb7..c0dbe60 100644
110912--- a/net/ieee802154/6lowpan/core.c
110913+++ b/net/ieee802154/6lowpan/core.c
110914@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
110915 dev_put(real_dev);
110916 }
110917
110918-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
110919+static struct rtnl_link_ops lowpan_link_ops = {
110920 .kind = "lowpan",
110921 .priv_size = sizeof(struct lowpan_dev_info),
110922 .setup = lowpan_setup,
110923diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
110924index f46e4d1..30231f1 100644
110925--- a/net/ieee802154/6lowpan/reassembly.c
110926+++ b/net/ieee802154/6lowpan/reassembly.c
110927@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
110928
110929 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
110930 {
110931- struct ctl_table *table;
110932+ ctl_table_no_const *table = NULL;
110933 struct ctl_table_header *hdr;
110934 struct netns_ieee802154_lowpan *ieee802154_lowpan =
110935 net_ieee802154_lowpan(net);
110936
110937- table = lowpan_frags_ns_ctl_table;
110938 if (!net_eq(net, &init_net)) {
110939- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
110940+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
110941 GFP_KERNEL);
110942 if (table == NULL)
110943 goto err_alloc;
110944@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
110945 /* Don't export sysctls to unprivileged users */
110946 if (net->user_ns != &init_user_ns)
110947 table[0].procname = NULL;
110948- }
110949-
110950- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
110951+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
110952+ } else
110953+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
110954 if (hdr == NULL)
110955 goto err_reg;
110956
110957@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
110958 return 0;
110959
110960 err_reg:
110961- if (!net_eq(net, &init_net))
110962- kfree(table);
110963+ kfree(table);
110964 err_alloc:
110965 return -ENOMEM;
110966 }
110967diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
110968index d2e49ba..f78e8aa 100644
110969--- a/net/ipv4/af_inet.c
110970+++ b/net/ipv4/af_inet.c
110971@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
110972 return ip_recv_error(sk, msg, len, addr_len);
110973 #if IS_ENABLED(CONFIG_IPV6)
110974 if (sk->sk_family == AF_INET6)
110975- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
110976+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
110977 #endif
110978 return -EINVAL;
110979 }
110980diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
110981index 3a8985c..9d2a870 100644
110982--- a/net/ipv4/devinet.c
110983+++ b/net/ipv4/devinet.c
110984@@ -69,7 +69,8 @@
110985
110986 static struct ipv4_devconf ipv4_devconf = {
110987 .data = {
110988- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
110989+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
110990+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
110991 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
110992 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
110993 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
110994@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
110995
110996 static struct ipv4_devconf ipv4_devconf_dflt = {
110997 .data = {
110998- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
110999+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111000+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111001 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111002 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111003 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111004@@ -1549,7 +1551,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
111005 idx = 0;
111006 head = &net->dev_index_head[h];
111007 rcu_read_lock();
111008- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111009+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111010 net->dev_base_seq;
111011 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111012 if (idx < s_idx)
111013@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
111014 idx = 0;
111015 head = &net->dev_index_head[h];
111016 rcu_read_lock();
111017- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111018+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111019 net->dev_base_seq;
111020 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111021 if (idx < s_idx)
111022@@ -2103,7 +2105,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
111023 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
111024 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
111025
111026-static struct devinet_sysctl_table {
111027+static const struct devinet_sysctl_table {
111028 struct ctl_table_header *sysctl_header;
111029 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
111030 } devinet_sysctl = {
111031@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
111032 int err;
111033 struct ipv4_devconf *all, *dflt;
111034 #ifdef CONFIG_SYSCTL
111035- struct ctl_table *tbl = ctl_forward_entry;
111036+ ctl_table_no_const *tbl = NULL;
111037 struct ctl_table_header *forw_hdr;
111038 #endif
111039
111040@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
111041 goto err_alloc_dflt;
111042
111043 #ifdef CONFIG_SYSCTL
111044- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
111045+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
111046 if (tbl == NULL)
111047 goto err_alloc_ctl;
111048
111049@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
111050 goto err_reg_dflt;
111051
111052 err = -ENOMEM;
111053- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111054+ if (!net_eq(net, &init_net))
111055+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111056+ else
111057+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
111058 if (forw_hdr == NULL)
111059 goto err_reg_ctl;
111060 net->ipv4.forw_hdr = forw_hdr;
111061@@ -2289,8 +2294,7 @@ err_reg_ctl:
111062 err_reg_dflt:
111063 __devinet_sysctl_unregister(all);
111064 err_reg_all:
111065- if (tbl != ctl_forward_entry)
111066- kfree(tbl);
111067+ kfree(tbl);
111068 err_alloc_ctl:
111069 #endif
111070 if (dflt != &ipv4_devconf_dflt)
111071diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
111072index 23b9b3e..60cf0c4 100644
111073--- a/net/ipv4/fib_frontend.c
111074+++ b/net/ipv4/fib_frontend.c
111075@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
111076 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111077 fib_sync_up(dev);
111078 #endif
111079- atomic_inc(&net->ipv4.dev_addr_genid);
111080+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111081 rt_cache_flush(dev_net(dev));
111082 break;
111083 case NETDEV_DOWN:
111084 fib_del_ifaddr(ifa, NULL);
111085- atomic_inc(&net->ipv4.dev_addr_genid);
111086+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111087 if (ifa->ifa_dev->ifa_list == NULL) {
111088 /* Last address was deleted from this interface.
111089 * Disable IP.
111090@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
111091 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111092 fib_sync_up(dev);
111093 #endif
111094- atomic_inc(&net->ipv4.dev_addr_genid);
111095+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111096 rt_cache_flush(net);
111097 break;
111098 case NETDEV_DOWN:
111099diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
111100index 1e2090e..351a724 100644
111101--- a/net/ipv4/fib_semantics.c
111102+++ b/net/ipv4/fib_semantics.c
111103@@ -753,7 +753,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
111104 nh->nh_saddr = inet_select_addr(nh->nh_dev,
111105 nh->nh_gw,
111106 nh->nh_parent->fib_scope);
111107- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
111108+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
111109
111110 return nh->nh_saddr;
111111 }
111112diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
111113index ff069f6..335e752 100644
111114--- a/net/ipv4/fou.c
111115+++ b/net/ipv4/fou.c
111116@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
111117
111118 #ifdef CONFIG_NET_FOU_IP_TUNNELS
111119
111120-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
111121+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
111122 .encap_hlen = fou_encap_hlen,
111123 .build_header = fou_build_header,
111124 };
111125
111126-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
111127+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
111128 .encap_hlen = gue_encap_hlen,
111129 .build_header = gue_build_header,
111130 };
111131diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
111132index 9111a4e..3576905 100644
111133--- a/net/ipv4/inet_hashtables.c
111134+++ b/net/ipv4/inet_hashtables.c
111135@@ -18,6 +18,7 @@
111136 #include <linux/sched.h>
111137 #include <linux/slab.h>
111138 #include <linux/wait.h>
111139+#include <linux/security.h>
111140
111141 #include <net/inet_connection_sock.h>
111142 #include <net/inet_hashtables.h>
111143@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
111144 return inet_ehashfn(net, laddr, lport, faddr, fport);
111145 }
111146
111147+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
111148+
111149 /*
111150 * Allocate and initialize a new local port bind bucket.
111151 * The bindhash mutex for snum's hash chain must be held here.
111152@@ -554,6 +557,8 @@ ok:
111153 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
111154 spin_unlock(&head->lock);
111155
111156+ gr_update_task_in_ip_table(inet_sk(sk));
111157+
111158 if (tw) {
111159 inet_twsk_deschedule(tw, death_row);
111160 while (twrefcnt) {
111161diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
111162index 241afd7..31b95d5 100644
111163--- a/net/ipv4/inetpeer.c
111164+++ b/net/ipv4/inetpeer.c
111165@@ -461,7 +461,7 @@ relookup:
111166 if (p) {
111167 p->daddr = *daddr;
111168 atomic_set(&p->refcnt, 1);
111169- atomic_set(&p->rid, 0);
111170+ atomic_set_unchecked(&p->rid, 0);
111171 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
111172 p->rate_tokens = 0;
111173 /* 60*HZ is arbitrary, but chosen enough high so that the first
111174diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
111175index 145a50c..5dd8cc5 100644
111176--- a/net/ipv4/ip_fragment.c
111177+++ b/net/ipv4/ip_fragment.c
111178@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
111179 return 0;
111180
111181 start = qp->rid;
111182- end = atomic_inc_return(&peer->rid);
111183+ end = atomic_inc_return_unchecked(&peer->rid);
111184 qp->rid = end;
111185
111186 rc = qp->q.fragments && (end - start) > max;
111187@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
111188
111189 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111190 {
111191- struct ctl_table *table;
111192+ ctl_table_no_const *table = NULL;
111193 struct ctl_table_header *hdr;
111194
111195- table = ip4_frags_ns_ctl_table;
111196 if (!net_eq(net, &init_net)) {
111197- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111198+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111199 if (table == NULL)
111200 goto err_alloc;
111201
111202@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111203 /* Don't export sysctls to unprivileged users */
111204 if (net->user_ns != &init_user_ns)
111205 table[0].procname = NULL;
111206- }
111207+ hdr = register_net_sysctl(net, "net/ipv4", table);
111208+ } else
111209+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
111210
111211- hdr = register_net_sysctl(net, "net/ipv4", table);
111212 if (hdr == NULL)
111213 goto err_reg;
111214
111215@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111216 return 0;
111217
111218 err_reg:
111219- if (!net_eq(net, &init_net))
111220- kfree(table);
111221+ kfree(table);
111222 err_alloc:
111223 return -ENOMEM;
111224 }
111225diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
111226index 6207275f..00323a2 100644
111227--- a/net/ipv4/ip_gre.c
111228+++ b/net/ipv4/ip_gre.c
111229@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
111230 module_param(log_ecn_error, bool, 0644);
111231 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111232
111233-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
111234+static struct rtnl_link_ops ipgre_link_ops;
111235 static int ipgre_tunnel_init(struct net_device *dev);
111236
111237 static int ipgre_net_id __read_mostly;
111238@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
111239 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
111240 };
111241
111242-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111243+static struct rtnl_link_ops ipgre_link_ops = {
111244 .kind = "gre",
111245 .maxtype = IFLA_GRE_MAX,
111246 .policy = ipgre_policy,
111247@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111248 .get_link_net = ip_tunnel_get_link_net,
111249 };
111250
111251-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
111252+static struct rtnl_link_ops ipgre_tap_ops = {
111253 .kind = "gretap",
111254 .maxtype = IFLA_GRE_MAX,
111255 .policy = ipgre_policy,
111256diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
111257index 3d4da2c..40f9c29 100644
111258--- a/net/ipv4/ip_input.c
111259+++ b/net/ipv4/ip_input.c
111260@@ -147,6 +147,10 @@
111261 #include <linux/mroute.h>
111262 #include <linux/netlink.h>
111263
111264+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111265+extern int grsec_enable_blackhole;
111266+#endif
111267+
111268 /*
111269 * Process Router Attention IP option (RFC 2113)
111270 */
111271@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
111272 if (!raw) {
111273 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
111274 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
111275+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111276+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
111277+#endif
111278 icmp_send(skb, ICMP_DEST_UNREACH,
111279 ICMP_PROT_UNREACH, 0);
111280 }
111281diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
111282index 5cd9927..8610b9f 100644
111283--- a/net/ipv4/ip_sockglue.c
111284+++ b/net/ipv4/ip_sockglue.c
111285@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111286 len = min_t(unsigned int, len, opt->optlen);
111287 if (put_user(len, optlen))
111288 return -EFAULT;
111289- if (copy_to_user(optval, opt->__data, len))
111290+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
111291+ copy_to_user(optval, opt->__data, len))
111292 return -EFAULT;
111293 return 0;
111294 }
111295@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111296 if (sk->sk_type != SOCK_STREAM)
111297 return -ENOPROTOOPT;
111298
111299- msg.msg_control = (__force void *) optval;
111300+ msg.msg_control = (__force_kernel void *) optval;
111301 msg.msg_controllen = len;
111302 msg.msg_flags = flags;
111303
111304diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
111305index 94efe14..1453fcc 100644
111306--- a/net/ipv4/ip_vti.c
111307+++ b/net/ipv4/ip_vti.c
111308@@ -45,7 +45,7 @@
111309 #include <net/net_namespace.h>
111310 #include <net/netns/generic.h>
111311
111312-static struct rtnl_link_ops vti_link_ops __read_mostly;
111313+static struct rtnl_link_ops vti_link_ops;
111314
111315 static int vti_net_id __read_mostly;
111316 static int vti_tunnel_init(struct net_device *dev);
111317@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
111318 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
111319 };
111320
111321-static struct rtnl_link_ops vti_link_ops __read_mostly = {
111322+static struct rtnl_link_ops vti_link_ops = {
111323 .kind = "vti",
111324 .maxtype = IFLA_VTI_MAX,
111325 .policy = vti_policy,
111326diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
111327index b26376e..fc3d733 100644
111328--- a/net/ipv4/ipconfig.c
111329+++ b/net/ipv4/ipconfig.c
111330@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
111331
111332 mm_segment_t oldfs = get_fs();
111333 set_fs(get_ds());
111334- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111335+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111336 set_fs(oldfs);
111337 return res;
111338 }
111339@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
111340
111341 mm_segment_t oldfs = get_fs();
111342 set_fs(get_ds());
111343- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111344+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111345 set_fs(oldfs);
111346 return res;
111347 }
111348@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
111349
111350 mm_segment_t oldfs = get_fs();
111351 set_fs(get_ds());
111352- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
111353+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
111354 set_fs(oldfs);
111355 return res;
111356 }
111357diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
111358index 915d215..48d1db7 100644
111359--- a/net/ipv4/ipip.c
111360+++ b/net/ipv4/ipip.c
111361@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111362 static int ipip_net_id __read_mostly;
111363
111364 static int ipip_tunnel_init(struct net_device *dev);
111365-static struct rtnl_link_ops ipip_link_ops __read_mostly;
111366+static struct rtnl_link_ops ipip_link_ops;
111367
111368 static int ipip_err(struct sk_buff *skb, u32 info)
111369 {
111370@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
111371 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
111372 };
111373
111374-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
111375+static struct rtnl_link_ops ipip_link_ops = {
111376 .kind = "ipip",
111377 .maxtype = IFLA_IPTUN_MAX,
111378 .policy = ipip_policy,
111379diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
111380index f95b6f9..2ee2097 100644
111381--- a/net/ipv4/netfilter/arp_tables.c
111382+++ b/net/ipv4/netfilter/arp_tables.c
111383@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
111384 #endif
111385
111386 static int get_info(struct net *net, void __user *user,
111387- const int *len, int compat)
111388+ int len, int compat)
111389 {
111390 char name[XT_TABLE_MAXNAMELEN];
111391 struct xt_table *t;
111392 int ret;
111393
111394- if (*len != sizeof(struct arpt_getinfo)) {
111395- duprintf("length %u != %Zu\n", *len,
111396+ if (len != sizeof(struct arpt_getinfo)) {
111397+ duprintf("length %u != %Zu\n", len,
111398 sizeof(struct arpt_getinfo));
111399 return -EINVAL;
111400 }
111401@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
111402 info.size = private->size;
111403 strcpy(info.name, name);
111404
111405- if (copy_to_user(user, &info, *len) != 0)
111406+ if (copy_to_user(user, &info, len) != 0)
111407 ret = -EFAULT;
111408 else
111409 ret = 0;
111410@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
111411
111412 switch (cmd) {
111413 case ARPT_SO_GET_INFO:
111414- ret = get_info(sock_net(sk), user, len, 1);
111415+ ret = get_info(sock_net(sk), user, *len, 1);
111416 break;
111417 case ARPT_SO_GET_ENTRIES:
111418 ret = compat_get_entries(sock_net(sk), user, len);
111419@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
111420
111421 switch (cmd) {
111422 case ARPT_SO_GET_INFO:
111423- ret = get_info(sock_net(sk), user, len, 0);
111424+ ret = get_info(sock_net(sk), user, *len, 0);
111425 break;
111426
111427 case ARPT_SO_GET_ENTRIES:
111428diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
111429index cf5e82f..75a20f5 100644
111430--- a/net/ipv4/netfilter/ip_tables.c
111431+++ b/net/ipv4/netfilter/ip_tables.c
111432@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
111433 #endif
111434
111435 static int get_info(struct net *net, void __user *user,
111436- const int *len, int compat)
111437+ int len, int compat)
111438 {
111439 char name[XT_TABLE_MAXNAMELEN];
111440 struct xt_table *t;
111441 int ret;
111442
111443- if (*len != sizeof(struct ipt_getinfo)) {
111444- duprintf("length %u != %zu\n", *len,
111445+ if (len != sizeof(struct ipt_getinfo)) {
111446+ duprintf("length %u != %zu\n", len,
111447 sizeof(struct ipt_getinfo));
111448 return -EINVAL;
111449 }
111450@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
111451 info.size = private->size;
111452 strcpy(info.name, name);
111453
111454- if (copy_to_user(user, &info, *len) != 0)
111455+ if (copy_to_user(user, &info, len) != 0)
111456 ret = -EFAULT;
111457 else
111458 ret = 0;
111459@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111460
111461 switch (cmd) {
111462 case IPT_SO_GET_INFO:
111463- ret = get_info(sock_net(sk), user, len, 1);
111464+ ret = get_info(sock_net(sk), user, *len, 1);
111465 break;
111466 case IPT_SO_GET_ENTRIES:
111467 ret = compat_get_entries(sock_net(sk), user, len);
111468@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111469
111470 switch (cmd) {
111471 case IPT_SO_GET_INFO:
111472- ret = get_info(sock_net(sk), user, len, 0);
111473+ ret = get_info(sock_net(sk), user, *len, 0);
111474 break;
111475
111476 case IPT_SO_GET_ENTRIES:
111477diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111478index e90f83a..3e6acca 100644
111479--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
111480+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111481@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
111482 spin_lock_init(&cn->lock);
111483
111484 #ifdef CONFIG_PROC_FS
111485- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
111486+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
111487 if (!cn->procdir) {
111488 pr_err("Unable to proc dir entry\n");
111489 return -ENOMEM;
111490diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
111491index 787b0d6..ab6c0ba 100644
111492--- a/net/ipv4/ping.c
111493+++ b/net/ipv4/ping.c
111494@@ -59,7 +59,7 @@ struct ping_table {
111495 };
111496
111497 static struct ping_table ping_table;
111498-struct pingv6_ops pingv6_ops;
111499+struct pingv6_ops *pingv6_ops;
111500 EXPORT_SYMBOL_GPL(pingv6_ops);
111501
111502 static u16 ping_port_rover;
111503@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
111504 return -ENODEV;
111505 }
111506 }
111507- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
111508+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
111509 scoped);
111510 rcu_read_unlock();
111511
111512@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111513 }
111514 #if IS_ENABLED(CONFIG_IPV6)
111515 } else if (skb->protocol == htons(ETH_P_IPV6)) {
111516- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
111517+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
111518 #endif
111519 }
111520
111521@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111522 info, (u8 *)icmph);
111523 #if IS_ENABLED(CONFIG_IPV6)
111524 } else if (family == AF_INET6) {
111525- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
111526+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
111527 info, (u8 *)icmph);
111528 #endif
111529 }
111530@@ -919,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
111531 }
111532
111533 if (inet6_sk(sk)->rxopt.all)
111534- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
111535+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
111536 if (skb->protocol == htons(ETH_P_IPV6) &&
111537 inet6_sk(sk)->rxopt.all)
111538- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
111539+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
111540 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
111541 ip_cmsg_recv(msg, skb);
111542 #endif
111543@@ -1117,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
111544 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
111545 0, sock_i_ino(sp),
111546 atomic_read(&sp->sk_refcnt), sp,
111547- atomic_read(&sp->sk_drops));
111548+ atomic_read_unchecked(&sp->sk_drops));
111549 }
111550
111551 static int ping_v4_seq_show(struct seq_file *seq, void *v)
111552diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
111553index f027a70..2e64edc 100644
111554--- a/net/ipv4/raw.c
111555+++ b/net/ipv4/raw.c
111556@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
111557 int raw_rcv(struct sock *sk, struct sk_buff *skb)
111558 {
111559 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
111560- atomic_inc(&sk->sk_drops);
111561+ atomic_inc_unchecked(&sk->sk_drops);
111562 kfree_skb(skb);
111563 return NET_RX_DROP;
111564 }
111565@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
111566
111567 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
111568 {
111569+ struct icmp_filter filter;
111570+
111571 if (optlen > sizeof(struct icmp_filter))
111572 optlen = sizeof(struct icmp_filter);
111573- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
111574+ if (copy_from_user(&filter, optval, optlen))
111575 return -EFAULT;
111576+ raw_sk(sk)->filter = filter;
111577 return 0;
111578 }
111579
111580 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
111581 {
111582 int len, ret = -EFAULT;
111583+ struct icmp_filter filter;
111584
111585 if (get_user(len, optlen))
111586 goto out;
111587@@ -792,8 +796,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
111588 if (len > sizeof(struct icmp_filter))
111589 len = sizeof(struct icmp_filter);
111590 ret = -EFAULT;
111591- if (put_user(len, optlen) ||
111592- copy_to_user(optval, &raw_sk(sk)->filter, len))
111593+ filter = raw_sk(sk)->filter;
111594+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
111595 goto out;
111596 ret = 0;
111597 out: return ret;
111598@@ -1022,7 +1026,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
111599 0, 0L, 0,
111600 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
111601 0, sock_i_ino(sp),
111602- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
111603+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
111604 }
111605
111606 static int raw_seq_show(struct seq_file *seq, void *v)
111607diff --git a/net/ipv4/route.c b/net/ipv4/route.c
111608index 20fc020..3ba426f 100644
111609--- a/net/ipv4/route.c
111610+++ b/net/ipv4/route.c
111611@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
111612
111613 static int rt_cache_seq_open(struct inode *inode, struct file *file)
111614 {
111615- return seq_open(file, &rt_cache_seq_ops);
111616+ return seq_open_restrict(file, &rt_cache_seq_ops);
111617 }
111618
111619 static const struct file_operations rt_cache_seq_fops = {
111620@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
111621
111622 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
111623 {
111624- return seq_open(file, &rt_cpu_seq_ops);
111625+ return seq_open_restrict(file, &rt_cpu_seq_ops);
111626 }
111627
111628 static const struct file_operations rt_cpu_seq_fops = {
111629@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
111630
111631 static int rt_acct_proc_open(struct inode *inode, struct file *file)
111632 {
111633- return single_open(file, rt_acct_proc_show, NULL);
111634+ return single_open_restrict(file, rt_acct_proc_show, NULL);
111635 }
111636
111637 static const struct file_operations rt_acct_proc_fops = {
111638@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
111639
111640 #define IP_IDENTS_SZ 2048u
111641 struct ip_ident_bucket {
111642- atomic_t id;
111643+ atomic_unchecked_t id;
111644 u32 stamp32;
111645 };
111646
111647-static struct ip_ident_bucket *ip_idents __read_mostly;
111648+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
111649
111650 /* In order to protect privacy, we add a perturbation to identifiers
111651 * if one generator is seldom used. This makes hard for an attacker
111652@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
111653 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
111654 delta = prandom_u32_max(now - old);
111655
111656- return atomic_add_return(segs + delta, &bucket->id) - segs;
111657+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
111658 }
111659 EXPORT_SYMBOL(ip_idents_reserve);
111660
111661@@ -2639,34 +2639,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
111662 .maxlen = sizeof(int),
111663 .mode = 0200,
111664 .proc_handler = ipv4_sysctl_rtcache_flush,
111665+ .extra1 = &init_net,
111666 },
111667 { },
111668 };
111669
111670 static __net_init int sysctl_route_net_init(struct net *net)
111671 {
111672- struct ctl_table *tbl;
111673+ ctl_table_no_const *tbl = NULL;
111674
111675- tbl = ipv4_route_flush_table;
111676 if (!net_eq(net, &init_net)) {
111677- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111678+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111679 if (tbl == NULL)
111680 goto err_dup;
111681
111682 /* Don't export sysctls to unprivileged users */
111683 if (net->user_ns != &init_user_ns)
111684 tbl[0].procname = NULL;
111685- }
111686- tbl[0].extra1 = net;
111687+ tbl[0].extra1 = net;
111688+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111689+ } else
111690+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
111691
111692- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111693 if (net->ipv4.route_hdr == NULL)
111694 goto err_reg;
111695 return 0;
111696
111697 err_reg:
111698- if (tbl != ipv4_route_flush_table)
111699- kfree(tbl);
111700+ kfree(tbl);
111701 err_dup:
111702 return -ENOMEM;
111703 }
111704@@ -2689,8 +2689,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
111705
111706 static __net_init int rt_genid_init(struct net *net)
111707 {
111708- atomic_set(&net->ipv4.rt_genid, 0);
111709- atomic_set(&net->fnhe_genid, 0);
111710+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
111711+ atomic_set_unchecked(&net->fnhe_genid, 0);
111712 get_random_bytes(&net->ipv4.dev_addr_genid,
111713 sizeof(net->ipv4.dev_addr_genid));
111714 return 0;
111715@@ -2734,11 +2734,7 @@ int __init ip_rt_init(void)
111716 int rc = 0;
111717 int cpu;
111718
111719- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
111720- if (!ip_idents)
111721- panic("IP: failed to allocate ip_idents\n");
111722-
111723- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
111724+ prandom_bytes(ip_idents, sizeof(ip_idents));
111725
111726 for_each_possible_cpu(cpu) {
111727 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
111728diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
111729index d151539..5f5e247 100644
111730--- a/net/ipv4/sysctl_net_ipv4.c
111731+++ b/net/ipv4/sysctl_net_ipv4.c
111732@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
111733 container_of(table->data, struct net, ipv4.ip_local_ports.range);
111734 int ret;
111735 int range[2];
111736- struct ctl_table tmp = {
111737+ ctl_table_no_const tmp = {
111738 .data = &range,
111739 .maxlen = sizeof(range),
111740 .mode = table->mode,
111741@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
111742 int ret;
111743 gid_t urange[2];
111744 kgid_t low, high;
111745- struct ctl_table tmp = {
111746+ ctl_table_no_const tmp = {
111747 .data = &urange,
111748 .maxlen = sizeof(urange),
111749 .mode = table->mode,
111750@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
111751 void __user *buffer, size_t *lenp, loff_t *ppos)
111752 {
111753 char val[TCP_CA_NAME_MAX];
111754- struct ctl_table tbl = {
111755+ ctl_table_no_const tbl = {
111756 .data = val,
111757 .maxlen = TCP_CA_NAME_MAX,
111758 };
111759@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
111760 void __user *buffer, size_t *lenp,
111761 loff_t *ppos)
111762 {
111763- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
111764+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
111765 int ret;
111766
111767 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
111768@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
111769 void __user *buffer, size_t *lenp,
111770 loff_t *ppos)
111771 {
111772- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
111773+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
111774 int ret;
111775
111776 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
111777@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
111778 void __user *buffer, size_t *lenp,
111779 loff_t *ppos)
111780 {
111781- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
111782+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
111783 struct tcp_fastopen_context *ctxt;
111784 int ret;
111785 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
111786@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
111787
111788 static __net_init int ipv4_sysctl_init_net(struct net *net)
111789 {
111790- struct ctl_table *table;
111791+ ctl_table_no_const *table = NULL;
111792
111793- table = ipv4_net_table;
111794 if (!net_eq(net, &init_net)) {
111795 int i;
111796
111797- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
111798+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
111799 if (table == NULL)
111800 goto err_alloc;
111801
111802@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
111803 table[i].data += (void *)net - (void *)&init_net;
111804 }
111805
111806- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
111807+ if (!net_eq(net, &init_net))
111808+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
111809+ else
111810+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
111811 if (net->ipv4.ipv4_hdr == NULL)
111812 goto err_reg;
111813
111814diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
111815index 995a225..e1e9183 100644
111816--- a/net/ipv4/tcp.c
111817+++ b/net/ipv4/tcp.c
111818@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
111819
111820 /* Race breaker. If space is freed after
111821 * wspace test but before the flags are set,
111822- * IO signal will be lost.
111823+ * IO signal will be lost. Memory barrier
111824+ * pairs with the input side.
111825 */
111826+ smp_mb__after_atomic();
111827 if (sk_stream_is_writeable(sk))
111828 mask |= POLLOUT | POLLWRNORM;
111829 }
111830diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
111831index f501ac04..0c5a1b2 100644
111832--- a/net/ipv4/tcp_input.c
111833+++ b/net/ipv4/tcp_input.c
111834@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
111835 * without any lock. We want to make sure compiler wont store
111836 * intermediate values in this location.
111837 */
111838- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
111839+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
111840 sk->sk_max_pacing_rate);
111841 }
111842
111843@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
111844 * simplifies code)
111845 */
111846 static void
111847-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
111848+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
111849 struct sk_buff *head, struct sk_buff *tail,
111850 u32 start, u32 end)
111851 {
111852@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
111853 {
111854 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
111855 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
111856+ /* pairs with tcp_poll() */
111857+ smp_mb__after_atomic();
111858 if (sk->sk_socket &&
111859 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
111860 tcp_new_space(sk);
111861@@ -5525,6 +5527,7 @@ discard:
111862 tcp_paws_reject(&tp->rx_opt, 0))
111863 goto discard_and_undo;
111864
111865+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
111866 if (th->syn) {
111867 /* We see SYN without ACK. It is attempt of
111868 * simultaneous connect with crossed SYNs.
111869@@ -5575,6 +5578,7 @@ discard:
111870 goto discard;
111871 #endif
111872 }
111873+#endif
111874 /* "fifth, if neither of the SYN or RST bits is set then
111875 * drop the segment and return."
111876 */
111877@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
111878 goto discard;
111879
111880 if (th->syn) {
111881- if (th->fin)
111882+ if (th->fin || th->urg || th->psh)
111883 goto discard;
111884 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
111885 return 1;
111886diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
111887index f1756ee..8908cb0 100644
111888--- a/net/ipv4/tcp_ipv4.c
111889+++ b/net/ipv4/tcp_ipv4.c
111890@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
111891 int sysctl_tcp_low_latency __read_mostly;
111892 EXPORT_SYMBOL(sysctl_tcp_low_latency);
111893
111894+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111895+extern int grsec_enable_blackhole;
111896+#endif
111897+
111898 #ifdef CONFIG_TCP_MD5SIG
111899 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
111900 __be32 daddr, __be32 saddr, const struct tcphdr *th);
111901@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
111902 return 0;
111903
111904 reset:
111905+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111906+ if (!grsec_enable_blackhole)
111907+#endif
111908 tcp_v4_send_reset(rsk, skb);
111909 discard:
111910 kfree_skb(skb);
111911@@ -1639,12 +1646,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
111912 TCP_SKB_CB(skb)->sacked = 0;
111913
111914 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
111915- if (!sk)
111916+ if (!sk) {
111917+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111918+ ret = 1;
111919+#endif
111920 goto no_tcp_socket;
111921-
111922+ }
111923 process:
111924- if (sk->sk_state == TCP_TIME_WAIT)
111925+ if (sk->sk_state == TCP_TIME_WAIT) {
111926+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111927+ ret = 2;
111928+#endif
111929 goto do_time_wait;
111930+ }
111931
111932 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
111933 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
111934@@ -1700,6 +1714,10 @@ csum_error:
111935 bad_packet:
111936 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
111937 } else {
111938+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111939+ if (!grsec_enable_blackhole || (ret == 1 &&
111940+ (skb->dev->flags & IFF_LOOPBACK)))
111941+#endif
111942 tcp_v4_send_reset(NULL, skb);
111943 }
111944
111945diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
111946index dd11ac7..c0872da 100644
111947--- a/net/ipv4/tcp_minisocks.c
111948+++ b/net/ipv4/tcp_minisocks.c
111949@@ -27,6 +27,10 @@
111950 #include <net/inet_common.h>
111951 #include <net/xfrm.h>
111952
111953+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111954+extern int grsec_enable_blackhole;
111955+#endif
111956+
111957 int sysctl_tcp_syncookies __read_mostly = 1;
111958 EXPORT_SYMBOL(sysctl_tcp_syncookies);
111959
111960@@ -785,7 +789,10 @@ embryonic_reset:
111961 * avoid becoming vulnerable to outside attack aiming at
111962 * resetting legit local connections.
111963 */
111964- req->rsk_ops->send_reset(sk, skb);
111965+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111966+ if (!grsec_enable_blackhole)
111967+#endif
111968+ req->rsk_ops->send_reset(sk, skb);
111969 } else if (fastopen) { /* received a valid RST pkt */
111970 reqsk_fastopen_remove(sk, req, true);
111971 tcp_reset(sk);
111972diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
111973index ebf5ff5..4d1ff32 100644
111974--- a/net/ipv4/tcp_probe.c
111975+++ b/net/ipv4/tcp_probe.c
111976@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
111977 if (cnt + width >= len)
111978 break;
111979
111980- if (copy_to_user(buf + cnt, tbuf, width))
111981+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
111982 return -EFAULT;
111983 cnt += width;
111984 }
111985diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
111986index 0732b78..a82bdc6 100644
111987--- a/net/ipv4/tcp_timer.c
111988+++ b/net/ipv4/tcp_timer.c
111989@@ -22,6 +22,10 @@
111990 #include <linux/gfp.h>
111991 #include <net/tcp.h>
111992
111993+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111994+extern int grsec_lastack_retries;
111995+#endif
111996+
111997 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
111998 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
111999 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
112000@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
112001 }
112002 }
112003
112004+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112005+ if ((sk->sk_state == TCP_LAST_ACK) &&
112006+ (grsec_lastack_retries > 0) &&
112007+ (grsec_lastack_retries < retry_until))
112008+ retry_until = grsec_lastack_retries;
112009+#endif
112010+
112011 if (retransmits_timed_out(sk, retry_until,
112012 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
112013 /* Has it gone just too far? */
112014diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
112015index 97ef1f8b..abeb965 100644
112016--- a/net/ipv4/udp.c
112017+++ b/net/ipv4/udp.c
112018@@ -87,6 +87,7 @@
112019 #include <linux/types.h>
112020 #include <linux/fcntl.h>
112021 #include <linux/module.h>
112022+#include <linux/security.h>
112023 #include <linux/socket.h>
112024 #include <linux/sockios.h>
112025 #include <linux/igmp.h>
112026@@ -114,6 +115,10 @@
112027 #include <net/busy_poll.h>
112028 #include "udp_impl.h"
112029
112030+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112031+extern int grsec_enable_blackhole;
112032+#endif
112033+
112034 struct udp_table udp_table __read_mostly;
112035 EXPORT_SYMBOL(udp_table);
112036
112037@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
112038 return true;
112039 }
112040
112041+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
112042+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
112043+
112044 /*
112045 * This routine is called by the ICMP module when it gets some
112046 * sort of error condition. If err < 0 then the socket should
112047@@ -945,9 +953,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
112048 dport = usin->sin_port;
112049 if (dport == 0)
112050 return -EINVAL;
112051+
112052+ err = gr_search_udp_sendmsg(sk, usin);
112053+ if (err)
112054+ return err;
112055 } else {
112056 if (sk->sk_state != TCP_ESTABLISHED)
112057 return -EDESTADDRREQ;
112058+
112059+ err = gr_search_udp_sendmsg(sk, NULL);
112060+ if (err)
112061+ return err;
112062+
112063 daddr = inet->inet_daddr;
112064 dport = inet->inet_dport;
112065 /* Open fast path for connected socket.
112066@@ -1195,7 +1212,7 @@ static unsigned int first_packet_length(struct sock *sk)
112067 IS_UDPLITE(sk));
112068 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112069 IS_UDPLITE(sk));
112070- atomic_inc(&sk->sk_drops);
112071+ atomic_inc_unchecked(&sk->sk_drops);
112072 __skb_unlink(skb, rcvq);
112073 __skb_queue_tail(&list_kill, skb);
112074 }
112075@@ -1275,6 +1292,10 @@ try_again:
112076 if (!skb)
112077 goto out;
112078
112079+ err = gr_search_udp_recvmsg(sk, skb);
112080+ if (err)
112081+ goto out_free;
112082+
112083 ulen = skb->len - sizeof(struct udphdr);
112084 copied = len;
112085 if (copied > ulen)
112086@@ -1307,7 +1328,7 @@ try_again:
112087 if (unlikely(err)) {
112088 trace_kfree_skb(skb, udp_recvmsg);
112089 if (!peeked) {
112090- atomic_inc(&sk->sk_drops);
112091+ atomic_inc_unchecked(&sk->sk_drops);
112092 UDP_INC_STATS_USER(sock_net(sk),
112093 UDP_MIB_INERRORS, is_udplite);
112094 }
112095@@ -1348,10 +1369,8 @@ csum_copy_err:
112096 }
112097 unlock_sock_fast(sk, slow);
112098
112099- if (noblock)
112100- return -EAGAIN;
112101-
112102- /* starting over for a new packet */
112103+ /* starting over for a new packet, but check if we need to yield */
112104+ cond_resched();
112105 msg->msg_flags &= ~MSG_TRUNC;
112106 goto try_again;
112107 }
112108@@ -1605,7 +1624,7 @@ csum_error:
112109 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112110 drop:
112111 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112112- atomic_inc(&sk->sk_drops);
112113+ atomic_inc_unchecked(&sk->sk_drops);
112114 kfree_skb(skb);
112115 return -1;
112116 }
112117@@ -1624,7 +1643,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112118 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112119
112120 if (!skb1) {
112121- atomic_inc(&sk->sk_drops);
112122+ atomic_inc_unchecked(&sk->sk_drops);
112123 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112124 IS_UDPLITE(sk));
112125 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112126@@ -1830,6 +1849,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112127 goto csum_error;
112128
112129 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112130+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112131+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112132+#endif
112133 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
112134
112135 /*
112136@@ -2416,7 +2438,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
112137 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
112138 0, sock_i_ino(sp),
112139 atomic_read(&sp->sk_refcnt), sp,
112140- atomic_read(&sp->sk_drops));
112141+ atomic_read_unchecked(&sp->sk_drops));
112142 }
112143
112144 int udp4_seq_show(struct seq_file *seq, void *v)
112145diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
112146index 6156f68..d6ab46d 100644
112147--- a/net/ipv4/xfrm4_policy.c
112148+++ b/net/ipv4/xfrm4_policy.c
112149@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
112150 fl4->flowi4_tos = iph->tos;
112151 }
112152
112153-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
112154+static int xfrm4_garbage_collect(struct dst_ops *ops)
112155 {
112156 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
112157
112158- xfrm4_policy_afinfo.garbage_collect(net);
112159+ xfrm_garbage_collect_deferred(net);
112160 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
112161 }
112162
112163@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
112164
112165 static int __net_init xfrm4_net_init(struct net *net)
112166 {
112167- struct ctl_table *table;
112168+ ctl_table_no_const *table = NULL;
112169 struct ctl_table_header *hdr;
112170
112171- table = xfrm4_policy_table;
112172 if (!net_eq(net, &init_net)) {
112173- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112174+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112175 if (!table)
112176 goto err_alloc;
112177
112178 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
112179- }
112180-
112181- hdr = register_net_sysctl(net, "net/ipv4", table);
112182+ hdr = register_net_sysctl(net, "net/ipv4", table);
112183+ } else
112184+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
112185 if (!hdr)
112186 goto err_reg;
112187
112188@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
112189 return 0;
112190
112191 err_reg:
112192- if (!net_eq(net, &init_net))
112193- kfree(table);
112194+ kfree(table);
112195 err_alloc:
112196 return -ENOMEM;
112197 }
112198diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
112199index b603002..0de5c88 100644
112200--- a/net/ipv6/addrconf.c
112201+++ b/net/ipv6/addrconf.c
112202@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
112203 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112204 .mtu6 = IPV6_MIN_MTU,
112205 .accept_ra = 1,
112206- .accept_redirects = 1,
112207+ .accept_redirects = 0,
112208 .autoconf = 1,
112209 .force_mld_version = 0,
112210 .mldv1_unsolicited_report_interval = 10 * HZ,
112211@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
112212 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112213 .mtu6 = IPV6_MIN_MTU,
112214 .accept_ra = 1,
112215- .accept_redirects = 1,
112216+ .accept_redirects = 0,
112217 .autoconf = 1,
112218 .force_mld_version = 0,
112219 .mldv1_unsolicited_report_interval = 10 * HZ,
112220@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
112221 idx = 0;
112222 head = &net->dev_index_head[h];
112223 rcu_read_lock();
112224- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
112225+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
112226 net->dev_base_seq;
112227 hlist_for_each_entry_rcu(dev, head, index_hlist) {
112228 if (idx < s_idx)
112229@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
112230 p.iph.ihl = 5;
112231 p.iph.protocol = IPPROTO_IPV6;
112232 p.iph.ttl = 64;
112233- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
112234+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
112235
112236 if (ops->ndo_do_ioctl) {
112237 mm_segment_t oldfs = get_fs();
112238@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
112239 .release = seq_release_net,
112240 };
112241
112242+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
112243+extern void unregister_ipv6_seq_ops_addr(void);
112244+
112245 static int __net_init if6_proc_net_init(struct net *net)
112246 {
112247- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
112248+ register_ipv6_seq_ops_addr(&if6_seq_ops);
112249+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
112250+ unregister_ipv6_seq_ops_addr();
112251 return -ENOMEM;
112252+ }
112253 return 0;
112254 }
112255
112256 static void __net_exit if6_proc_net_exit(struct net *net)
112257 {
112258 remove_proc_entry("if_inet6", net->proc_net);
112259+ unregister_ipv6_seq_ops_addr();
112260 }
112261
112262 static struct pernet_operations if6_proc_net_ops = {
112263@@ -4215,7 +4222,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
112264 s_ip_idx = ip_idx = cb->args[2];
112265
112266 rcu_read_lock();
112267- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112268+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112269 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
112270 idx = 0;
112271 head = &net->dev_index_head[h];
112272@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112273 rt_genid_bump_ipv6(net);
112274 break;
112275 }
112276- atomic_inc(&net->ipv6.dev_addr_genid);
112277+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
112278 }
112279
112280 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112281@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
112282 int *valp = ctl->data;
112283 int val = *valp;
112284 loff_t pos = *ppos;
112285- struct ctl_table lctl;
112286+ ctl_table_no_const lctl;
112287 int ret;
112288
112289 /*
112290@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
112291 {
112292 struct inet6_dev *idev = ctl->extra1;
112293 int min_mtu = IPV6_MIN_MTU;
112294- struct ctl_table lctl;
112295+ ctl_table_no_const lctl;
112296
112297 lctl = *ctl;
112298 lctl.extra1 = &min_mtu;
112299@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
112300 int *valp = ctl->data;
112301 int val = *valp;
112302 loff_t pos = *ppos;
112303- struct ctl_table lctl;
112304+ ctl_table_no_const lctl;
112305 int ret;
112306
112307 /*
112308diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
112309index 98cc4cd..0768c4e 100644
112310--- a/net/ipv6/addrconf_core.c
112311+++ b/net/ipv6/addrconf_core.c
112312@@ -133,6 +133,14 @@ static void snmp6_free_dev(struct inet6_dev *idev)
112313 free_percpu(idev->stats.ipv6);
112314 }
112315
112316+static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
112317+{
112318+ struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
112319+
112320+ snmp6_free_dev(idev);
112321+ kfree(idev);
112322+}
112323+
112324 /* Nobody refers to this device, we may destroy it. */
112325
112326 void in6_dev_finish_destroy(struct inet6_dev *idev)
112327@@ -151,7 +159,6 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
112328 pr_warn("Freeing alive inet6 device %p\n", idev);
112329 return;
112330 }
112331- snmp6_free_dev(idev);
112332- kfree_rcu(idev, rcu);
112333+ call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
112334 }
112335 EXPORT_SYMBOL(in6_dev_finish_destroy);
112336diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
112337index e8c4400..a4cd5da 100644
112338--- a/net/ipv6/af_inet6.c
112339+++ b/net/ipv6/af_inet6.c
112340@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
112341 net->ipv6.sysctl.icmpv6_time = 1*HZ;
112342 net->ipv6.sysctl.flowlabel_consistency = 1;
112343 net->ipv6.sysctl.auto_flowlabels = 0;
112344- atomic_set(&net->ipv6.fib6_sernum, 1);
112345+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
112346
112347 err = ipv6_init_mibs(net);
112348 if (err)
112349diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
112350index ace8dac..bd6942d 100644
112351--- a/net/ipv6/datagram.c
112352+++ b/net/ipv6/datagram.c
112353@@ -957,5 +957,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
112354 0,
112355 sock_i_ino(sp),
112356 atomic_read(&sp->sk_refcnt), sp,
112357- atomic_read(&sp->sk_drops));
112358+ atomic_read_unchecked(&sp->sk_drops));
112359 }
112360diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
112361index a5e9519..16b7412 100644
112362--- a/net/ipv6/icmp.c
112363+++ b/net/ipv6/icmp.c
112364@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
112365
112366 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
112367 {
112368- struct ctl_table *table;
112369+ ctl_table_no_const *table;
112370
112371 table = kmemdup(ipv6_icmp_table_template,
112372 sizeof(ipv6_icmp_table_template),
112373diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
112374index 263ef41..88c7be8 100644
112375--- a/net/ipv6/ip6_fib.c
112376+++ b/net/ipv6/ip6_fib.c
112377@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
112378 int new, old;
112379
112380 do {
112381- old = atomic_read(&net->ipv6.fib6_sernum);
112382+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
112383 new = old < INT_MAX ? old + 1 : 1;
112384- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
112385+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
112386 old, new) != old);
112387 return new;
112388 }
112389diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
112390index bc28b7d..a08feea 100644
112391--- a/net/ipv6/ip6_gre.c
112392+++ b/net/ipv6/ip6_gre.c
112393@@ -71,8 +71,8 @@ struct ip6gre_net {
112394 struct net_device *fb_tunnel_dev;
112395 };
112396
112397-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
112398-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
112399+static struct rtnl_link_ops ip6gre_link_ops;
112400+static struct rtnl_link_ops ip6gre_tap_ops;
112401 static int ip6gre_tunnel_init(struct net_device *dev);
112402 static void ip6gre_tunnel_setup(struct net_device *dev);
112403 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
112404@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
112405 }
112406
112407
112408-static struct inet6_protocol ip6gre_protocol __read_mostly = {
112409+static struct inet6_protocol ip6gre_protocol = {
112410 .handler = ip6gre_rcv,
112411 .err_handler = ip6gre_err,
112412 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
112413@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
112414 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
112415 };
112416
112417-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112418+static struct rtnl_link_ops ip6gre_link_ops = {
112419 .kind = "ip6gre",
112420 .maxtype = IFLA_GRE_MAX,
112421 .policy = ip6gre_policy,
112422@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112423 .get_link_net = ip6_tnl_get_link_net,
112424 };
112425
112426-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
112427+static struct rtnl_link_ops ip6gre_tap_ops = {
112428 .kind = "ip6gretap",
112429 .maxtype = IFLA_GRE_MAX,
112430 .policy = ip6gre_policy,
112431diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
112432index ddd94ec..b7cfefb 100644
112433--- a/net/ipv6/ip6_tunnel.c
112434+++ b/net/ipv6/ip6_tunnel.c
112435@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112436
112437 static int ip6_tnl_dev_init(struct net_device *dev);
112438 static void ip6_tnl_dev_setup(struct net_device *dev);
112439-static struct rtnl_link_ops ip6_link_ops __read_mostly;
112440+static struct rtnl_link_ops ip6_link_ops;
112441
112442 static int ip6_tnl_net_id __read_mostly;
112443 struct ip6_tnl_net {
112444@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
112445 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
112446 };
112447
112448-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
112449+static struct rtnl_link_ops ip6_link_ops = {
112450 .kind = "ip6tnl",
112451 .maxtype = IFLA_IPTUN_MAX,
112452 .policy = ip6_tnl_policy,
112453diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
112454index 5fb9e21..92bf04b 100644
112455--- a/net/ipv6/ip6_vti.c
112456+++ b/net/ipv6/ip6_vti.c
112457@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112458
112459 static int vti6_dev_init(struct net_device *dev);
112460 static void vti6_dev_setup(struct net_device *dev);
112461-static struct rtnl_link_ops vti6_link_ops __read_mostly;
112462+static struct rtnl_link_ops vti6_link_ops;
112463
112464 static int vti6_net_id __read_mostly;
112465 struct vti6_net {
112466@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
112467 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
112468 };
112469
112470-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
112471+static struct rtnl_link_ops vti6_link_ops = {
112472 .kind = "vti6",
112473 .maxtype = IFLA_VTI_MAX,
112474 .policy = vti6_policy,
112475diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
112476index 8d766d9..dcdfea7 100644
112477--- a/net/ipv6/ipv6_sockglue.c
112478+++ b/net/ipv6/ipv6_sockglue.c
112479@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
112480 if (sk->sk_type != SOCK_STREAM)
112481 return -ENOPROTOOPT;
112482
112483- msg.msg_control = optval;
112484+ msg.msg_control = (void __force_kernel *)optval;
112485 msg.msg_controllen = len;
112486 msg.msg_flags = flags;
112487
112488diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
112489index bb00c6f..16c90d7 100644
112490--- a/net/ipv6/netfilter/ip6_tables.c
112491+++ b/net/ipv6/netfilter/ip6_tables.c
112492@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
112493 #endif
112494
112495 static int get_info(struct net *net, void __user *user,
112496- const int *len, int compat)
112497+ int len, int compat)
112498 {
112499 char name[XT_TABLE_MAXNAMELEN];
112500 struct xt_table *t;
112501 int ret;
112502
112503- if (*len != sizeof(struct ip6t_getinfo)) {
112504- duprintf("length %u != %zu\n", *len,
112505+ if (len != sizeof(struct ip6t_getinfo)) {
112506+ duprintf("length %u != %zu\n", len,
112507 sizeof(struct ip6t_getinfo));
112508 return -EINVAL;
112509 }
112510@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
112511 info.size = private->size;
112512 strcpy(info.name, name);
112513
112514- if (copy_to_user(user, &info, *len) != 0)
112515+ if (copy_to_user(user, &info, len) != 0)
112516 ret = -EFAULT;
112517 else
112518 ret = 0;
112519@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112520
112521 switch (cmd) {
112522 case IP6T_SO_GET_INFO:
112523- ret = get_info(sock_net(sk), user, len, 1);
112524+ ret = get_info(sock_net(sk), user, *len, 1);
112525 break;
112526 case IP6T_SO_GET_ENTRIES:
112527 ret = compat_get_entries(sock_net(sk), user, len);
112528@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112529
112530 switch (cmd) {
112531 case IP6T_SO_GET_INFO:
112532- ret = get_info(sock_net(sk), user, len, 0);
112533+ ret = get_info(sock_net(sk), user, *len, 0);
112534 break;
112535
112536 case IP6T_SO_GET_ENTRIES:
112537diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
112538index 6f187c8..34b367f 100644
112539--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
112540+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
112541@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
112542
112543 static int nf_ct_frag6_sysctl_register(struct net *net)
112544 {
112545- struct ctl_table *table;
112546+ ctl_table_no_const *table = NULL;
112547 struct ctl_table_header *hdr;
112548
112549- table = nf_ct_frag6_sysctl_table;
112550 if (!net_eq(net, &init_net)) {
112551- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
112552+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
112553 GFP_KERNEL);
112554 if (table == NULL)
112555 goto err_alloc;
112556@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112557 table[2].data = &net->nf_frag.frags.high_thresh;
112558 table[2].extra1 = &net->nf_frag.frags.low_thresh;
112559 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
112560- }
112561-
112562- hdr = register_net_sysctl(net, "net/netfilter", table);
112563+ hdr = register_net_sysctl(net, "net/netfilter", table);
112564+ } else
112565+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
112566 if (hdr == NULL)
112567 goto err_reg;
112568
112569@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112570 return 0;
112571
112572 err_reg:
112573- if (!net_eq(net, &init_net))
112574- kfree(table);
112575+ kfree(table);
112576 err_alloc:
112577 return -ENOMEM;
112578 }
112579diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
112580index a2dfff6..1e52e6d 100644
112581--- a/net/ipv6/ping.c
112582+++ b/net/ipv6/ping.c
112583@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
112584 };
112585 #endif
112586
112587+static struct pingv6_ops real_pingv6_ops = {
112588+ .ipv6_recv_error = ipv6_recv_error,
112589+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
112590+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
112591+ .icmpv6_err_convert = icmpv6_err_convert,
112592+ .ipv6_icmp_error = ipv6_icmp_error,
112593+ .ipv6_chk_addr = ipv6_chk_addr,
112594+};
112595+
112596+static struct pingv6_ops dummy_pingv6_ops = {
112597+ .ipv6_recv_error = dummy_ipv6_recv_error,
112598+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
112599+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
112600+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
112601+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
112602+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
112603+};
112604+
112605 int __init pingv6_init(void)
112606 {
112607 #ifdef CONFIG_PROC_FS
112608@@ -248,13 +266,7 @@ int __init pingv6_init(void)
112609 if (ret)
112610 return ret;
112611 #endif
112612- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
112613- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
112614- pingv6_ops.ip6_datagram_recv_specific_ctl =
112615- ip6_datagram_recv_specific_ctl;
112616- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
112617- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
112618- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
112619+ pingv6_ops = &real_pingv6_ops;
112620 return inet6_register_protosw(&pingv6_protosw);
112621 }
112622
112623@@ -263,14 +275,9 @@ int __init pingv6_init(void)
112624 */
112625 void pingv6_exit(void)
112626 {
112627- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
112628- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
112629- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
112630- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
112631- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
112632- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
112633 #ifdef CONFIG_PROC_FS
112634 unregister_pernet_subsys(&ping_v6_net_ops);
112635 #endif
112636+ pingv6_ops = &dummy_pingv6_ops;
112637 inet6_unregister_protosw(&pingv6_protosw);
112638 }
112639diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
112640index 679253d0..70b653c 100644
112641--- a/net/ipv6/proc.c
112642+++ b/net/ipv6/proc.c
112643@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
112644 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
112645 goto proc_snmp6_fail;
112646
112647- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
112648+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
112649 if (!net->mib.proc_net_devsnmp6)
112650 goto proc_dev_snmp6_fail;
112651 return 0;
112652diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
112653index dae7f1a..783b20d 100644
112654--- a/net/ipv6/raw.c
112655+++ b/net/ipv6/raw.c
112656@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
112657 {
112658 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
112659 skb_checksum_complete(skb)) {
112660- atomic_inc(&sk->sk_drops);
112661+ atomic_inc_unchecked(&sk->sk_drops);
112662 kfree_skb(skb);
112663 return NET_RX_DROP;
112664 }
112665@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112666 struct raw6_sock *rp = raw6_sk(sk);
112667
112668 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
112669- atomic_inc(&sk->sk_drops);
112670+ atomic_inc_unchecked(&sk->sk_drops);
112671 kfree_skb(skb);
112672 return NET_RX_DROP;
112673 }
112674@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112675
112676 if (inet->hdrincl) {
112677 if (skb_checksum_complete(skb)) {
112678- atomic_inc(&sk->sk_drops);
112679+ atomic_inc_unchecked(&sk->sk_drops);
112680 kfree_skb(skb);
112681 return NET_RX_DROP;
112682 }
112683@@ -609,7 +609,7 @@ out:
112684 return err;
112685 }
112686
112687-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
112688+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
112689 struct flowi6 *fl6, struct dst_entry **dstp,
112690 unsigned int flags)
112691 {
112692@@ -915,12 +915,15 @@ do_confirm:
112693 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
112694 char __user *optval, int optlen)
112695 {
112696+ struct icmp6_filter filter;
112697+
112698 switch (optname) {
112699 case ICMPV6_FILTER:
112700 if (optlen > sizeof(struct icmp6_filter))
112701 optlen = sizeof(struct icmp6_filter);
112702- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
112703+ if (copy_from_user(&filter, optval, optlen))
112704 return -EFAULT;
112705+ raw6_sk(sk)->filter = filter;
112706 return 0;
112707 default:
112708 return -ENOPROTOOPT;
112709@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112710 char __user *optval, int __user *optlen)
112711 {
112712 int len;
112713+ struct icmp6_filter filter;
112714
112715 switch (optname) {
112716 case ICMPV6_FILTER:
112717@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112718 len = sizeof(struct icmp6_filter);
112719 if (put_user(len, optlen))
112720 return -EFAULT;
112721- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
112722+ filter = raw6_sk(sk)->filter;
112723+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
112724 return -EFAULT;
112725 return 0;
112726 default:
112727diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
112728index d7d70e6..bd5e9fc 100644
112729--- a/net/ipv6/reassembly.c
112730+++ b/net/ipv6/reassembly.c
112731@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
112732
112733 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112734 {
112735- struct ctl_table *table;
112736+ ctl_table_no_const *table = NULL;
112737 struct ctl_table_header *hdr;
112738
112739- table = ip6_frags_ns_ctl_table;
112740 if (!net_eq(net, &init_net)) {
112741- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
112742+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
112743 if (table == NULL)
112744 goto err_alloc;
112745
112746@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112747 /* Don't export sysctls to unprivileged users */
112748 if (net->user_ns != &init_user_ns)
112749 table[0].procname = NULL;
112750- }
112751+ hdr = register_net_sysctl(net, "net/ipv6", table);
112752+ } else
112753+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
112754
112755- hdr = register_net_sysctl(net, "net/ipv6", table);
112756 if (hdr == NULL)
112757 goto err_reg;
112758
112759@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112760 return 0;
112761
112762 err_reg:
112763- if (!net_eq(net, &init_net))
112764- kfree(table);
112765+ kfree(table);
112766 err_alloc:
112767 return -ENOMEM;
112768 }
112769diff --git a/net/ipv6/route.c b/net/ipv6/route.c
112770index 4688bd4..584453d 100644
112771--- a/net/ipv6/route.c
112772+++ b/net/ipv6/route.c
112773@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
112774
112775 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
112776 {
112777- struct ctl_table *table;
112778+ ctl_table_no_const *table;
112779
112780 table = kmemdup(ipv6_route_table_template,
112781 sizeof(ipv6_route_table_template),
112782diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
112783index e4cbd57..02b1aaa 100644
112784--- a/net/ipv6/sit.c
112785+++ b/net/ipv6/sit.c
112786@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
112787 static void ipip6_dev_free(struct net_device *dev);
112788 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
112789 __be32 *v4dst);
112790-static struct rtnl_link_ops sit_link_ops __read_mostly;
112791+static struct rtnl_link_ops sit_link_ops;
112792
112793 static int sit_net_id __read_mostly;
112794 struct sit_net {
112795@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
112796 unregister_netdevice_queue(dev, head);
112797 }
112798
112799-static struct rtnl_link_ops sit_link_ops __read_mostly = {
112800+static struct rtnl_link_ops sit_link_ops = {
112801 .kind = "sit",
112802 .maxtype = IFLA_IPTUN_MAX,
112803 .policy = ipip6_policy,
112804diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
112805index c5c10fa..2577d51 100644
112806--- a/net/ipv6/sysctl_net_ipv6.c
112807+++ b/net/ipv6/sysctl_net_ipv6.c
112808@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
112809
112810 static int __net_init ipv6_sysctl_net_init(struct net *net)
112811 {
112812- struct ctl_table *ipv6_table;
112813+ ctl_table_no_const *ipv6_table;
112814 struct ctl_table *ipv6_route_table;
112815 struct ctl_table *ipv6_icmp_table;
112816 int err;
112817diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
112818index 1f5e622..8387d90 100644
112819--- a/net/ipv6/tcp_ipv6.c
112820+++ b/net/ipv6/tcp_ipv6.c
112821@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
112822 }
112823 }
112824
112825+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112826+extern int grsec_enable_blackhole;
112827+#endif
112828+
112829 static void tcp_v6_hash(struct sock *sk)
112830 {
112831 if (sk->sk_state != TCP_CLOSE) {
112832@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
112833 return 0;
112834
112835 reset:
112836+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112837+ if (!grsec_enable_blackhole)
112838+#endif
112839 tcp_v6_send_reset(sk, skb);
112840 discard:
112841 if (opt_skb)
112842@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
112843
112844 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
112845 inet6_iif(skb));
112846- if (!sk)
112847+ if (!sk) {
112848+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112849+ ret = 1;
112850+#endif
112851 goto no_tcp_socket;
112852+ }
112853
112854 process:
112855- if (sk->sk_state == TCP_TIME_WAIT)
112856+ if (sk->sk_state == TCP_TIME_WAIT) {
112857+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112858+ ret = 2;
112859+#endif
112860 goto do_time_wait;
112861+ }
112862
112863 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
112864 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
112865@@ -1510,6 +1525,10 @@ csum_error:
112866 bad_packet:
112867 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
112868 } else {
112869+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112870+ if (!grsec_enable_blackhole || (ret == 1 &&
112871+ (skb->dev->flags & IFF_LOOPBACK)))
112872+#endif
112873 tcp_v6_send_reset(NULL, skb);
112874 }
112875
112876diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
112877index d048d46..cacb4d2 100644
112878--- a/net/ipv6/udp.c
112879+++ b/net/ipv6/udp.c
112880@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
112881 udp_ipv6_hash_secret + net_hash_mix(net));
112882 }
112883
112884+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112885+extern int grsec_enable_blackhole;
112886+#endif
112887+
112888 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
112889 {
112890 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
112891@@ -448,7 +452,7 @@ try_again:
112892 if (unlikely(err)) {
112893 trace_kfree_skb(skb, udpv6_recvmsg);
112894 if (!peeked) {
112895- atomic_inc(&sk->sk_drops);
112896+ atomic_inc_unchecked(&sk->sk_drops);
112897 if (is_udp4)
112898 UDP_INC_STATS_USER(sock_net(sk),
112899 UDP_MIB_INERRORS,
112900@@ -528,10 +532,8 @@ csum_copy_err:
112901 }
112902 unlock_sock_fast(sk, slow);
112903
112904- if (noblock)
112905- return -EAGAIN;
112906-
112907- /* starting over for a new packet */
112908+ /* starting over for a new packet, but check if we need to yield */
112909+ cond_resched();
112910 msg->msg_flags &= ~MSG_TRUNC;
112911 goto try_again;
112912 }
112913@@ -714,7 +716,7 @@ csum_error:
112914 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112915 drop:
112916 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112917- atomic_inc(&sk->sk_drops);
112918+ atomic_inc_unchecked(&sk->sk_drops);
112919 kfree_skb(skb);
112920 return -1;
112921 }
112922@@ -753,7 +755,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112923 if (likely(skb1 == NULL))
112924 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112925 if (!skb1) {
112926- atomic_inc(&sk->sk_drops);
112927+ atomic_inc_unchecked(&sk->sk_drops);
112928 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112929 IS_UDPLITE(sk));
112930 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112931@@ -937,6 +939,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112932 goto csum_error;
112933
112934 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112935+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112936+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112937+#endif
112938 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
112939
112940 kfree_skb(skb);
112941diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
112942index 8d2d01b4..313511e 100644
112943--- a/net/ipv6/xfrm6_policy.c
112944+++ b/net/ipv6/xfrm6_policy.c
112945@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
112946 }
112947 }
112948
112949-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
112950+static int xfrm6_garbage_collect(struct dst_ops *ops)
112951 {
112952 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
112953
112954- xfrm6_policy_afinfo.garbage_collect(net);
112955+ xfrm_garbage_collect_deferred(net);
112956 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
112957 }
112958
112959@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
112960
112961 static int __net_init xfrm6_net_init(struct net *net)
112962 {
112963- struct ctl_table *table;
112964+ ctl_table_no_const *table = NULL;
112965 struct ctl_table_header *hdr;
112966
112967- table = xfrm6_policy_table;
112968 if (!net_eq(net, &init_net)) {
112969- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
112970+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
112971 if (!table)
112972 goto err_alloc;
112973
112974 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
112975- }
112976+ hdr = register_net_sysctl(net, "net/ipv6", table);
112977+ } else
112978+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
112979
112980- hdr = register_net_sysctl(net, "net/ipv6", table);
112981 if (!hdr)
112982 goto err_reg;
112983
112984@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
112985 return 0;
112986
112987 err_reg:
112988- if (!net_eq(net, &init_net))
112989- kfree(table);
112990+ kfree(table);
112991 err_alloc:
112992 return -ENOMEM;
112993 }
112994diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
112995index c1d247e..9e5949d 100644
112996--- a/net/ipx/ipx_proc.c
112997+++ b/net/ipx/ipx_proc.c
112998@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
112999 struct proc_dir_entry *p;
113000 int rc = -ENOMEM;
113001
113002- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
113003+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
113004
113005 if (!ipx_proc_dir)
113006 goto out;
113007diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
113008index 683346d..cb0e12d 100644
113009--- a/net/irda/ircomm/ircomm_tty.c
113010+++ b/net/irda/ircomm/ircomm_tty.c
113011@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113012 add_wait_queue(&port->open_wait, &wait);
113013
113014 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
113015- __FILE__, __LINE__, tty->driver->name, port->count);
113016+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113017
113018 spin_lock_irqsave(&port->lock, flags);
113019- port->count--;
113020+ atomic_dec(&port->count);
113021 port->blocked_open++;
113022 spin_unlock_irqrestore(&port->lock, flags);
113023
113024@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113025 }
113026
113027 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
113028- __FILE__, __LINE__, tty->driver->name, port->count);
113029+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113030
113031 schedule();
113032 }
113033@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113034
113035 spin_lock_irqsave(&port->lock, flags);
113036 if (!tty_hung_up_p(filp))
113037- port->count++;
113038+ atomic_inc(&port->count);
113039 port->blocked_open--;
113040 spin_unlock_irqrestore(&port->lock, flags);
113041
113042 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
113043- __FILE__, __LINE__, tty->driver->name, port->count);
113044+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113045
113046 if (!retval)
113047 port->flags |= ASYNC_NORMAL_ACTIVE;
113048@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
113049
113050 /* ++ is not atomic, so this should be protected - Jean II */
113051 spin_lock_irqsave(&self->port.lock, flags);
113052- self->port.count++;
113053+ atomic_inc(&self->port.count);
113054 spin_unlock_irqrestore(&self->port.lock, flags);
113055 tty_port_tty_set(&self->port, tty);
113056
113057 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
113058- self->line, self->port.count);
113059+ self->line, atomic_read(&self->port.count));
113060
113061 /* Not really used by us, but lets do it anyway */
113062 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
113063@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
113064 tty_kref_put(port->tty);
113065 }
113066 port->tty = NULL;
113067- port->count = 0;
113068+ atomic_set(&port->count, 0);
113069 spin_unlock_irqrestore(&port->lock, flags);
113070
113071 wake_up_interruptible(&port->open_wait);
113072@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
113073 seq_putc(m, '\n');
113074
113075 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
113076- seq_printf(m, "Open count: %d\n", self->port.count);
113077+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
113078 seq_printf(m, "Max data size: %d\n", self->max_data_size);
113079 seq_printf(m, "Max header size: %d\n", self->max_header_size);
113080
113081diff --git a/net/irda/irproc.c b/net/irda/irproc.c
113082index b9ac598..f88cc56 100644
113083--- a/net/irda/irproc.c
113084+++ b/net/irda/irproc.c
113085@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
113086 {
113087 int i;
113088
113089- proc_irda = proc_mkdir("irda", init_net.proc_net);
113090+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
113091 if (proc_irda == NULL)
113092 return;
113093
113094diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
113095index 53d9311..cbaf99f 100644
113096--- a/net/iucv/af_iucv.c
113097+++ b/net/iucv/af_iucv.c
113098@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
113099 {
113100 char name[12];
113101
113102- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
113103+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113104 while (__iucv_get_sock_by_name(name)) {
113105 sprintf(name, "%08x",
113106- atomic_inc_return(&iucv_sk_list.autobind_name));
113107+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113108 }
113109 memcpy(iucv->src_name, name, 8);
113110 }
113111diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
113112index 2a6a1fd..6c112b0 100644
113113--- a/net/iucv/iucv.c
113114+++ b/net/iucv/iucv.c
113115@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
113116 return NOTIFY_OK;
113117 }
113118
113119-static struct notifier_block __refdata iucv_cpu_notifier = {
113120+static struct notifier_block iucv_cpu_notifier = {
113121 .notifier_call = iucv_cpu_notify,
113122 };
113123
113124diff --git a/net/key/af_key.c b/net/key/af_key.c
113125index f8ac939..1e189bf 100644
113126--- a/net/key/af_key.c
113127+++ b/net/key/af_key.c
113128@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
113129 static u32 get_acqseq(void)
113130 {
113131 u32 res;
113132- static atomic_t acqseq;
113133+ static atomic_unchecked_t acqseq;
113134
113135 do {
113136- res = atomic_inc_return(&acqseq);
113137+ res = atomic_inc_return_unchecked(&acqseq);
113138 } while (!res);
113139 return res;
113140 }
113141diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
113142index 781b3a2..73a7434 100644
113143--- a/net/l2tp/l2tp_eth.c
113144+++ b/net/l2tp/l2tp_eth.c
113145@@ -42,12 +42,12 @@ struct l2tp_eth {
113146 struct sock *tunnel_sock;
113147 struct l2tp_session *session;
113148 struct list_head list;
113149- atomic_long_t tx_bytes;
113150- atomic_long_t tx_packets;
113151- atomic_long_t tx_dropped;
113152- atomic_long_t rx_bytes;
113153- atomic_long_t rx_packets;
113154- atomic_long_t rx_errors;
113155+ atomic_long_unchecked_t tx_bytes;
113156+ atomic_long_unchecked_t tx_packets;
113157+ atomic_long_unchecked_t tx_dropped;
113158+ atomic_long_unchecked_t rx_bytes;
113159+ atomic_long_unchecked_t rx_packets;
113160+ atomic_long_unchecked_t rx_errors;
113161 };
113162
113163 /* via l2tp_session_priv() */
113164@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
113165 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
113166
113167 if (likely(ret == NET_XMIT_SUCCESS)) {
113168- atomic_long_add(len, &priv->tx_bytes);
113169- atomic_long_inc(&priv->tx_packets);
113170+ atomic_long_add_unchecked(len, &priv->tx_bytes);
113171+ atomic_long_inc_unchecked(&priv->tx_packets);
113172 } else {
113173- atomic_long_inc(&priv->tx_dropped);
113174+ atomic_long_inc_unchecked(&priv->tx_dropped);
113175 }
113176 return NETDEV_TX_OK;
113177 }
113178@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
113179 {
113180 struct l2tp_eth *priv = netdev_priv(dev);
113181
113182- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
113183- stats->tx_packets = atomic_long_read(&priv->tx_packets);
113184- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
113185- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
113186- stats->rx_packets = atomic_long_read(&priv->rx_packets);
113187- stats->rx_errors = atomic_long_read(&priv->rx_errors);
113188+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
113189+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
113190+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
113191+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
113192+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
113193+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
113194 return stats;
113195 }
113196
113197@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
113198 nf_reset(skb);
113199
113200 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
113201- atomic_long_inc(&priv->rx_packets);
113202- atomic_long_add(data_len, &priv->rx_bytes);
113203+ atomic_long_inc_unchecked(&priv->rx_packets);
113204+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
113205 } else {
113206- atomic_long_inc(&priv->rx_errors);
113207+ atomic_long_inc_unchecked(&priv->rx_errors);
113208 }
113209 return;
113210
113211 error:
113212- atomic_long_inc(&priv->rx_errors);
113213+ atomic_long_inc_unchecked(&priv->rx_errors);
113214 kfree_skb(skb);
113215 }
113216
113217diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
113218index 05dfc8aa..df6cfd7 100644
113219--- a/net/l2tp/l2tp_ip.c
113220+++ b/net/l2tp/l2tp_ip.c
113221@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
113222 .ops = &l2tp_ip_ops,
113223 };
113224
113225-static struct net_protocol l2tp_ip_protocol __read_mostly = {
113226+static const struct net_protocol l2tp_ip_protocol = {
113227 .handler = l2tp_ip_recv,
113228 .netns_ok = 1,
113229 };
113230diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
113231index 8611f1b..bc60a2d 100644
113232--- a/net/l2tp/l2tp_ip6.c
113233+++ b/net/l2tp/l2tp_ip6.c
113234@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
113235 .ops = &l2tp_ip6_ops,
113236 };
113237
113238-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
113239+static const struct inet6_protocol l2tp_ip6_protocol = {
113240 .handler = l2tp_ip6_recv,
113241 };
113242
113243diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
113244index 1a3c7e0..80f8b0c 100644
113245--- a/net/llc/llc_proc.c
113246+++ b/net/llc/llc_proc.c
113247@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
113248 int rc = -ENOMEM;
113249 struct proc_dir_entry *p;
113250
113251- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
113252+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
113253 if (!llc_proc_dir)
113254 goto out;
113255
113256diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
113257index dd4ff36..3462997 100644
113258--- a/net/mac80211/cfg.c
113259+++ b/net/mac80211/cfg.c
113260@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
113261 ret = ieee80211_vif_use_channel(sdata, chandef,
113262 IEEE80211_CHANCTX_EXCLUSIVE);
113263 }
113264- } else if (local->open_count == local->monitors) {
113265+ } else if (local_read(&local->open_count) == local->monitors) {
113266 local->_oper_chandef = *chandef;
113267 ieee80211_hw_config(local, 0);
113268 }
113269@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
113270 else
113271 local->probe_req_reg--;
113272
113273- if (!local->open_count)
113274+ if (!local_read(&local->open_count))
113275 break;
113276
113277 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
113278@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
113279 if (chanctx_conf) {
113280 *chandef = sdata->vif.bss_conf.chandef;
113281 ret = 0;
113282- } else if (local->open_count > 0 &&
113283- local->open_count == local->monitors &&
113284+ } else if (local_read(&local->open_count) > 0 &&
113285+ local_read(&local->open_count) == local->monitors &&
113286 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
113287 if (local->use_chanctx)
113288 *chandef = local->monitor_chandef;
113289diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
113290index 81e8dc5..5b77c58 100644
113291--- a/net/mac80211/ieee80211_i.h
113292+++ b/net/mac80211/ieee80211_i.h
113293@@ -29,6 +29,7 @@
113294 #include <net/ieee80211_radiotap.h>
113295 #include <net/cfg80211.h>
113296 #include <net/mac80211.h>
113297+#include <asm/local.h>
113298 #include "key.h"
113299 #include "sta_info.h"
113300 #include "debug.h"
113301@@ -1129,7 +1130,7 @@ struct ieee80211_local {
113302 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
113303 spinlock_t queue_stop_reason_lock;
113304
113305- int open_count;
113306+ local_t open_count;
113307 int monitors, cooked_mntrs;
113308 /* number of interfaces with corresponding FIF_ flags */
113309 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
113310diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
113311index 81a2751..c06a026 100644
113312--- a/net/mac80211/iface.c
113313+++ b/net/mac80211/iface.c
113314@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113315 break;
113316 }
113317
113318- if (local->open_count == 0) {
113319+ if (local_read(&local->open_count) == 0) {
113320 res = drv_start(local);
113321 if (res)
113322 goto err_del_bss;
113323@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113324 res = drv_add_interface(local, sdata);
113325 if (res)
113326 goto err_stop;
113327- } else if (local->monitors == 0 && local->open_count == 0) {
113328+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
113329 res = ieee80211_add_virtual_monitor(local);
113330 if (res)
113331 goto err_stop;
113332@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113333 atomic_inc(&local->iff_promiscs);
113334
113335 if (coming_up)
113336- local->open_count++;
113337+ local_inc(&local->open_count);
113338
113339 if (hw_reconf_flags)
113340 ieee80211_hw_config(local, hw_reconf_flags);
113341@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113342 err_del_interface:
113343 drv_remove_interface(local, sdata);
113344 err_stop:
113345- if (!local->open_count)
113346+ if (!local_read(&local->open_count))
113347 drv_stop(local);
113348 err_del_bss:
113349 sdata->bss = NULL;
113350@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113351 }
113352
113353 if (going_down)
113354- local->open_count--;
113355+ local_dec(&local->open_count);
113356
113357 switch (sdata->vif.type) {
113358 case NL80211_IFTYPE_AP_VLAN:
113359@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113360 }
113361 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
113362
113363- if (local->open_count == 0)
113364+ if (local_read(&local->open_count) == 0)
113365 ieee80211_clear_tx_pending(local);
113366
113367 /*
113368@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113369 if (cancel_scan)
113370 flush_delayed_work(&local->scan_work);
113371
113372- if (local->open_count == 0) {
113373+ if (local_read(&local->open_count) == 0) {
113374 ieee80211_stop_device(local);
113375
113376 /* no reconfiguring after stop! */
113377@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113378 ieee80211_configure_filter(local);
113379 ieee80211_hw_config(local, hw_reconf_flags);
113380
113381- if (local->monitors == local->open_count)
113382+ if (local->monitors == local_read(&local->open_count))
113383 ieee80211_add_virtual_monitor(local);
113384 }
113385
113386diff --git a/net/mac80211/main.c b/net/mac80211/main.c
113387index 5e09d35..e2fdbe2 100644
113388--- a/net/mac80211/main.c
113389+++ b/net/mac80211/main.c
113390@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
113391 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
113392 IEEE80211_CONF_CHANGE_POWER);
113393
113394- if (changed && local->open_count) {
113395+ if (changed && local_read(&local->open_count)) {
113396 ret = drv_config(local, changed);
113397 /*
113398 * Goal:
113399diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
113400index ca405b6..6cc8bee 100644
113401--- a/net/mac80211/pm.c
113402+++ b/net/mac80211/pm.c
113403@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113404 struct ieee80211_sub_if_data *sdata;
113405 struct sta_info *sta;
113406
113407- if (!local->open_count)
113408+ if (!local_read(&local->open_count))
113409 goto suspend;
113410
113411 ieee80211_scan_cancel(local);
113412@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113413 cancel_work_sync(&local->dynamic_ps_enable_work);
113414 del_timer_sync(&local->dynamic_ps_timer);
113415
113416- local->wowlan = wowlan && local->open_count;
113417+ local->wowlan = wowlan && local_read(&local->open_count);
113418 if (local->wowlan) {
113419 int err = drv_suspend(local, wowlan);
113420 if (err < 0) {
113421@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113422 WARN_ON(!list_empty(&local->chanctx_list));
113423
113424 /* stop hardware - this must stop RX */
113425- if (local->open_count)
113426+ if (local_read(&local->open_count))
113427 ieee80211_stop_device(local);
113428
113429 suspend:
113430diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
113431index d53355b..21f583a 100644
113432--- a/net/mac80211/rate.c
113433+++ b/net/mac80211/rate.c
113434@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
113435
113436 ASSERT_RTNL();
113437
113438- if (local->open_count)
113439+ if (local_read(&local->open_count))
113440 return -EBUSY;
113441
113442 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
113443diff --git a/net/mac80211/util.c b/net/mac80211/util.c
113444index 747bdcf..eb2b981 100644
113445--- a/net/mac80211/util.c
113446+++ b/net/mac80211/util.c
113447@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113448 bool sched_scan_stopped = false;
113449
113450 /* nothing to do if HW shouldn't run */
113451- if (!local->open_count)
113452+ if (!local_read(&local->open_count))
113453 goto wake_up;
113454
113455 #ifdef CONFIG_PM
113456@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113457 local->in_reconfig = false;
113458 barrier();
113459
113460- if (local->monitors == local->open_count && local->monitors > 0)
113461+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
113462 ieee80211_add_virtual_monitor(local);
113463
113464 /*
113465@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113466 * If this is for hw restart things are still running.
113467 * We may want to change that later, however.
113468 */
113469- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
113470+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
113471 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
113472
113473 if (!local->suspended)
113474@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113475 flush_delayed_work(&local->scan_work);
113476 }
113477
113478- if (local->open_count && !reconfig_due_to_wowlan)
113479+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
113480 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
113481
113482 list_for_each_entry(sdata, &local->interfaces, list) {
113483diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
113484index b02660f..c0f791c 100644
113485--- a/net/netfilter/Kconfig
113486+++ b/net/netfilter/Kconfig
113487@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
113488
113489 To compile it as a module, choose M here. If unsure, say N.
113490
113491+config NETFILTER_XT_MATCH_GRADM
113492+ tristate '"gradm" match support'
113493+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
113494+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
113495+ ---help---
113496+ The gradm match allows to match on grsecurity RBAC being enabled.
113497+ It is useful when iptables rules are applied early on bootup to
113498+ prevent connections to the machine (except from a trusted host)
113499+ while the RBAC system is disabled.
113500+
113501 config NETFILTER_XT_MATCH_HASHLIMIT
113502 tristate '"hashlimit" match support'
113503 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
113504diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
113505index 89f73a9..e4e5bd9 100644
113506--- a/net/netfilter/Makefile
113507+++ b/net/netfilter/Makefile
113508@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
113509 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
113510 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
113511 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
113512+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
113513 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
113514 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
113515 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
113516diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
113517index d259da3..6a32b2c 100644
113518--- a/net/netfilter/ipset/ip_set_core.c
113519+++ b/net/netfilter/ipset/ip_set_core.c
113520@@ -1952,7 +1952,7 @@ done:
113521 return ret;
113522 }
113523
113524-static struct nf_sockopt_ops so_set __read_mostly = {
113525+static struct nf_sockopt_ops so_set = {
113526 .pf = PF_INET,
113527 .get_optmin = SO_IP_SET,
113528 .get_optmax = SO_IP_SET + 1,
113529diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
113530index b0f7b62..0541842 100644
113531--- a/net/netfilter/ipvs/ip_vs_conn.c
113532+++ b/net/netfilter/ipvs/ip_vs_conn.c
113533@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
113534 /* Increase the refcnt counter of the dest */
113535 ip_vs_dest_hold(dest);
113536
113537- conn_flags = atomic_read(&dest->conn_flags);
113538+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
113539 if (cp->protocol != IPPROTO_UDP)
113540 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
113541 flags = cp->flags;
113542@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
113543
113544 cp->control = NULL;
113545 atomic_set(&cp->n_control, 0);
113546- atomic_set(&cp->in_pkts, 0);
113547+ atomic_set_unchecked(&cp->in_pkts, 0);
113548
113549 cp->packet_xmit = NULL;
113550 cp->app = NULL;
113551@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
113552
113553 /* Don't drop the entry if its number of incoming packets is not
113554 located in [0, 8] */
113555- i = atomic_read(&cp->in_pkts);
113556+ i = atomic_read_unchecked(&cp->in_pkts);
113557 if (i > 8 || i < 0) return 0;
113558
113559 if (!todrop_rate[i]) return 0;
113560diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
113561index b87ca32..76c7799 100644
113562--- a/net/netfilter/ipvs/ip_vs_core.c
113563+++ b/net/netfilter/ipvs/ip_vs_core.c
113564@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
113565 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
113566 /* do not touch skb anymore */
113567
113568- atomic_inc(&cp->in_pkts);
113569+ atomic_inc_unchecked(&cp->in_pkts);
113570 ip_vs_conn_put(cp);
113571 return ret;
113572 }
113573@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
113574 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
113575 pkts = sysctl_sync_threshold(ipvs);
113576 else
113577- pkts = atomic_add_return(1, &cp->in_pkts);
113578+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113579
113580 if (ipvs->sync_state & IP_VS_STATE_MASTER)
113581 ip_vs_sync_conn(net, cp, pkts);
113582diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
113583index ed99448..3ba6cad 100644
113584--- a/net/netfilter/ipvs/ip_vs_ctl.c
113585+++ b/net/netfilter/ipvs/ip_vs_ctl.c
113586@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
113587 */
113588 ip_vs_rs_hash(ipvs, dest);
113589 }
113590- atomic_set(&dest->conn_flags, conn_flags);
113591+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
113592
113593 /* bind the service */
113594 old_svc = rcu_dereference_protected(dest->svc, 1);
113595@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
113596 * align with netns init in ip_vs_control_net_init()
113597 */
113598
113599-static struct ctl_table vs_vars[] = {
113600+static ctl_table_no_const vs_vars[] __read_only = {
113601 {
113602 .procname = "amemthresh",
113603 .maxlen = sizeof(int),
113604@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113605 " %-7s %-6d %-10d %-10d\n",
113606 &dest->addr.in6,
113607 ntohs(dest->port),
113608- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113609+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113610 atomic_read(&dest->weight),
113611 atomic_read(&dest->activeconns),
113612 atomic_read(&dest->inactconns));
113613@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113614 "%-7s %-6d %-10d %-10d\n",
113615 ntohl(dest->addr.ip),
113616 ntohs(dest->port),
113617- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113618+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113619 atomic_read(&dest->weight),
113620 atomic_read(&dest->activeconns),
113621 atomic_read(&dest->inactconns));
113622@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
113623
113624 entry.addr = dest->addr.ip;
113625 entry.port = dest->port;
113626- entry.conn_flags = atomic_read(&dest->conn_flags);
113627+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
113628 entry.weight = atomic_read(&dest->weight);
113629 entry.u_threshold = dest->u_threshold;
113630 entry.l_threshold = dest->l_threshold;
113631@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
113632 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
113633 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
113634 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
113635- (atomic_read(&dest->conn_flags) &
113636+ (atomic_read_unchecked(&dest->conn_flags) &
113637 IP_VS_CONN_F_FWD_MASK)) ||
113638 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
113639 atomic_read(&dest->weight)) ||
113640@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
113641 {
113642 int idx;
113643 struct netns_ipvs *ipvs = net_ipvs(net);
113644- struct ctl_table *tbl;
113645+ ctl_table_no_const *tbl;
113646
113647 atomic_set(&ipvs->dropentry, 0);
113648 spin_lock_init(&ipvs->dropentry_lock);
113649diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
113650index 127f140..553d652 100644
113651--- a/net/netfilter/ipvs/ip_vs_lblc.c
113652+++ b/net/netfilter/ipvs/ip_vs_lblc.c
113653@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
113654 * IPVS LBLC sysctl table
113655 */
113656 #ifdef CONFIG_SYSCTL
113657-static struct ctl_table vs_vars_table[] = {
113658+static ctl_table_no_const vs_vars_table[] __read_only = {
113659 {
113660 .procname = "lblc_expiration",
113661 .data = NULL,
113662diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
113663index 2229d2d..b32b785 100644
113664--- a/net/netfilter/ipvs/ip_vs_lblcr.c
113665+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
113666@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
113667 * IPVS LBLCR sysctl table
113668 */
113669
113670-static struct ctl_table vs_vars_table[] = {
113671+static ctl_table_no_const vs_vars_table[] __read_only = {
113672 {
113673 .procname = "lblcr_expiration",
113674 .data = NULL,
113675diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
113676index d93ceeb..4556144 100644
113677--- a/net/netfilter/ipvs/ip_vs_sync.c
113678+++ b/net/netfilter/ipvs/ip_vs_sync.c
113679@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
113680 cp = cp->control;
113681 if (cp) {
113682 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113683- pkts = atomic_add_return(1, &cp->in_pkts);
113684+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113685 else
113686 pkts = sysctl_sync_threshold(ipvs);
113687 ip_vs_sync_conn(net, cp->control, pkts);
113688@@ -771,7 +771,7 @@ control:
113689 if (!cp)
113690 return;
113691 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113692- pkts = atomic_add_return(1, &cp->in_pkts);
113693+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113694 else
113695 pkts = sysctl_sync_threshold(ipvs);
113696 goto sloop;
113697@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
113698
113699 if (opt)
113700 memcpy(&cp->in_seq, opt, sizeof(*opt));
113701- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113702+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113703 cp->state = state;
113704 cp->old_state = cp->state;
113705 /*
113706diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
113707index 3aedbda..6a63567 100644
113708--- a/net/netfilter/ipvs/ip_vs_xmit.c
113709+++ b/net/netfilter/ipvs/ip_vs_xmit.c
113710@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
113711 else
113712 rc = NF_ACCEPT;
113713 /* do not touch skb anymore */
113714- atomic_inc(&cp->in_pkts);
113715+ atomic_inc_unchecked(&cp->in_pkts);
113716 goto out;
113717 }
113718
113719@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
113720 else
113721 rc = NF_ACCEPT;
113722 /* do not touch skb anymore */
113723- atomic_inc(&cp->in_pkts);
113724+ atomic_inc_unchecked(&cp->in_pkts);
113725 goto out;
113726 }
113727
113728diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
113729index a4b5e2a..13b1de3 100644
113730--- a/net/netfilter/nf_conntrack_acct.c
113731+++ b/net/netfilter/nf_conntrack_acct.c
113732@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
113733 #ifdef CONFIG_SYSCTL
113734 static int nf_conntrack_acct_init_sysctl(struct net *net)
113735 {
113736- struct ctl_table *table;
113737+ ctl_table_no_const *table;
113738
113739 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
113740 GFP_KERNEL);
113741diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
113742index 13fad86..18c984c 100644
113743--- a/net/netfilter/nf_conntrack_core.c
113744+++ b/net/netfilter/nf_conntrack_core.c
113745@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
113746 #define DYING_NULLS_VAL ((1<<30)+1)
113747 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
113748
113749+#ifdef CONFIG_GRKERNSEC_HIDESYM
113750+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
113751+#endif
113752+
113753 int nf_conntrack_init_net(struct net *net)
113754 {
113755 int ret = -ENOMEM;
113756@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
113757 if (!net->ct.stat)
113758 goto err_pcpu_lists;
113759
113760+#ifdef CONFIG_GRKERNSEC_HIDESYM
113761+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
113762+#else
113763 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
113764+#endif
113765 if (!net->ct.slabname)
113766 goto err_slabname;
113767
113768diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
113769index 4e78c57..ec8fb74 100644
113770--- a/net/netfilter/nf_conntrack_ecache.c
113771+++ b/net/netfilter/nf_conntrack_ecache.c
113772@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
113773 #ifdef CONFIG_SYSCTL
113774 static int nf_conntrack_event_init_sysctl(struct net *net)
113775 {
113776- struct ctl_table *table;
113777+ ctl_table_no_const *table;
113778
113779 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
113780 GFP_KERNEL);
113781diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
113782index bd9d315..989947e 100644
113783--- a/net/netfilter/nf_conntrack_helper.c
113784+++ b/net/netfilter/nf_conntrack_helper.c
113785@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
113786
113787 static int nf_conntrack_helper_init_sysctl(struct net *net)
113788 {
113789- struct ctl_table *table;
113790+ ctl_table_no_const *table;
113791
113792 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
113793 GFP_KERNEL);
113794diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
113795index b65d586..beec902 100644
113796--- a/net/netfilter/nf_conntrack_proto.c
113797+++ b/net/netfilter/nf_conntrack_proto.c
113798@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
113799
113800 static void
113801 nf_ct_unregister_sysctl(struct ctl_table_header **header,
113802- struct ctl_table **table,
113803+ ctl_table_no_const **table,
113804 unsigned int users)
113805 {
113806 if (users > 0)
113807diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
113808index fc823fa..8311af3 100644
113809--- a/net/netfilter/nf_conntrack_standalone.c
113810+++ b/net/netfilter/nf_conntrack_standalone.c
113811@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
113812
113813 static int nf_conntrack_standalone_init_sysctl(struct net *net)
113814 {
113815- struct ctl_table *table;
113816+ ctl_table_no_const *table;
113817
113818 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
113819 GFP_KERNEL);
113820diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
113821index 7a394df..bd91a8a 100644
113822--- a/net/netfilter/nf_conntrack_timestamp.c
113823+++ b/net/netfilter/nf_conntrack_timestamp.c
113824@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
113825 #ifdef CONFIG_SYSCTL
113826 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
113827 {
113828- struct ctl_table *table;
113829+ ctl_table_no_const *table;
113830
113831 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
113832 GFP_KERNEL);
113833diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
113834index 675d12c..b36e825 100644
113835--- a/net/netfilter/nf_log.c
113836+++ b/net/netfilter/nf_log.c
113837@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
113838
113839 #ifdef CONFIG_SYSCTL
113840 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
113841-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
113842+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
113843
113844 static int nf_log_proc_dostring(struct ctl_table *table, int write,
113845 void __user *buffer, size_t *lenp, loff_t *ppos)
113846@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
113847 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
113848 mutex_unlock(&nf_log_mutex);
113849 } else {
113850+ ctl_table_no_const nf_log_table = *table;
113851+
113852 mutex_lock(&nf_log_mutex);
113853 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
113854 if (!logger)
113855- table->data = "NONE";
113856+ nf_log_table.data = "NONE";
113857 else
113858- table->data = logger->name;
113859- r = proc_dostring(table, write, buffer, lenp, ppos);
113860+ nf_log_table.data = logger->name;
113861+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
113862 mutex_unlock(&nf_log_mutex);
113863 }
113864
113865diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
113866index c68c1e5..8b5d670 100644
113867--- a/net/netfilter/nf_sockopt.c
113868+++ b/net/netfilter/nf_sockopt.c
113869@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
113870 }
113871 }
113872
113873- list_add(&reg->list, &nf_sockopts);
113874+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
113875 out:
113876 mutex_unlock(&nf_sockopt_mutex);
113877 return ret;
113878@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
113879 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
113880 {
113881 mutex_lock(&nf_sockopt_mutex);
113882- list_del(&reg->list);
113883+ pax_list_del((struct list_head *)&reg->list);
113884 mutex_unlock(&nf_sockopt_mutex);
113885 }
113886 EXPORT_SYMBOL(nf_unregister_sockopt);
113887diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
113888index 11d85b3..7fcc420 100644
113889--- a/net/netfilter/nfnetlink_log.c
113890+++ b/net/netfilter/nfnetlink_log.c
113891@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
113892 struct nfnl_log_net {
113893 spinlock_t instances_lock;
113894 struct hlist_head instance_table[INSTANCE_BUCKETS];
113895- atomic_t global_seq;
113896+ atomic_unchecked_t global_seq;
113897 };
113898
113899 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
113900@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
113901 /* global sequence number */
113902 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
113903 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
113904- htonl(atomic_inc_return(&log->global_seq))))
113905+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
113906 goto nla_put_failure;
113907
113908 if (data_len) {
113909diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
113910index 65f3e2b..2e9d6a0 100644
113911--- a/net/netfilter/nft_compat.c
113912+++ b/net/netfilter/nft_compat.c
113913@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
113914 return;
113915 }
113916
113917- switch(ret) {
113918- case true:
113919- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
113920- break;
113921- case false:
113922- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
113923- break;
113924- }
113925+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
113926 }
113927
113928 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
113929diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
113930new file mode 100644
113931index 0000000..c566332
113932--- /dev/null
113933+++ b/net/netfilter/xt_gradm.c
113934@@ -0,0 +1,51 @@
113935+/*
113936+ * gradm match for netfilter
113937